From d16686639b672c0cd1d122e8cf13d6bafa78e177 Mon Sep 17 00:00:00 2001 From: Daniel Muckerman Date: Sat, 12 Dec 2020 22:40:06 -0500 Subject: [PATCH] Navbar overhaul --- accounts/static/icons/feathericons/LICENSE | 21 ++++++++++++++++ .../icons/feathericons/feather-sprite.svg | 1 + accounts/static/icons/lucide-icons/LICENSE | 15 ++++++++++++ .../static/icons/lucide-icons/gamepad-2.svg | 7 ++++++ .../static/icons/lucide-icons/snowflake.svg | 12 ++++++++++ accounts/static/style.css | 24 +++++++++++++++++++ accounts/templates/fragments/navbar.j2 | 21 ++++++++++++++++ accounts/templates/login.j2 | 22 ++++++++++------- accounts/templates/profile.j2 | 19 +++++++-------- 9 files changed, 122 insertions(+), 20 deletions(-) create mode 100644 accounts/static/icons/feathericons/LICENSE create mode 100644 accounts/static/icons/feathericons/feather-sprite.svg create mode 100644 accounts/static/icons/lucide-icons/LICENSE create mode 100644 accounts/static/icons/lucide-icons/gamepad-2.svg create mode 100644 accounts/static/icons/lucide-icons/snowflake.svg create mode 100644 accounts/templates/fragments/navbar.j2 diff --git a/accounts/static/icons/feathericons/LICENSE b/accounts/static/icons/feathericons/LICENSE new file mode 100644 index 0000000..c2f512f --- /dev/null +++ b/accounts/static/icons/feathericons/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013-2017 Cole Bemis + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/accounts/static/icons/feathericons/feather-sprite.svg b/accounts/static/icons/feathericons/feather-sprite.svg new file mode 100644 index 0000000..327fbbb --- /dev/null +++ b/accounts/static/icons/feathericons/feather-sprite.svg @@ -0,0 +1 @@ + diff --git a/accounts/static/icons/lucide-icons/LICENSE b/accounts/static/icons/lucide-icons/LICENSE new file mode 100644 index 0000000..66cc022 --- /dev/null +++ b/accounts/static/icons/lucide-icons/LICENSE @@ -0,0 +1,15 @@ +ISC License + +Copyright (c) 2020, Lucide Contributors + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/accounts/static/icons/lucide-icons/gamepad-2.svg b/accounts/static/icons/lucide-icons/gamepad-2.svg new file mode 100644 index 0000000..a8268a2 --- /dev/null +++ b/accounts/static/icons/lucide-icons/gamepad-2.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/accounts/static/icons/lucide-icons/snowflake.svg b/accounts/static/icons/lucide-icons/snowflake.svg new file mode 100644 index 0000000..5242809 --- /dev/null +++ b/accounts/static/icons/lucide-icons/snowflake.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/accounts/static/style.css b/accounts/static/style.css index b619e59..4144262 100644 --- a/accounts/static/style.css +++ b/accounts/static/style.css @@ -15,6 +15,10 @@ color: #eee; } + .shadow-lg { + box-shadow: 0 1rem 3rem rgba(0,0,0,.75) !important; + } + .jumbotron { background-color: #333 !important; } @@ -115,3 +119,23 @@ opacity: 1; } } + +.overlay-frame { + z-index: 1050; + position: fixed; + top: 55px; + right: 10px; + border-radius: .25rem; + border: 1px solid #6c757d; +} + +#overlay { + width: 100%; + height: 100%; + z-index: 1040; + background-color: rgba(0, 0, 0, 0); + position: fixed; + top: 0; + left: 0; + overflow: hidden; +} \ No newline at end of file diff --git a/accounts/templates/fragments/navbar.j2 b/accounts/templates/fragments/navbar.j2 new file mode 100644 index 0000000..831b3ce --- /dev/null +++ b/accounts/templates/fragments/navbar.j2 @@ -0,0 +1,21 @@ + \ No newline at end of file diff --git a/accounts/templates/login.j2 b/accounts/templates/login.j2 index 6ae0078..44ce62f 100644 --- a/accounts/templates/login.j2 +++ b/accounts/templates/login.j2 @@ -8,12 +8,12 @@ {% endblock %} {% block navbar %} - +{% include "fragments/navbar.j2" %} {% endblock %} {% block content %} + +

Sign in for our awesome service

@@ -27,12 +27,16 @@
{% endif %} - {#
- {{ form.csrf_token }} -
{{ form.username.label }}: {{ form.username() }}

-
{{ form.password.label }}: {{ form.password() }}

- -
#} {{wtf.quick_form(form, novalidate=True)}}
+{% endblock %} + +{% block scripts %} +{{ super () }} + {% endblock %} \ No newline at end of file diff --git a/accounts/templates/profile.j2 b/accounts/templates/profile.j2 index 86426ee..ec787fc 100644 --- a/accounts/templates/profile.j2 +++ b/accounts/templates/profile.j2 @@ -7,20 +7,12 @@ {% endblock %} {% block navbar %} - +{% include "fragments/navbar.j2" %} {% endblock %} {% block content %} + +