Skip to content

Commit 2505a95

Browse files
authored
Merge pull request jupyter#546 from jupyter/orange-footer
Simplified footer and made its background orange
2 parents b8a74d4 + 1b1919b commit 2505a95

File tree

6 files changed

+39
-53
lines changed

6 files changed

+39
-53
lines changed

README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,18 @@ Add commit (and don't forget to add to `_data/nav.yml`).
141141

142142
## Site quirks and tips
143143

144+
### SCSS variables
145+
146+
Shortcuts with colors and other common variables can be found in `_sass/settings`. They can be used in SCSS files.
147+
148+
```scss
149+
@import "settings/colors"
150+
151+
a {
152+
color: $orange;
153+
}
154+
```
155+
144156
### Lazy loading of images
145157

146158
The Jupyter website uses [lazy loading of images](https://web.dev/browser-level-image-lazy-loading/). In general, images that are "below the fold" (below the browser window on page load) for laptop-sized screen sizes are encouraged to be configured for "lazy loading".
@@ -155,4 +167,4 @@ For images that are "above the fold" (that will be seen by users immediately aft
155167

156168
```html
157169
<img class="my-class" src="my/src.png" loading="eager" />
158-
```
170+
```

_includes/footer.html

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@
22
<div class="footer" role="navigation">
33
<div class="container">
44
<div class="navbar-text">
5-
<p>Copyright © {{site.time | date: '%Y' }} Project Jupyter –
6-
Last updated {{site.time | date: "%a, %b %d, %Y" }}</p>
7-
<p>The Jupyter Trademark is registered with the U.S. Patent &amp; Trademark Office.</p>
8-
</div>
9-
<div class="follow">
10-
<a href="https://github.com/jupyter" class="button github-button" aria-label="Follow @jupyter on GitHub"><svg version="1.1" width="14" height="14" viewBox="0 0 16 16" class="octicon octicon-mark-github" aria-hidden="true"><path fill-rule="evenodd" d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg> <span>Follow @jupyter</span></a>
11-
<br><a href="https://twitter.com/intent/follow?screen_name=ProjectJupyter" class="twitter-follow-button" data-show-count="false">Follow @ProjectJupyter on Twitter</a>
5+
<p>
6+
Copyright © {{site.time | date: '%Y' }} Project Jupyter
7+
</p>
8+
<p>
9+
The Jupyter Trademark is registered with the U.S. Patent & Trademark Office.
10+
</p>
1211
</div>
1312
</div>
1413
</div>

_sass/_nav.scss

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -79,46 +79,6 @@ body {
7979
color: #E46E2E;
8080
}
8181

82-
.footer {
83-
background-color: #757575;
84-
}
85-
86-
.footer p {
87-
color: white;
88-
padding-top: 10px;
89-
}
90-
91-
.footer li {
92-
color: white;
93-
display: inline-block;
94-
text-decoration: none;
95-
}
96-
97-
.footer a {
98-
color: white;
99-
text-decoration: none;
100-
}
101-
102-
.footer a:hover, .footer a:active {
103-
opacity: .8;
104-
}
105-
106-
.footer li::after {
107-
content:" |";
108-
}
109-
110-
.footer li:last-of-type::after {
111-
content:"";
112-
}
113-
114-
.footer-text {
115-
font-size: 16px;
116-
margin-left: 0;
117-
padding-left: 0;
118-
}
119-
120-
121-
12282
/* Reusable elements */
12383

12484
/* Header section of each page */
@@ -764,10 +724,6 @@ body {
764724
display: block;
765725
margin: 0 auto;
766726
}
767-
.footer {
768-
padding-bottom: 15px;
769-
text-align: center;
770-
}
771727
}
772728
@media (min-width: 420px) {
773729
.button-container {

_sass/components/_footer.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@import "settings/colors";
2+
3+
.footer {
4+
background-color: $orange;
5+
p {
6+
color: $black;
7+
padding-top: 10px;
8+
}
9+
}

_sass/settings/_colors.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
$black: #000000;
2+
3+
// Jupyter official orange
4+
$orange: #F37626;
5+
6+
$dark-gray: #4D4D4D;
7+
$medium-dark-gray: #616161;
8+
$medium-gray: #757575;
9+
$gray: #9E9E9E;

assets/css/main.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
@import "about";
1010
@import "gallery";
1111
@import "syntax";
12+
@import "components/footer";
1213
@import "components/jumbotron";
13-
@import "components/jupyterhub";
14+
@import "components/jupyterhub";

0 commit comments

Comments
 (0)