diff --git a/app/assets/other/avatars/.index b/app/assets/other/avatars/.index deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/app/assets/tmp/_index_ b/app/assets/tmp/_index_ deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/app/assets/v2/css/base.css b/app/assets/v2/css/base.css index ef59419fe2f..7dd7d6a3d21 100644 --- a/app/assets/v2/css/base.css +++ b/app/assets/v2/css/base.css @@ -1725,3 +1725,12 @@ div.busyOverlay { font-size: 22px; } +.bg-shade-0 { + background: var(--bg-shade-0); +} +.bg-shade-1{ + background: var(--bg-shade-1); +} +.bg-shade-2{ + background: var(--bg-shade-2); +} diff --git a/app/assets/v2/css/buttons.css b/app/assets/v2/css/buttons.css index 9bc2cbb2081..079f04029e3 100644 --- a/app/assets/v2/css/buttons.css +++ b/app/assets/v2/css/buttons.css @@ -274,7 +274,7 @@ button:focus { } .btn-radio i { - color: #3E00FF; + color: var(--button-radio-icon-color); } .badge-greylight { diff --git a/app/assets/v2/css/colors.css b/app/assets/v2/css/colors.css index 0ec44ecc7fc..42ce16e9a8e 100644 --- a/app/assets/v2/css/colors.css +++ b/app/assets/v2/css/colors.css @@ -1,4 +1,4 @@ -:root { +html { --gc-light-blue: #16a8d5; --gc-blue: #3E00FF; --gc-blue-hover: #5b24ff; @@ -24,6 +24,62 @@ --text-light: #D8D8D8; --text-dark: var(--gc-black); + + --bg-shade-0: white; + --bg-shade-1: white; + --bg-shade-2: #5f5c74; + + --main-bg: #eff3f6; + --form-input-bg: white; + --form-input-color: rgba(0, 0, 0, 0.38); + --button-radio-icon-color: #3e00ff; + --link-color: #3e00ff; + --townsquare-link-color: black; + --townsquare-block-header-color: #626365; + --active-button-border-color: var(--link-color); + --default-text-color: var(--text-dark); +} + +/* @media screen and (prefers-color-scheme: dark) { */ +html.dark-mode { + --gc-light-blue: #16a8d5; + --gc-blue: #3E00FF; + --gc-blue-hover: #5b24ff; + --gc-purple: #0D0764; + --gc-purple-hover: #0b0d9d; + --gc-green: #0FCE7C; + --gc-green-hover: #25E899; + --gc-pink: #f9006c; + --gc-pink-hover: #f167a3; + --gc-yellow: #F5A623; + + --gc-white: #ffffff; + --gc-light-violet: #bbafd0; + --gc-dark-violet: #130b88; + --gc-black: #0d023a; + --t: #ccc; + + --gc-grey: #fafafa; + --gc-blue-grey: #f2f6f9; + --gc-dark-grey: #868789; + --gc-darker-grey: #3d3d3d; + + --text-light: #D8D8D8; + --text-dark: var(--gc-black); + + --bg-shade-0: #0a0428; + --bg-shade-1: #221d3e; + --bg-shade-2: #5f5c74; + + --main-bg: #0a0428; + --form-input-bg: #221d3e; + --form-input-color: white; + --button-radio-icon-color: white; + --link-color: white; + --townsquare-link-color: white; + --townsquare-block-header-color: white; + --active-button-border-color: white; + --default-text-color: white; } .text-highlight-purple { diff --git a/app/assets/v2/css/forms/input.css b/app/assets/v2/css/forms/input.css index 46a67f746b5..1a156df0430 100644 --- a/app/assets/v2/css/forms/input.css +++ b/app/assets/v2/css/forms/input.css @@ -1,5 +1,5 @@ .form__input { - background-color: #FFF; + background-color: var(--form-input-bg); border-radius: 2px; border: 1px solid #D8D8D8; padding: 5px 7px; @@ -47,20 +47,9 @@ textarea.form__input { background-position: top 0.5rem right 0.5rem; } +.form__input, .form__input::-webkit-input-placeholder { - color: rgba(0, 0, 0, 0.38); -} - -.form__input::-moz-placeholder { - color: rgba(0, 0, 0, 0.38); -} - -.form__input:-moz-placeholder { - color: rgba(0, 0, 0, 0.38); -} - -.form__input:-ms-input-placeholder { - color: rgba(0, 0, 0, 0.38); + color: var(--form-input-color); } .form__input:disabled { diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css index 59d54c52888..7325187cb86 100644 --- a/app/assets/v2/css/gitcoin.css +++ b/app/assets/v2/css/gitcoin.css @@ -262,8 +262,9 @@ div.button-pink { background-repeat: no-repeat; } + .bg-lightblue { - background-color: #EFF3F6; + background-color: var(--main-bg); } .bg-lightpurple { diff --git a/app/assets/v2/css/labs.css b/app/assets/v2/css/labs.css index c93eabc7825..aaf56dca562 100644 --- a/app/assets/v2/css/labs.css +++ b/app/assets/v2/css/labs.css @@ -1,5 +1,5 @@ body { - color: var(--text-dark); + color: var(--default-text-color); } .navbar { diff --git a/app/assets/v2/css/notifications.css b/app/assets/v2/css/notifications.css index 1ee70c02ba5..10cfc67a925 100644 --- a/app/assets/v2/css/notifications.css +++ b/app/assets/v2/css/notifications.css @@ -1,13 +1,21 @@ -:root { +html { --color-notification: 37, 232, 153; --badge-bg: #D6FBEB; --badge-text: #00A55E; --link-color: #3E00FF; --badge-blue-bg: #E7F0FA; --badge-blue-text: #6587AE; - } +/* @media screen and (prefers-color-scheme: dark) { */ +html.dark-mode { + --color-notification: 37, 232, 153; + --badge-bg: #D6FBEB; + --badge-text: #00A55E; + --link-color: #3E00FF; + --badge-blue-bg: #5f5c74; + --badge-blue-text: white; +} .navbar-nav .nav-link.notification__icon { position: relative; diff --git a/app/assets/v2/css/theme_switcher.css b/app/assets/v2/css/theme_switcher.css new file mode 100644 index 00000000000..b5dafc1313f --- /dev/null +++ b/app/assets/v2/css/theme_switcher.css @@ -0,0 +1,23 @@ +#theme-switcher{ + align-items: center; + cursor: pointer; +} + +.theme-switcher-svg { + fill: white; + width: 1em; + height: 1em; + display: inline-block; + font-size: 1.5rem; + transition: fill 200ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; + flex-shrink: 0; + user-select: none; +} + +html:not(.dark-mode) .theme-switcher__dark { + display: none; +} + +html.dark-mode .theme-switcher__light { + display: none; +} \ No newline at end of file diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index a07194f43be..88d6cb89bd6 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1,3 +1,6 @@ +body { + color: var(--default-text-color); +} #mobile_nav_toggle{ display: none !important; } @@ -862,7 +865,7 @@ body.green.offer_view .announce { .townsquare_nav-list .nav-item .nav-link { padding-left: 0; - color: black; + color: var(--townsquare-link-color); } .townsquare_nav-list .nav-link.active { @@ -886,7 +889,7 @@ body.green.offer_view .announce { .townsquare_block-header { font-size: 0.9rem; - color: #626365; + color: var(--townsquare-block-header-color); text-transform: uppercase; cursor: pointer; } @@ -900,10 +903,11 @@ body.green.offer_view .announce { background-color: var(--badge-blue-bg); color: var(--badge-blue-text); border: 1px solid transparent; + margin-bottom: 0.5rem !important; } #status .btn-group-toggle .btn-radio.active { - border: 1px solid var(--link-color); + border: 1px solid var(--active-button-border-color); } .grey { diff --git a/app/assets/v2/js/theme_switcher.js b/app/assets/v2/js/theme_switcher.js new file mode 100644 index 00000000000..1a8f6341898 --- /dev/null +++ b/app/assets/v2/js/theme_switcher.js @@ -0,0 +1,53 @@ +let CURRENT_MODE; +const LIGHT_MODE = 'light'; +const DARK_MODE = 'dark'; + +const isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches; +const theme = window.localStorage.getItem('theme'); +if (theme === 'dark' || (!theme && window.matchMedia("(prefers-color-scheme: dark)"))) { + document.documentElement.classList.add('dark-mode'); +} + +document.addEventListener('DOMContentLoaded', subscribe, false); + +function subscribe() { + // Handle preferred user theme mode + document.getElementById('theme-switcher').addEventListener("click", onToggleMode); + + // Load theme if persisted + const mode = window.localStorage.getItem('theme'); + if (mode) { + return activateMode(mode); + } + + // Attempt to detect theme mode + const isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches + const isLightMode = window.matchMedia("(prefers-color-scheme: light)").matches + + window.matchMedia("(prefers-color-scheme: dark)").addListener(e => e.matches && activateDarkMode()) + window.matchMedia("(prefers-color-scheme: light)").addListener(e => e.matches && activateLightMode()) + + if(isDarkMode) activateDarkMode() + if(isLightMode) activateLightMode() +} + +function onToggleMode() { + const mode = CURRENT_MODE === LIGHT_MODE ? DARK_MODE : LIGHT_MODE; + window.localStorage.setItem('theme', mode); + activateMode(mode); +} + +function activateLightMode() { + activateMode(LIGHT_MODE); +} + +function activateDarkMode() { + activateMode(DARK_MODE); +} + +function activateMode(mode) { + CURRENT_MODE = mode; + + // Toggle root dark-mode class + document.documentElement.classList.toggle('dark-mode', mode === DARK_MODE); +} \ No newline at end of file diff --git a/app/dashboard/templates/shared/menu.html b/app/dashboard/templates/shared/menu.html index 128e82b2896..a8bf0030a63 100644 --- a/app/dashboard/templates/shared/menu.html +++ b/app/dashboard/templates/shared/menu.html @@ -331,5 +331,6 @@
Weekly leaderboard
diff --git a/app/dashboard/templates/shared/theme_switcher.html b/app/dashboard/templates/shared/theme_switcher.html new file mode 100644 index 00000000000..9a87f3a0f13 --- /dev/null +++ b/app/dashboard/templates/shared/theme_switcher.html @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/app/media/.gitkeep b/app/media/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/app/townsquare/templates/townsquare/index.html b/app/townsquare/templates/townsquare/index.html index b188472e610..b8199e91314 100644 --- a/app/townsquare/templates/townsquare/index.html +++ b/app/townsquare/templates/townsquare/index.html @@ -27,6 +27,8 @@ + + diff --git a/app/townsquare/templates/townsquare/shared/shareactivity.html b/app/townsquare/templates/townsquare/shared/shareactivity.html index eb482944521..60e006c759f 100644 --- a/app/townsquare/templates/townsquare/shared/shareactivity.html +++ b/app/townsquare/templates/townsquare/shared/shareactivity.html @@ -1,6 +1,6 @@ {% load humanize static i18n %} {% if not is_direct_link %} -
+