Skip to content
Closed
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
58 changes: 43 additions & 15 deletions client/styles/components/_nav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@
@include themify() {
border-bottom: 1px dashed map-get($theme-map, 'nav-border-color');
}

// padding-left: #{math.div(20, $base-font-size)}rem;
}

.nav__menubar {
display: flex;
flex-direction: row;
width:100%;
width: 100%;
justify-content: space-between;
}

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

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

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

.nav__back-icon g,
.nav__back-icon path {
@include themify() {
fill: getThemifyVariable('button-hover-color');
}
}
}


.nav__dropdown-item {

& button:focus,
& a:focus {
@include themify() {
color: getThemifyVariable('button-hover-color');
background-color: getThemifyVariable('nav-hover-color');
}
}

& button:focus .nav__keyboard-shortcut,
& a:focus .nav__keyboard-shortcut {
@include themify() {
Expand All @@ -93,6 +104,7 @@
}

&.nav__dropdown-item--disabled {

& button,
& a,
& button:hover,
Expand Down Expand Up @@ -131,8 +143,9 @@
color: getThemifyVariable('button-hover-color');
}
}

& g, & path {

& g,
& path {
@include themify() {
fill: getThemifyVariable('nav-hover-color');
}
Expand All @@ -144,38 +157,48 @@
fill: getThemifyVariable('button-hover-color');
}
}

.nav__back-icon g,
.nav__back-icon path {
@include themify() {
fill: getThemifyVariable('button-hover-color');
}
}
}

.nav__item-header:hover {
@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 {
@extend %dropdown-open-left;
display: none;
max-height: 60vh;
overflow-y: auto;

.nav__item--open & {
display: flex;
}
Expand Down Expand Up @@ -211,6 +234,7 @@
// }

.nav__dropdown-item {

& button,
& a {
width: 100%;
Expand Down Expand Up @@ -240,8 +264,8 @@

}

.svg__logo g path{
.svg__logo g path {

@include themify() {
// Set internal color of the logo;
fill: getThemifyVariable('logo-background-color');
Expand All @@ -266,15 +290,19 @@
}

.nav__back-icon {
& g, & path {

& g,
& path {
opacity: 1;

@include themify() {
fill: getThemifyVariable('inactive-text-color');
}
}

margin-right: #{math.div(5, $base-font-size)}rem;
}

.nav__back-link {
display: flex;
}
}
2 changes: 1 addition & 1 deletion server/config/passport.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ passport.use(
{
clientID: process.env.GOOGLE_ID,
clientSecret: process.env.GOOGLE_SECRET,
callbackURL: 'https://editor.p5js.org/auth/google/callback',
callbackURL: '/auth/google/callback',
passReqToCallback: true,
scope: ['openid email']
},
Expand Down