From 185c2764f703d2e0f6bef1946feb2d23ee0be164 Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 8 Sep 2021 22:41:05 +0200 Subject: [PATCH] revamp login & change header to three columns --- djlearn/djlearn/settings.py | 3 ++ djlearn/pages/static/css/landing.css | 31 +++++++++++++++---- djlearn/pages/templates/pages/index.html | 20 ++++++++---- .../{pages => registration}/login.html | 4 +++ djlearn/pages/urls.py | 4 +-- 5 files changed, 48 insertions(+), 14 deletions(-) rename djlearn/pages/templates/{pages => registration}/login.html (92%) diff --git a/djlearn/djlearn/settings.py b/djlearn/djlearn/settings.py index d5d5a0e..36ae822 100644 --- a/djlearn/djlearn/settings.py +++ b/djlearn/djlearn/settings.py @@ -125,3 +125,6 @@ STATIC_URL = '/static/' # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' + + +LOGIN_REDIRECT_URL = '/' \ No newline at end of file diff --git a/djlearn/pages/static/css/landing.css b/djlearn/pages/static/css/landing.css index dc7c345..65e87af 100644 --- a/djlearn/pages/static/css/landing.css +++ b/djlearn/pages/static/css/landing.css @@ -104,10 +104,31 @@ footer p { .header { width: 100vw; display: flex; - flex-direction: row; + flex-flow: row; position: absolute; } - + +.header-left { + flex: 1; + display: flex; + justify-content: flex-start; + align-items: center; +} + +.header-center { + flex: 1; + display: flex; + justify-content: center; + align-items: center; +} + +.header-right { + flex: 1; + display: flex; + justify-content: flex-end; + align-items: center; +} + .header-link { color: white; margin: 1rem; @@ -121,14 +142,12 @@ footer p { text-decoration-color: red; text-underline-offset: 0.2em; } - + .header-text { - margin: 1rem 1rem 1rem auto; font-size: 1rem; - color: #ccc; } -#logo { +#logo-img { width: 50px; height: 50px; } \ No newline at end of file diff --git a/djlearn/pages/templates/pages/index.html b/djlearn/pages/templates/pages/index.html index cfe3e7d..a0d0edf 100644 --- a/djlearn/pages/templates/pages/index.html +++ b/djlearn/pages/templates/pages/index.html @@ -13,13 +13,21 @@
-
- + +
+ Logo +
+ +
+ Test +
+ +
+ Sign in: + PyHub + Github + Twitter
-
Sign in:
- PyHub - Github - Twitter
diff --git a/djlearn/pages/templates/pages/login.html b/djlearn/pages/templates/registration/login.html similarity index 92% rename from djlearn/pages/templates/pages/login.html rename to djlearn/pages/templates/registration/login.html index 3c3eef0..b88582e 100644 --- a/djlearn/pages/templates/pages/login.html +++ b/djlearn/pages/templates/registration/login.html @@ -21,8 +21,12 @@