From 9e19d5e89caad30d4ea1848fcb0e743f9165df20 Mon Sep 17 00:00:00 2001 From: Piyush Zingade Date: Sun, 30 Nov 2025 03:19:29 +0530 Subject: [PATCH 1/2] fix(ui): change the hover color of the navbar button --- client/styles/components/_nav.scss | 50 +++++++++++++++++++++--------- server/config/passport.js | 2 +- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/client/styles/components/_nav.scss b/client/styles/components/_nav.scss index 5d597596ac..9e5f83b238 100644 --- a/client/styles/components/_nav.scss +++ b/client/styles/components/_nav.scss @@ -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; } @@ -57,11 +58,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'); @@ -73,11 +74,12 @@ @include themify() { fill: getThemifyVariable('button-hover-color'); } - } + } } .nav__dropdown-item { + & button:focus, & a:focus { @include themify() { @@ -85,6 +87,7 @@ background-color: getThemifyVariable('nav-hover-color'); } } + & button:focus .nav__keyboard-shortcut, & a:focus .nav__keyboard-shortcut { @include themify() { @@ -93,6 +96,7 @@ } &.nav__dropdown-item--disabled { + & button, & a, & button:hover, @@ -131,8 +135,9 @@ color: getThemifyVariable('button-hover-color'); } } - - & g, & path { + + & g, + & path { @include themify() { fill: getThemifyVariable('nav-hover-color'); } @@ -144,13 +149,22 @@ 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'); } @@ -158,17 +172,17 @@ } .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 { @@ -176,6 +190,7 @@ display: none; max-height: 60vh; overflow-y: auto; + .nav__item--open & { display: flex; } @@ -211,6 +226,7 @@ // } .nav__dropdown-item { + & button, & a { width: 100%; @@ -240,8 +256,8 @@ } -.svg__logo g path{ - +.svg__logo g path { + @include themify() { // Set internal color of the logo; fill: getThemifyVariable('logo-background-color'); @@ -266,15 +282,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; -} +} \ No newline at end of file diff --git a/server/config/passport.js b/server/config/passport.js index f9ec1192bb..ff1c4fa44e 100644 --- a/server/config/passport.js +++ b/server/config/passport.js @@ -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'] }, From 3644934cb20369d4b7be3a699fe3be09170c9b51 Mon Sep 17 00:00:00 2001 From: Piyush Zingade Date: Sun, 30 Nov 2025 03:28:03 +0530 Subject: [PATCH 2/2] fix(ui): change the hover color of the navbar button --- client/styles/components/_nav.scss | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/client/styles/components/_nav.scss b/client/styles/components/_nav.scss index 9e5f83b238..70b8853b5b 100644 --- a/client/styles/components/_nav.scss +++ b/client/styles/components/_nav.scss @@ -58,7 +58,8 @@ } // base focus styles -.nav__item button:focus { +.nav__item button:focus, +.nav__item a:focus { @include themify() { background-color: getThemifyVariable('nav-hover-color'); } @@ -75,6 +76,13 @@ fill: getThemifyVariable('button-hover-color'); } } + + .nav__back-icon g, + .nav__back-icon path { + @include themify() { + fill: getThemifyVariable('button-hover-color'); + } + } }