From e1be90011e55207468b16ecab0656b29f887aa7e Mon Sep 17 00:00:00 2001 From: Deco Vander Date: Fri, 4 Jul 2025 16:25:25 -0400 Subject: [PATCH] Consolidate theme toggle styles and update repository references - Extract duplicated theme-toggle styles into shared mixin (theme-toggle-styles) - Remove duplicate CSS across privacy.scss, admin.scss, index.scss, and main.scss - Apply mixin consistently to .theme-toggle, .theme-toggle-admin classes - Update git repository references from GitHub to git.deco.sh - Update README.md, privacy.html, and deploy script URLs - Build optimized CSS with consolidated styles --- README.md | 6 +++--- public/privacy.html | 2 +- scripts/deploy.sh | 2 +- src/scss/main.scss | 12 +----------- src/scss/{_mixins.scss => mixins.scss} | 15 +++++++++++++++ src/scss/pages/_admin.scss | 6 +----- src/scss/pages/_index.scss | 3 ++- src/scss/pages/_privacy.scss | 9 +++------ 8 files changed, 27 insertions(+), 28 deletions(-) rename src/scss/{_mixins.scss => mixins.scss} (90%) diff --git a/README.md b/README.md index f1ba479..8e54b37 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ A community-driven web application for tracking winter road conditions and icy h 1. **Clone the repository:** ```bash - git clone git@github.com:deco/ice.git + git clone git@git.deco.sh:deco/ice.git cd ice ``` @@ -89,7 +89,7 @@ PORT=3000 2. **Deploy your application:** ```bash - git clone git@github.com:deco/ice.git /opt/ice + git clone git@git.deco.sh:deco/ice.git /opt/ice cd /opt/ice npm install # This automatically builds CSS via postinstall ``` @@ -149,7 +149,7 @@ MIT License - see LICENSE file for details ## Support This is a community safety tool. For issues or questions: -- Create a GitHub issue +- Create an issue on our git repository - Check existing documentation - Review security guidelines diff --git a/public/privacy.html b/public/privacy.html index 1e8d6df..6b56e18 100644 --- a/public/privacy.html +++ b/public/privacy.html @@ -92,7 +92,7 @@

Contact Information

Questions about this privacy policy or your data?

diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 6b46198..192615c 100644 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -104,7 +104,7 @@ echo "" echo "🚀 Next steps to deploy Great Lakes Ice Report:" echo "" echo "1. Clone your repository:" -echo " git clone git@github.com:deco/great-lakes-ice-report.git /opt/great-lakes-ice-report" +echo " git clone git@git.deco.sh:deco/ice.git /opt/great-lakes-ice-report" echo "" echo "2. Set up the application:" echo " cd /opt/great-lakes-ice-report" diff --git a/src/scss/main.scss b/src/scss/main.scss index 4c15bf3..c15733b 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -135,17 +135,7 @@ button { // Theme toggle styles (common across pages) .theme-toggle { - @include button($bg-color: transparent); - border: 2px solid var(--border-color); - border-radius: $border-radius-full; - width: 40px; - height: 40px; - @include flex-center; - - &:hover { - background-color: var(--table-hover); - transform: none; - } + @include theme-toggle-styles; } // Utility classes diff --git a/src/scss/_mixins.scss b/src/scss/mixins.scss similarity index 90% rename from src/scss/_mixins.scss rename to src/scss/mixins.scss index 85f9d6b..e35df41 100644 --- a/src/scss/_mixins.scss +++ b/src/scss/mixins.scss @@ -122,6 +122,21 @@ color: $text-color; } +// Theme Toggle Mixin (consolidates duplicated theme toggle styles) +@mixin theme-toggle-styles { + @include button($bg-color: transparent); + border: 2px solid var(--border-color); + border-radius: $border-radius-full; + width: 40px; + height: 40px; + @include flex-center; + + &:hover { + background-color: var(--table-hover); + transform: none; + } +} + // Back-link button mixin (shared component) @mixin back-link-styles { display: inline-block; diff --git a/src/scss/pages/_admin.scss b/src/scss/pages/_admin.scss index df43a1e..9a115ad 100644 --- a/src/scss/pages/_admin.scss +++ b/src/scss/pages/_admin.scss @@ -58,13 +58,9 @@ } .theme-toggle-admin { + @include theme-toggle-styles; background: var(--card-bg) !important; color: var(--text-color) !important; - border: 2px solid var(--border-color) !important; - width: 40px; - height: 40px; - border-radius: $border-radius-full !important; - @include flex-center; padding: 0 !important; } diff --git a/src/scss/pages/_index.scss b/src/scss/pages/_index.scss index 8393d9e..7e6c3c6 100644 --- a/src/scss/pages/_index.scss +++ b/src/scss/pages/_index.scss @@ -58,7 +58,8 @@ } } - .theme-toggle { +.theme-toggle { + @include theme-toggle-styles; align-self: center; } } diff --git a/src/scss/pages/_privacy.scss b/src/scss/pages/_privacy.scss index 57855c9..28ef385 100644 --- a/src/scss/pages/_privacy.scss +++ b/src/scss/pages/_privacy.scss @@ -23,19 +23,16 @@ } &__theme-toggle { + @include theme-toggle-styles; position: absolute; top: 0; right: 0; - background: var(--card-bg); - border: 2px solid var(--border-color); - border-radius: 50%; width: 50px; height: 50px; - @include flex-center; + box-shadow: 0 2px 4px var(--shadow); cursor: pointer; transition: all 0.3s ease; - box-shadow: 0 2px 4px var(--shadow); - + .theme-icon { font-size: $font-size-lg; }