diff --git a/.gitignore b/.gitignore index d34b3a2..87f98b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ target/ db.sqlite +.history/ diff --git a/static/css/skeleton.css b/static/css/skeleton.css index f28bf6c..2a370ee 100644 --- a/static/css/skeleton.css +++ b/static/css/skeleton.css @@ -23,8 +23,38 @@ - Utilities - Clearing - Media Queries +- Custom Code */ +/* Fonts +–––––––––––––––––––––––––––––––––––––––––––––––––– */ +@font-face { + font-family: 'DejaVu Sans'; + font-style: normal; + font-weight: 300; + font-display: swap; + src: + url('../fonts/DejaVuSans-ExtraLight.woff2') format('woff2') +} + +@font-face { + font-family: 'DejaVu Sans'; + font-style: normal; + font-weight: 500; + font-display: swap; + src: + url('../fonts/DejaVuSansMono.woff2') format('woff2') +} + +@font-face { + font-family: 'DejaVu Sans'; + font-style: normal; + font-weight: 800; + font-display: swap; + src: + url('../fonts/DejaVuSans-Bold.woff2') format('woff2') +} + /* Grid –––––––––––––––––––––––––––––––––––––––––––––––––– */ @@ -124,8 +154,9 @@ body { font-size: 1.5em; /* currently ems cause chrome bug misinterpreting rems on body element */ line-height: 1.6; font-weight: 400; - font-family: "Raleway", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; - color: #222; } + font-family: "DejaVu Sans", "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #222; +} /* Typography @@ -182,9 +213,9 @@ input[type="button"] { text-transform: uppercase; text-decoration: none; white-space: nowrap; - background-color: transparent; + background-color: white; border-radius: 4px; - border: 1px solid #bbb; + border: 1px solid transparent; cursor: pointer; box-sizing: border-box; } .button:hover, @@ -206,8 +237,8 @@ input[type="submit"].button-primary, input[type="reset"].button-primary, input[type="button"].button-primary { color: #FFF; - background-color: #33C3F0; - border-color: #33C3F0; } + background-color: red; + border-color: red; } .button.button-primary:hover, button.button-primary:hover, input[type="submit"].button-primary:hover, @@ -219,8 +250,8 @@ input[type="submit"].button-primary:focus, input[type="reset"].button-primary:focus, input[type="button"].button-primary:focus { color: #FFF; - background-color: #1EAEDB; - border-color: #1EAEDB; } + background-color: darkred; + border-color: darkred; } /* Forms @@ -237,7 +268,7 @@ select { height: 38px; padding: 6px 10px; /* The 6px vertically centers text on FF, ignored by Webkit */ background-color: #fff; - border: 1px solid #D1D1D1; + border: 1px solid transparent; border-radius: 4px; box-shadow: none; box-sizing: border-box; } @@ -266,7 +297,7 @@ input[type="url"]:focus, input[type="password"]:focus, textarea:focus, select:focus { - border: 1px solid #33C3F0; + border: 1px solid #222; outline: 0; } label, legend { @@ -416,3 +447,81 @@ there. /* Larger than Desktop HD */ @media (min-width: 1200px) {} + +/* custom */ +.content-center-all { + display: flex; + align-items: center; + justify-content: center; +} + +.content-center-end { + display: flex; + align-items: center; + justify-content: end; +} + +.font-base { + font-size: 1.2rem !important; +} + +.full-height { + min-height: 100vh; + height: 100%; +} + +.p-3 { + padding: 3rem; +} + +.p-1 { + padding: 1rem; +} + +.mb-0 { + margin-bottom: 0; +} + +.mb-1 { + margin-bottom: 1rem; +} + +.mb-3 { + margin-bottom: 3rem; +} + +.w-full { + width: 100%; +} + +.block { + display: block; +} + +.bold { + font-weight: 800; +} + +.light { + font-weight: 300; +} + +.bg-gray { + background-color: #F1F1F1; +} + +.bg-green { + background-color: #2b8c68; +} + +.bg-red { + background-color: red; +} + +.text-white { + color: #fff; +} + +.text-center { + text-align: center; +} diff --git a/static/fonts/DejaVuSans-Bold.woff2 b/static/fonts/DejaVuSans-Bold.woff2 new file mode 100644 index 0000000..5335f93 Binary files /dev/null and b/static/fonts/DejaVuSans-Bold.woff2 differ diff --git a/static/fonts/DejaVuSans-ExtraLight.woff2 b/static/fonts/DejaVuSans-ExtraLight.woff2 new file mode 100644 index 0000000..e2c521a Binary files /dev/null and b/static/fonts/DejaVuSans-ExtraLight.woff2 differ diff --git a/static/fonts/DejaVuSansMono.woff2 b/static/fonts/DejaVuSansMono.woff2 new file mode 100644 index 0000000..cf200e1 Binary files /dev/null and b/static/fonts/DejaVuSansMono.woff2 differ diff --git a/templates/base.html.tera b/templates/base.html.tera index 3057c6e..42760ed 100644 --- a/templates/base.html.tera +++ b/templates/base.html.tera @@ -13,10 +13,6 @@ –––––––––––––––––––––––––––––––––––––––––––––––––– --> - - - @@ -34,28 +30,33 @@ + + {% if user %} +
+
+ {% if user.is_admin %} + 🚣 + 👥 + {% endif %} + LOGOUT +
+
+ {% endif %} +
- {% if user %} - {% if user.is_admin %} - 🚣 - 👥 - {% endif %} - ☈ - {% endif %} - {% if flash %} {% if flash.0 == "success" %}
-
+
{{ flash.1 }}
{% endif %} {% if flash.0 == "error" %}
-
+
{{ flash.1 }}
diff --git a/templates/index.html.tera b/templates/index.html.tera index f75779f..e4c97ee 100644 --- a/templates/index.html.tera +++ b/templates/index.html.tera @@ -1,15 +1,15 @@ {% extends "base" %} {% block content %} +

Ausfahrten

{% for day_with_trip in data %} {% set day = day_with_trip.day %} {% set day_string = day.day | date(format="%Y-%m-%d") %} {% set trips = day_with_trip.trips %} -

{{ day.day | date(format="%d.%m.%Y")}}

-
+
+ {{ day.day | date(format="%d.%m.%Y")}} - - {% if day.planned_amount_cox > 0%} + {% if day.planned_amount_cox > 0%} {% set cox = trips | filter(attribute="user.is_cox", value=true) %} {% set amount_cox = cox | length %} @@ -91,7 +91,7 @@ {% endif %} -
+
{% endfor %} diff --git a/templates/name.html.tera b/templates/name.html.tera index c3d09b6..9b93764 100644 --- a/templates/name.html.tera +++ b/templates/name.html.tera @@ -1,16 +1,18 @@ {% extends "base" %} {% block content %} -
- +
+ + - - + + - - + + - - + + +
{% endblock content %}