From c66edd09c5eb5447b25c2bec636ed299e0069b8f Mon Sep 17 00:00:00 2001 From: palewire Date: Sun, 9 Jan 2022 07:22:52 -0800 Subject: [PATCH 1/3] Reworked the footer with link lists --- _layouts/default.html | 80 ++++++++++++++--- _sass/components/_footer.scss | 56 ++++++++++-- ...elogo-blacktext-blackbody-blackplanets.svg | 88 +++++++++++++++++++ 3 files changed, 207 insertions(+), 17 deletions(-) create mode 100644 assets/logos/rectanglelogo-blacktext-blackbody-blackplanets.svg diff --git a/_layouts/default.html b/_layouts/default.html index 2d1538b6..ad68efca 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -18,6 +18,27 @@ url: /security - title: About url: /about +projects: + - title: Binder + url: /binder + - title: JupyterHub + url: /hub + - title: JupyterLab + url: https://jupyterlab.readthedocs.io/ + newpage: true + - title: Jupyter Notebook + url: https://jupyter-notebook.readthedocs.io/ + newpage: true + - title: Voilà + url: https://voila.readthedocs.io/ + newpage: true + - title: Widgets + url: /widgets +social: + - title: GitHub + url: https://github.com/jupyter/ + - title: Twitter + url: https://twitter.com/projectjupyter --- @@ -83,19 +104,54 @@
{{ content }}
- diff --git a/_sass/components/_footer.scss b/_sass/components/_footer.scss index d58148ee..7a793ada 100644 --- a/_sass/components/_footer.scss +++ b/_sass/components/_footer.scss @@ -1,13 +1,59 @@ @import "settings/colors"; .footer { + section { + padding: 2em; + } + .linklists { + background-color: lighten($orange, 12.5%); + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: start; + align-items: start; + padding-top: 2em; + padding-bottom: 2em; + @media (max-width: 420px) { + flex-direction: column; + } + .footer-links { + color: $black; + @media (max-width: 420px) { + margin-top: 2em; + &:first-of-type { + margin-top: 0; + } + } + h2 { + font-size: 1.1em; + font-weight: bold; + margin: 0 0 1em 0; + padding: 0; + } + ul { + margin: 0 10em 0 0; + padding: 0; + list-style-type: none; + li { + padding: 0; + margin: 0 0 0.75em 0; + a { + color: $black; + } + } + } + } + } + .footer-text { background-color: $orange; - padding: 15px; - @media (max-width:767px) { - padding: 15px 0; + img { + margin: 1em 0; + color: $black; } p { - color: $black; - padding-top: 10px; + color: $black; + padding-top: 10px; + font-size: 0.9em; } + } } diff --git a/assets/logos/rectanglelogo-blacktext-blackbody-blackplanets.svg b/assets/logos/rectanglelogo-blacktext-blackbody-blackplanets.svg new file mode 100644 index 00000000..c1b4ce27 --- /dev/null +++ b/assets/logos/rectanglelogo-blacktext-blackbody-blackplanets.svg @@ -0,0 +1,88 @@ + +logo-3.svg +Created using Figma 0.90 + + + + + + + + + + + + + + + + + + From a8ab5cf8ded9fe6158003ae07fe1f7951f41077c Mon Sep 17 00:00:00 2001 From: palewire Date: Sun, 9 Jan 2022 11:11:35 -0800 Subject: [PATCH 2/3] max width for footer --- _layouts/default.html | 6 +++++- _sass/components/_footer.scss | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index ad68efca..6d94dd5f 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -106,6 +106,7 @@
+

Project Jupyter

    @@ -145,14 +146,17 @@

    Follow us

    {%- endfor %}
+
+
project jupyter logo

The Jupyter Trademark is registered with the U.S. Patent & Trademark Office. © {{site.time | date: '%Y' }}

+
- + \ No newline at end of file diff --git a/_sass/components/_footer.scss b/_sass/components/_footer.scss index 7a793ada..d78b0c76 100644 --- a/_sass/components/_footer.scss +++ b/_sass/components/_footer.scss @@ -6,15 +6,15 @@ } .linklists { background-color: lighten($orange, 12.5%); - display: flex; - flex-direction: row; - flex-wrap: wrap; - justify-content: start; - align-items: start; - padding-top: 2em; - padding-bottom: 2em; - @media (max-width: 420px) { - flex-direction: column; + .content { + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; + align-items: start; + @media (max-width: 767px) { + flex-direction: column; + } } .footer-links { color: $black; @@ -31,7 +31,7 @@ padding: 0; } ul { - margin: 0 10em 0 0; + margin: 0 0 0 0; padding: 0; list-style-type: none; li { From 8b64b8e29cd797d9e96289bd0587b8f26eae8bf6 Mon Sep 17 00:00:00 2001 From: palewire Date: Tue, 11 Jan 2022 14:34:55 -0800 Subject: [PATCH 3/3] Validator fixes --- _layouts/default.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index f03cb2d1..8eaba750 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -104,7 +104,7 @@
{{ content }}
-