Skip to content

Commit 7f67473

Browse files
committed
Place footer below main content
1 parent 5dbd403 commit 7f67473

File tree

8 files changed

+40
-30
lines changed

8 files changed

+40
-30
lines changed

lib/resources/styles.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/sig.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
B33E364DD554BA379AE780C5C4237B34
1+
631031823A0AFF791A65761D059274B6

web/styles/_base.scss

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
html {
6+
// Account for sticky header, so fragments appear below it after scrolling.
7+
scroll-padding-top: calc(var(--main-header-height) + 1rem);
8+
}
9+
510
html,
611
body {
712
margin: 0;
813
padding: 0;
9-
height: 100%;
1014
width: 100%;
11-
overflow: hidden;
1215
box-sizing: border-box;
1316
}
1417

@@ -19,7 +22,6 @@ body {
1922
body {
2023
display: flex;
2124
flex-direction: column;
22-
-webkit-overflow-scrolling: touch;
2325

2426
-webkit-text-size-adjust: 100%;
2527
overflow-x: hidden;
@@ -34,5 +36,4 @@ main {
3436
flex: 1;
3537
display: flex;
3638
flex-direction: row;
37-
min-height: 0;
3839
}

web/styles/_content.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
order: 2;
88
overflow-y: scroll;
99
padding: 10px 20px 0 20px;
10+
min-height: calc(100vh - var(--main-header-height));
1011
}
1112

1213
a {

web/styles/_header.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
header {
6-
flex: 0 0 50px;
6+
flex: 0 0 var(--main-header-height, 50px);
77
display: flex;
88
flex-direction: row;
99
align-items: center;
10+
11+
position: sticky;
12+
top: 0;
13+
z-index: 10;
14+
1015
padding-left: 30px;
1116
padding-right: 30px;
1217
background-color: var(--main-header-color);

web/styles/_search.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,17 @@
5656

5757

5858
.typeahead {
59-
padding: 17px 17px 17px 50px;
59+
padding: 16px 16px 16px 32px;
6060
width: 422px;
61-
height: 20px;
62-
font-size: 13px;
61+
height: 24px;
62+
font-size: 15px;
63+
background-color: var(--main-bg-color);
64+
color: var(--main-text-color);
6365
background-image: url("./search.svg");
6466
background-repeat: no-repeat;
65-
background-position: 4%;
67+
background-position: 2%;
6668
outline: 0;
6769
background-size: 20px;
68-
filter: var(--main-number-filter);
6970
}
7071

7172
.search-summary {

web/styles/_sidebar.scss

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,19 @@
8888
background-color: black;
8989
}
9090

91+
.sidebar-offcanvas-left, .sidebar-offcanvas-right {
92+
position: sticky;
93+
top: var(--main-header-height);
94+
overflow-y: auto;
95+
min-height: 0;
96+
max-height: calc(100vh - var(--main-header-height));
97+
}
98+
9199
.sidebar-offcanvas-left {
92100
flex: 0 1 230px;
93101
order: 1;
94-
overflow-y: scroll;
95-
padding: 20px 0 15px 30px;
96-
margin: 5px 20px 0 0;
102+
padding: 25px 0 15px 30px;
103+
margin-right: 20px;
97104

98105
h5 {
99106
margin-bottom: 10px;
@@ -108,10 +115,7 @@
108115
.sidebar-offcanvas-right {
109116
flex: 0 1 12em;
110117
order: 3;
111-
overflow-y: scroll;
112-
padding: 20px 15px 15px 15px;
113-
margin-top: 5px;
114-
margin-right: 20px;
118+
padding: 25px 20px 15px 15px;
115119

116120
// The right nav should disappear out of view when the window shrinks.
117121
@media screen and (max-width: 992px) {
@@ -146,7 +150,7 @@
146150
max-width: calc(100% - 20px);
147151
height: 90%;
148152
background-color: var(--main-bg-color);
149-
overflow-y: scroll; /* TODO: how to hide scroll bars? */
153+
overflow-y: scroll;
150154
padding: 10px;
151155
margin: 10px 10px;
152156
box-shadow: 5px 5px 5px 5px #444444;
@@ -167,11 +171,3 @@
167171
color: var(--main-hyperlinks-color);
168172
}
169173
}
170-
171-
::-webkit-scrollbar-button{ display: none; height: 13px; border-radius: 0; background-color: #AAA; }
172-
::-webkit-scrollbar-button:hover{ background-color: #AAA; }
173-
::-webkit-scrollbar-thumb{ background-color: var(--main-scrollbar-color); }
174-
::-webkit-scrollbar-thumb:hover{ background-color: var(--main-scrollbar-color); }
175-
::-webkit-scrollbar{ width: 4px; }
176-
177-
.main-content::-webkit-scrollbar{ width: 8px; }

web/styles/_theme.scss

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5+
:root {
6+
--main-header-height: 50px;
7+
}
8+
59
.light-theme {
610
/*background-color body, listdropdown*/
711
--main-bg-color: #fff;
@@ -36,7 +40,6 @@
3640
--main-var-color: #008080;
3741
--main-string-color: #d14;
3842

39-
--main-number-filter: invert(0%);
4043
--main-icon-color: black;
4144

4245
/* alerts */
@@ -46,6 +49,8 @@
4649
--alert-warning-fgColor: #955d00;
4750
--alert-error-fgColor: #c43131;
4851

52+
color-scheme: light;
53+
4954
#light-theme-button {
5055
display: none;
5156
}
@@ -88,7 +93,6 @@
8893
--main-var-color: #55A09B;
8994
--main-string-color: #FF2D64;
9095

91-
--main-number-filter: invert(100%);
9296
--main-icon-color: white;
9397

9498
/* alerts */
@@ -98,6 +102,8 @@
98102
--alert-warning-fgColor: #cea11f;
99103
--alert-error-fgColor: #ff6666;
100104

105+
color-scheme: dark;
106+
101107
#dark-theme-button {
102108
display: none;
103109
}

0 commit comments

Comments
 (0)