Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions client/styles/abstracts/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ $themes: (
button-border-color: $middle-light,
button-color: $black,
button-hover-color: $lightest,
button-nav-inactive-color: $middle-gray,
button-nav-active-color: $darker,
button-nav-inactive-color: $middle-dark,
button-secondary-background-color: $medium-light,
codefold-icon-closed: url("../images/triangle-arrow-right.svg?byUrl"),
codefold-icon-open: url("../images/triangle-arrow-down.svg?byUrl"),
Expand Down Expand Up @@ -141,6 +142,7 @@ $themes: (
button-border-color: $middle-dark,
button-color: $light,
button-hover-color: $lightest,
button-nav-active-color: $lightest,
button-nav-inactive-color: $middle-light,
button-secondary-background-color: $medium-dark,
codefold-icon-closed: url("../images/triangle-arrow-right-white.svg?byUrl"),
Expand Down Expand Up @@ -239,7 +241,8 @@ $themes: (
button-border-color: $middle-dark,
button-color: $light,
button-hover-color: $dark,
button-nav-inactive-color: $light,
button-nav-active-color: $lightest,
button-nav-inactive-color: $middle-light,
button-secondary-background-color: $medium-dark,
codefold-icon-closed: url("../images/triangle-arrow-right-white.svg?byUrl"),
codefold-icon-open: url("../images/triangle-arrow-down-white.svg?byUrl"),
Expand Down
112 changes: 62 additions & 50 deletions client/styles/components/_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
.nav__menubar {
display: flex;
flex-direction: row;
width:100%;
width: 100%;
justify-content: space-between;
}

Expand Down Expand Up @@ -57,11 +57,11 @@
}

// base focus styles
.nav__item button:focus {
.nav__item button:focus {
@include themify() {
background-color: getThemifyVariable('nav-hover-color');
}

.nav__item-header {
@include themify() {
color: getThemifyVariable('button-hover-color');
Expand All @@ -73,11 +73,13 @@
@include themify() {
fill: getThemifyVariable('button-hover-color');
}
}
}
}


.nav__dropdown-item {
@include themify() {
color: getThemifyVariable('button-nav-active-color');
}
& button:focus,
& a:focus {
@include themify() {
Expand All @@ -93,18 +95,52 @@
}

&.nav__dropdown-item--disabled {
& button,
& a,
& button:hover,
& a:hover {
&:hover {
@include themify() {
background-color: transparent;
color: getThemifyVariable('button-nav-inactive-color');
cursor: not-allowed;
}
}

& .nav__keyboard-shortcut {
@include themify() {
color: getThemifyVariable('button-nav-inactive-color');
}
& .tooltip-wrapper button,
& .tooltip-wrapper a,
&:hover .tooltip-wrapper button,
&:hover .tooltip-wrapper a,
& .tooltip-wrapper button:active,
& .tooltip-wrapper a:active {
@include themify() {
color: getThemifyVariable('button-nav-inactive-color');
background-color: transparent;
cursor: not-allowed;
}
}

& .nav__keyboard-shortcut,
&:hover .nav__keyboard-shortcut,
& .tooltip-wrapper button:hover .nav__keyboard-shortcut,
& .tooltip-wrapper button:focus .nav__keyboard-shortcut {
@include themify() {
color: getThemifyVariable('button-nav-inactive-color');
}
}
}
& button,
& a,
& .tooltip-wrapper button,
& .tooltip-wrapper a {
width: 100%;
height: 100%;
display: flex;
justify-content: space-between;
align-items: center;
}

&:hover {
& .tooltip-wrapper button,
& .tooltip-wrapper a {
@include themify() {
color: getThemifyVariable('button-hover-color');
}
}
}
Expand Down Expand Up @@ -135,8 +171,9 @@
color: getThemifyVariable('button-hover-color');
}
}

& g, & path {

& g,
& path {
@include themify() {
fill: getThemifyVariable('nav-hover-color');
}
Expand All @@ -154,25 +191,26 @@
@include themify() {
color: getThemifyVariable('nav-hover-color');
}
& g, & path {
& g,
& path {
@include themify() {
fill: getThemifyVariable('nav-hover-color');
}
}
}

.nav__item-header-triangle {
margin-left: #{math.div(5, $base-font-size)}rem;
margin-left: #{math.div(5, $base-font-size)}rem;
}

.nav__dropdown {
@include themify() {
color: getThemifyVariable('nav-hover-color');
}
color: getThemifyVariable('nav-hover-color');
}
}

.nav__item-header-triangle {
margin-left: #{math.div(5, $base-font-size)}rem;
margin-left: #{math.div(5, $base-font-size)}rem;
}

.nav__dropdown {
Expand Down Expand Up @@ -214,28 +252,6 @@
// padding: 0;
// }

.nav__dropdown-item {
& button,
& a,
& .tooltip-wrapper button,
& .tooltip-wrapper a {
width: 100%;
height: 100%;
display: flex;
justify-content: space-between;
align-items: center;
}

&:hover {
& .tooltip-wrapper button,
& .tooltip-wrapper a {
@include themify() {
color: getThemifyVariable('button-hover-color');
}
}
}
}

.nav__item-logo {
position: relative;
height: #{math.div(42, $base-font-size)}rem;
Expand All @@ -247,24 +263,19 @@
}

.svg__logo {

@include themify() {
// Set background color of the logo
background-color: getThemifyVariable('logo-color');
}

}

.svg__logo g path{

.svg__logo g path {
@include themify() {
// Set internal color of the logo;
fill: getThemifyVariable('logo-background-color');
}

}


.nav__keyboard-shortcut {
font-size: #{math.div(12, $base-font-size)}rem;
font-family: Inconsololata, monospace;
Expand All @@ -282,7 +293,8 @@
}

.nav__back-icon {
& g, & path {
& g,
& path {
opacity: 1;
@include themify() {
fill: getThemifyVariable('inactive-text-color');
Expand All @@ -297,4 +309,4 @@
width: 100%;
height: 100%;
text-decoration: none;
}
}
Loading