diff --git a/root/static/css/style.css b/root/static/css/style.css index 415ec984..f11384ff 100644 --- a/root/static/css/style.css +++ b/root/static/css/style.css @@ -31,7 +31,6 @@ body { header { margin: 0; - background-color: #4CAF50; } header nav ul { @@ -39,8 +38,9 @@ header nav ul { padding-left: 0; } -header nav li { - display: inline; +header nav .nav-item { + display: inline-flex; + align-items: center; } /* "Logout" must be button for POST request but style like link */ @@ -108,44 +108,17 @@ header #user_nav ul { align-items: flex-end; } -header #user_nav ul p + div { - margin-top: 1em; -} - -header #user_nav ul div:only-child { - margin-top: 3em; -} - -header #user_nav h4 { - margin: 0; - padding: 0 0.5em 0 0.5em; - color: #f5f5ef; -} - -header #user_nav h4 a { - color: #f5f5ef; -} - -header nav input[name="logout"] { - background-color: #4CAF50; - color: #333333; -} - -header nav input[name="logout"]:active, -header nav input[name="logout"]:hover { - color: #f5f5ef; - - box-shadow: 0px 0px 0px grey !important; -} - /*** project nav ***/ header #project_nav a:hover { - background-color:#f5f5ef; - color: #333333; + color: #4CAF50; } /*** submenu nav ***/ +header #submenu_nav { + background-color: #4CAF50; +} + header #submenu_nav a:hover, header #submenu_nav a.current { color: #f5f5ef !important; @@ -328,10 +301,52 @@ input[type=number].editable-content:not(:focus) { display: none; } +.btn:focus { + box-shadow: none !important; +} + +a.dark-link, button.dark-link { + color: #f5f5ef !important; +} + +a.dark-link:hover, button.dark-link:hover { + text-decoration: none !important; + color: #4CAF50 !important; +} + +.content-box { + background-color: var(--bs-light); + padding: 1.5rem; + border-radius: 1rem; + margin-bottom: 1rem; +} + +.item-box { + background-color: #4CAF50; + width: 100px; + height: 100px; + padding: 0.5rem; + border-radius: 0.5rem; + display: flex; + align-items: center; + overflow: hidden; +} + +.item-box span { + display: inline; + width: 100%; + word-wrap: break-word; + white-space: normal; + -moz-hyphens: auto; + -o-hyphens: auto; + -webkit-hyphens: auto; + -ms-hyphens: auto; + hyphens: auto; +} + /******** footer part ********/ footer { - background-color: #333333; color: #f5f5ef; position: absolute; /*necessary to position it at the bottom in all cases*/ bottom: 0; diff --git a/root/templates/homepage.tt b/root/templates/homepage.tt index a22727c0..e4a5f7f7 100644 --- a/root/templates/homepage.tt +++ b/root/templates/homepage.tt @@ -1,25 +1,34 @@ [% INCLUDE 'homepage_intro.tt' %] +
[% INCLUDE 'includes/recipes_of_the_day.tt' %] -

Recent public recipes

+

Recent public recipes

- [% IF public_recipes.size == max_recipes %] -

Browse all public recipes

+

Browse all public recipes

[% END %] -

Active public Projects

+

Active public projects

- + +[% IF active_public_projects.size == 0 %] +

It looks like you don't have any active public projects yet.

+[% END %] + +
diff --git a/root/templates/homepage_intro.tt b/root/templates/homepage_intro.tt index 6d1172af..d2950167 100644 --- a/root/templates/homepage_intro.tt +++ b/root/templates/homepage_intro.tt @@ -1 +1,30 @@ -

Coocook, a web application for collecting recipes and making food plans.

+
+

Coocook is a web application for collecting recipes and making food plans. You can ...

+
+
+
+
+ menu_book + collect recipes +
+ east +
+ restaurant_menu + create a food plan +
+ east +
+ fact_check + gather purchase lists +
+ east +
+ print + print a project overview +
+
+
+
+

You are more interested in Coocook? Check out the FAQ on Coocook.org and join our mailing list to get more informations.

+

You celebrate Coocook as much as we do and want to make it better too? Great! Report bugs or suggestions for improvement or even become part of the open volunteer development team.

+
diff --git a/root/templates/wrapper.tt b/root/templates/wrapper.tt index 3c34eef3..b72c0972 100644 --- a/root/templates/wrapper.tt +++ b/root/templates/wrapper.tt @@ -32,93 +32,87 @@
-
+
-
-
- - - - -
-
- -
+
-
- @@ -130,7 +124,7 @@ END %]
-
+
@@ -156,13 +150,13 @@ END %]