Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Utilize scss features in sidebar styles #4010

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+120 −122
Open

Utilize scss features in sidebar styles #4010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/resources/styles.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dev_dependencies:
dart_style: ^3.0.0
lints: ^5.0.0
matcher: ^0.12.15
sass: ^1.85.0
sass: ^1.85.1
test: ^1.24.2
test_descriptor: ^2.0.1
test_process: ^2.0.3
Expand Down
2 changes: 1 addition & 1 deletion web/sig.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FBB2C1241F0FD138D012004E4AA98F0E
B33E364DD554BA379AE780C5C4237B34
5 changes: 0 additions & 5 deletions web/styles/_breadcrumbs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,3 @@ ol.breadcrumbs li a {
.self-crumb {
color: var(--main-h-text);
}

.self-name {
color: #555;
display: none;
}
4 changes: 4 additions & 0 deletions web/styles/_content.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ a {
text-decoration: none;
}

button {
padding: 0;
}

section {
/* Note that the generated HTML for pub packages may have `section` tags
transformed into `div` tags. */
Expand Down
5 changes: 5 additions & 0 deletions web/styles/_header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,9 @@ header {
height: 50px;
margin-bottom: 25px;
}

.self-name {
color: #555;
display: none;
}
}
222 changes: 108 additions & 114 deletions web/styles/_sidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,73 +2,121 @@
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.

.sidebar ol {
list-style: none;
line-height: 22px;
margin-top: 0;
margin-bottom: 0;
padding: 0 0 15px 0;
}
.sidebar {
h5, ol li {
text-overflow: ellipsis;
overflow: hidden;
padding: 3px 0 3px 3px;
}

.sidebar h5 a,
.sidebar h5 a:hover {
color: var(--main-sidebar-color);
}
ol {
list-style: none;
line-height: 22px;
margin-top: 0;
margin-bottom: 0;
padding: 0 0 15px 0;

li {
&.section-title {
font-size: 18px;
font-weight: normal;
text-transform: uppercase;
padding-top: 25px;
}

&.section-subtitle {
font-weight: 400;
text-transform: uppercase;

a {
color: inherit;
}
}

&.section-subitem {
margin-left: 12px;
}

&:first-child {
padding-top: 3px;
margin-top: 0;
}
}
}

.sidebar h5,
.sidebar ol li {
text-overflow: ellipsis;
overflow: hidden;
padding: 3px 0 3px 3px;
}
h5 {
color: var(--main-sidebar-color);
font-size: 18px;
margin: 0 0 22px 0;
padding-top: 0;

.sidebar h5 {
color: var(--main-sidebar-color);
font-size: 18px;
margin: 0 0 22px 0;
padding-top: 0;
a, a:hover {
color: var(--main-sidebar-color);
}
}
}

.sidebar ol li.section-title {
font-size: 18px;
font-weight: normal;
text-transform: uppercase;
padding-top: 25px;
}
#sidenav-left-toggle {
display: none;
vertical-align: text-bottom;
padding: 0;
color: var(--main-icon-color);
user-select: none;
cursor: pointer;

.sidebar ol li.section-subtitle a {
color: inherit;
}
&:hover {
color: var(--main-hyperlinks-color);
}

.sidebar ol li.section-subtitle {
font-weight: 400;
text-transform: uppercase;
@media screen and (max-width: 320px) {
margin-right: 10px;
margin-left: 20px;
}
}

.sidebar ol li.section-subitem {
margin-left: 12px;
}
#overlay-under-drawer {
display: none;

.sidebar ol li:first-child {
padding-top: 3px;
margin-top: 0;
opacity: 0.4;
height: 100%;
z-index: 1999;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: black;
}

button {
padding: 0;
}
.sidebar-offcanvas-left {
flex: 0 1 230px;
order: 1;
overflow-y: scroll;
padding: 20px 0 15px 30px;
margin: 5px 20px 0 0;

#sidenav-left-toggle {
display: none;
vertical-align: text-bottom;
padding: 0;
color: var(--main-icon-color);
user-select: none;
cursor: pointer;
h5 {
margin-bottom: 10px;

&:last-of-type {
border: 0;
margin-bottom: 25px;
}
}
}

#sidenav-left-toggle:hover {
color: var(--main-hyperlinks-color);
.sidebar-offcanvas-right {
flex: 0 1 12em;
order: 3;
overflow-y: scroll;
padding: 20px 15px 15px 15px;
margin-top: 5px;
margin-right: 20px;

// The right nav should disappear out of view when the window shrinks.
@media screen and (max-width: 992px) {
display: none;
}
}

/* left-nav disappears, and can transition in from the left */
Expand All @@ -84,15 +132,6 @@ button {
}

#overlay-under-drawer.active {
opacity: 0.4;
height: 100%;
z-index: 1999;
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: black;
display: block;
}

Expand All @@ -103,77 +142,32 @@ button {
z-index: 2000;
top: 0;
width: 280px; /* works all the way down to an iphone 4 */
// Set a max width for narrow layouts that accounts for margin.
max-width: calc(100% - 20px);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only functional change as during my testing very narrow layouts resulted in the sidenav covering content when not open.

height: 90%;
background-color: var(--main-bg-color);
overflow-y: scroll; /* TODO: how to hide scroll bars? */
padding: 10px;
margin: 10px 10px;
box-shadow: 5px 5px 5px 5px #444444;

&.active {
// Enable animating the drawer into the page view.
left: 0;
}
}

ol#sidebar-nav {
font-size: 18px;
white-space: pre-line;
}

.sidebar-offcanvas-left.active {
left: 0; /* this animates our drawer into the page */
}

.self-name {
header .self-name {
display: inline-block;
color: var(--main-hyperlinks-color);
}
}

.sidebar-offcanvas-left h5 {
margin-bottom: 10px;
}

.sidebar-offcanvas-left h5:last-of-type {
border: 0;
margin-bottom: 25px;
}

/* the right nav disappears out of view when the window shrinks */
@media screen and (max-width: 992px) {
.sidebar-offcanvas-right {
display: none;
}
}

#overlay-under-drawer {
display: none;
}

@media screen and (max-width: 320px) {
#sidenav-left-toggle {
margin-right: 10px;
margin-left: 20px;
}

.self-name {
margin-right: 10px;
}
}

.sidebar-offcanvas-left {
flex: 0 1 230px;
order: 1;
overflow-y: scroll;
padding: 20px 0 15px 30px;
margin: 5px 20px 0 0;
}

.sidebar-offcanvas-right {
flex: 0 1 12em;
order: 3;
overflow-y: scroll;
padding: 20px 15px 15px 15px;
margin-top: 5px;
margin-right: 20px;
}

::-webkit-scrollbar-button{ display: none; height: 13px; border-radius: 0; background-color: #AAA; }
::-webkit-scrollbar-button:hover{ background-color: #AAA; }
::-webkit-scrollbar-thumb{ background-color: var(--main-scrollbar-color); }
Expand Down