From 6ede600cefd9ff249e0a087a96b8e0fde50a5657 Mon Sep 17 00:00:00 2001 From: Leon Sandøy Date: Thu, 11 Apr 2019 23:51:02 +0200 Subject: New landing page. Not quite done yet. This probably should've been more than one commit. --- pydis_site/settings.py | 1 + pydis_site/static/css/base/base.css | 20 + pydis_site/static/css/home/index.css | 31 + pydis_site/static/images/logo_site_banner.min.svg | 39 - pydis_site/static/images/logo_site_banner.png | Bin 217061 -> 0 bytes pydis_site/static/images/logo_site_banner.svg | 1041 -------------------- .../static/images/navbar/navbar_discordjoin.svg | 81 ++ .../images/navbar/pydis_banner_no_square.svg | 151 +++ pydis_site/templates/base/base.html | 1 + pydis_site/templates/base/footer.html | 2 +- pydis_site/templates/base/navbar.html | 110 ++- pydis_site/templates/home/index.html | 28 +- 12 files changed, 356 insertions(+), 1149 deletions(-) create mode 100644 pydis_site/static/css/base/base.css delete mode 100644 pydis_site/static/images/logo_site_banner.min.svg delete mode 100644 pydis_site/static/images/logo_site_banner.png delete mode 100644 pydis_site/static/images/logo_site_banner.svg create mode 100644 pydis_site/static/images/navbar/navbar_discordjoin.svg create mode 100644 pydis_site/static/images/navbar/pydis_banner_no_square.svg diff --git a/pydis_site/settings.py b/pydis_site/settings.py index f7668f65..7eb552cd 100644 --- a/pydis_site/settings.py +++ b/pydis_site/settings.py @@ -255,5 +255,6 @@ BULMA_SETTINGS = { "variables": { "primary": "#7289DA", "link": "$primary", + "navbar-height": "4.75rem", } } diff --git a/pydis_site/static/css/base/base.css b/pydis_site/static/css/base/base.css new file mode 100644 index 00000000..5949725d --- /dev/null +++ b/pydis_site/static/css/base/base.css @@ -0,0 +1,20 @@ +#django-logo { + height: 20px; + background: url(https://static.djangoproject.com/img/logos/django-logo-negative.png) no-repeat center; + filter: grayscale(1) invert(0.04); + background-size: 50px; + background-position: 0 0; + color: #00000000; +} + +#bulma-logo { + padding-left: 18px; + height: 20px; + background: url(https://bulma.io/images/bulma-logo-white.png) no-repeat center; + background-size: 60px; + color: #00000000; +} + +#pydis-text { + font-weight: bold; +} diff --git a/pydis_site/static/css/home/index.css b/pydis_site/static/css/home/index.css index 2d744915..2ead1a12 100644 --- a/pydis_site/static/css/home/index.css +++ b/pydis_site/static/css/home/index.css @@ -16,3 +16,34 @@ height: 5rem; margin-right: 2rem; } + + +.navbar-item.is-large img { + max-height: 3rem; +} + +.navbar-item.is-fullsize { + padding:0; +} + +.navbar-item.is-fullsize img { + max-height: 4.75rem; +} + +.navbar-item.has-no-highlight:hover { + background-color: transparent; +} + +.navbar-item.has-left-margin-1 { + margin-left: 1rem; +} + +.navbar-item.has-left-margin-2 { + margin-left: 2rem; +} + +.navbar-item.has-left-margin-3 { + margin-left: 3rem; +} + + diff --git a/pydis_site/static/images/logo_site_banner.min.svg b/pydis_site/static/images/logo_site_banner.min.svg deleted file mode 100644 index 4d868d04..00000000 --- a/pydis_site/static/images/logo_site_banner.min.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - -image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pydis_site/static/images/logo_site_banner.png b/pydis_site/static/images/logo_site_banner.png deleted file mode 100644 index 9ab656c0..00000000 Binary files a/pydis_site/static/images/logo_site_banner.png and /dev/null differ diff --git a/pydis_site/static/images/logo_site_banner.svg b/pydis_site/static/images/logo_site_banner.svg deleted file mode 100644 index 27132b12..00000000 --- a/pydis_site/static/images/logo_site_banner.svg +++ /dev/null @@ -1,1041 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pydis_site/static/images/navbar/navbar_discordjoin.svg b/pydis_site/static/images/navbar/navbar_discordjoin.svg new file mode 100644 index 00000000..75e6b102 --- /dev/null +++ b/pydis_site/static/images/navbar/navbar_discordjoin.svg @@ -0,0 +1,81 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/pydis_site/static/images/navbar/pydis_banner_no_square.svg b/pydis_site/static/images/navbar/pydis_banner_no_square.svg new file mode 100644 index 00000000..114312c7 --- /dev/null +++ b/pydis_site/static/images/navbar/pydis_banner_no_square.svg @@ -0,0 +1,151 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pydis_site/templates/base/base.html b/pydis_site/templates/base/base.html index 5b124ded..fecf60cc 100644 --- a/pydis_site/templates/base/base.html +++ b/pydis_site/templates/base/base.html @@ -21,6 +21,7 @@ crossorigin="anonymous" > + {% block head %}{% endblock %} diff --git a/pydis_site/templates/base/footer.html b/pydis_site/templates/base/footer.html index ff868160..90f06f3c 100644 --- a/pydis_site/templates/base/footer.html +++ b/pydis_site/templates/base/footer.html @@ -1,7 +1,7 @@ diff --git a/pydis_site/templates/base/navbar.html b/pydis_site/templates/base/navbar.html index 73e3917a..f9f576df 100644 --- a/pydis_site/templates/base/navbar.html +++ b/pydis_site/templates/base/navbar.html @@ -1,60 +1,80 @@ {% load extra_filters %} {% load static %} -{% comment %} -This template is responsible for rendering the main navigation on each page that uses it. -It requires two arguments to be set in the include: +