From 371dbdc8af5d618f12f3c03b27e0102aa71150f4 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Tue, 17 Mar 2020 06:30:15 +0000 Subject: [PATCH 01/34] Update index.html --- app/townsquare/templates/townsquare/index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/townsquare/templates/townsquare/index.html b/app/townsquare/templates/townsquare/index.html index ba0fe27a162..96f122d17f0 100644 --- a/app/townsquare/templates/townsquare/index.html +++ b/app/townsquare/templates/townsquare/index.html @@ -170,6 +170,10 @@ +
+ +
+ {% include 'shared/analytics.html' %} {% include 'shared/footer_scripts.html' with slim=1 %} From 0a259e01f7d52865f2eb1b551cf3cae30784ef46 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Tue, 17 Mar 2020 06:33:53 +0000 Subject: [PATCH 02/34] Update townsquare.js --- app/assets/v2/js/pages/townsquare.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/v2/js/pages/townsquare.js b/app/assets/v2/js/pages/townsquare.js index c27a67b10bf..2c7b40f9c77 100644 --- a/app/assets/v2/js/pages/townsquare.js +++ b/app/assets/v2/js/pages/townsquare.js @@ -96,6 +96,11 @@ $(document).ready(function() { document.location.href = get_redir_location($('.nav-link.active').data('slug')); }, 10); }); + + // Enables Dark Mode + $(".toggle-switch").on("click", function(event){ + $("body").toggleClass("dark"); + }); // toggles the daily email sender $('body').on('change', '#receive_daily_offers_in_inbox', function(e) { From 7be0c35c2af7cca8a3a0cc4755b4d842a217e92d Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Tue, 17 Mar 2020 06:35:11 +0000 Subject: [PATCH 03/34] Update town_square.css --- app/assets/v2/css/town_square.css | 64 +++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index a6e26fa9f10..c871da93d22 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -999,3 +999,67 @@ body.green.offer_view .announce { display:inline-block; } } + +/* Toggle Switch for Dark Mode */ + +input[type=checkbox].toggle-switch { + transform: rotate(180deg); + appearance: none; + -moz-appearance: none; + -webkit-appearance: none; + outline: 0; + cursor: pointer; + /* width of the track */ + width: 4em; + /* height of the track */ + height: 1.5em; + border-radius: 3em; + background-color: #ebebeb; + transition: background-color 0.09s ease-in-out; + position: relative; +} + +input[type=checkbox].toggle-switch:active::after { + background-color: #f2f2f2; + padding-right: .8em; +} + +input[type=checkbox].toggle-switch::after { + content: ''; + width: 2em; + height: 2em; + background-color: white; + border-radius: 3em; + position: absolute; + left: -5px; + top: 50%; + transform: translateY(-50%); + transition: left 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275), padding 0.3s ease, margin 0.3s ease; + box-shadow: 2px 0px 5px 0 rgba(0, 0, 0, 0.15); +} + +input[type=checkbox].toggle-switch:checked { + background-color: #333; + color: #fff; +} + +input[type=checkbox].toggle-switch:checked:active::after { + margin-left: -.8em; +} + +input[type=checkbox].toggle-switch:checked::after { + left: 2em; + background-color: #fff; +} + +.dark { + background-color: rgb(23, 7, 61); +} + +.dark .townsquare_nav-list .nav-item .nav-link { + color: #fff; +} + +.dark .townsquare_block-header { + color: #fff; +} From 9251e31cf0706a355df60004dbe0c6a96d6260f8 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Tue, 17 Mar 2020 12:52:45 -0400 Subject: [PATCH 04/34] Update town_square.css --- app/assets/v2/css/town_square.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index c871da93d22..dfeae1b7c6b 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1003,7 +1003,7 @@ body.green.offer_view .announce { /* Toggle Switch for Dark Mode */ input[type=checkbox].toggle-switch { - transform: rotate(180deg); + transform: rotate(360deg); appearance: none; -moz-appearance: none; -webkit-appearance: none; From 02526c955e93a4bf9ff9150b54eacdab9ab6cdc0 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Thu, 19 Mar 2020 04:22:48 +0000 Subject: [PATCH 05/34] Update town_square.css --- app/assets/v2/css/town_square.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index dfeae1b7c6b..4c3bc5dda4b 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1003,7 +1003,7 @@ body.green.offer_view .announce { /* Toggle Switch for Dark Mode */ input[type=checkbox].toggle-switch { - transform: rotate(360deg); + transform: rotate(540deg); appearance: none; -moz-appearance: none; -webkit-appearance: none; From f56aa091e136881fe50a117fb782090ec3678927 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Thu, 19 Mar 2020 04:28:13 +0000 Subject: [PATCH 06/34] Update townsquare.js --- app/assets/v2/js/pages/townsquare.js | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/app/assets/v2/js/pages/townsquare.js b/app/assets/v2/js/pages/townsquare.js index 2c7b40f9c77..86bc9f23293 100644 --- a/app/assets/v2/js/pages/townsquare.js +++ b/app/assets/v2/js/pages/townsquare.js @@ -98,9 +98,23 @@ $(document).ready(function() { }); // Enables Dark Mode - $(".toggle-switch").on("click", function(event){ - $("body").toggleClass("dark"); - }); + $('body').toggleClass(localStorage.toggled); + $('.toggle-switch').on("click",function(event) { + if (localStorage.toggled != 'dark') { + $('body').toggleClass('dark', true) + localStorage.toggled = 'dark'; + } else { + $('body').toggleClass('dark', false) + localStorage.toggled = ''; + } + +}); + +if (!$('body').hasClass('dark', true)) { + $('.toggle-switch').prop('checked', true) +} else { + $('.toggle-switch').prop('checked', false) +} // toggles the daily email sender $('body').on('change', '#receive_daily_offers_in_inbox', function(e) { From 1e1aff26a1cb8b074bbc77d8e2faeb022c1fa490 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Fri, 20 Mar 2020 12:53:23 +0000 Subject: [PATCH 07/34] Update town_square.css --- app/assets/v2/css/town_square.css | 46 +++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 4c3bc5dda4b..4b87190a458 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1056,6 +1056,52 @@ input[type=checkbox].toggle-switch:checked::after { background-color: rgb(23, 7, 61); } +.dark .bg-white { + background-color: #2b2642!important; + box-shadow: 60px!important; +} + +.dark .grey { + color: #fff!important; +} + +.dark .tip_activity { + background-color: black!important; +} + +.dark .activity_stream { + color: #fff!important; +} + +.dark .activity_stream .activity_comments .comment_container.filled { + background-color: #877cab42!important; +} + +.dark .activity_stream .activity_comments .activity_comments_main_comment { + color: #fff!important; +} + +.dark .textarea.form__input { + color: #fff!important; +} + +.dark .font-body { + color: #fff!important; +} + +.dark .form-control { + background-color: #282440!important; +} + +.dark #status { + background-color: #282440; +} + +.dark .form__input { + background-color: #282440; + color: #fff!important; +} + .dark .townsquare_nav-list .nav-item .nav-link { color: #fff; } From e6884379c83c114df731a25218eef9e3d8c84654 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Fri, 20 Mar 2020 19:04:22 +0000 Subject: [PATCH 08/34] Update town_square.css --- app/assets/v2/css/town_square.css | 66 ++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 4b87190a458..695749c18cd 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1009,16 +1009,15 @@ input[type=checkbox].toggle-switch { -webkit-appearance: none; outline: 0; cursor: pointer; - /* width of the track */ width: 4em; - /* height of the track */ - height: 1.5em; - border-radius: 3em; + height: 1.2em; + border-radius: 2.5em; background-color: #ebebeb; transition: background-color 0.09s ease-in-out; position: relative; } + input[type=checkbox].toggle-switch:active::after { background-color: #f2f2f2; padding-right: .8em; @@ -1039,8 +1038,7 @@ input[type=checkbox].toggle-switch::after { } input[type=checkbox].toggle-switch:checked { - background-color: #333; - color: #fff; + background-color: rgba(224, 214, 214, 0.493); } input[type=checkbox].toggle-switch:checked:active::after { @@ -1061,6 +1059,11 @@ input[type=checkbox].toggle-switch:checked::after { box-shadow: 60px!important; } +.dark .bg-lightblue { + background-color: #2b2642!important; + box-shadow: 60px!important; +} + .dark .grey { color: #fff!important; } @@ -1079,6 +1082,7 @@ input[type=checkbox].toggle-switch:checked::after { .dark .activity_stream .activity_comments .activity_comments_main_comment { color: #fff!important; + border-top: 2px solid #346698!important; } .dark .textarea.form__input { @@ -1109,3 +1113,53 @@ input[type=checkbox].toggle-switch:checked::after { .dark .townsquare_block-header { color: #fff; } + +.dark .font-caption { + color: #fff!important; +} + +.dark .activity_stream .box { + border-bottom: 1px solid #312979; +} + +.dark .poll_choices.answered div span { + color: #fff!important; +} + +.dark .poll_choices div p { + color: #fff!important; + background-color: black!important; +} + +.dark .activity_stream .comment_row .activity_comments_main { + border-top: #8ab2b2!important; +} + +.dark .poll_choices div.vote { + background-color: #232342!important; +} + +.dark .poll_choices.answered div.vote { + border: 1px solid #262661!important; +} + +.dark #status .btn-group-toggle .btn-radio { + background-color: black!important; +} + +.dark .poll_choices.answered div.vote { + background-color: black!important; +} + +.dark .action:hover { + background-color: black!important; +} + +.dark .border { + border: 1px solid #346698!important; +} + +.dark #new_activity_notifier { + background-color: #262661!important; + border-bottom: 1px solid #262661!important; +} From 8a7721f47155f840db3adf5e78c6e394e651ec7d Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Sat, 21 Mar 2020 01:58:00 +0000 Subject: [PATCH 09/34] Update gitcoin.css --- app/assets/v2/css/gitcoin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css index b8256e98938..b2a92c3a145 100644 --- a/app/assets/v2/css/gitcoin.css +++ b/app/assets/v2/css/gitcoin.css @@ -1,7 +1,7 @@ body { overflow-x: hidden; width: 100%; - background-color: #fff; + background-color: #EFF3F6; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } From 9082c103769ca07803cc5c2d6c85e9b14f682b32 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Sat, 21 Mar 2020 02:25:36 +0000 Subject: [PATCH 10/34] Box shadow on Dark Mode for Dope Looks --- app/assets/v2/css/town_square.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 695749c18cd..15e9eab8d8d 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1120,6 +1120,8 @@ input[type=checkbox].toggle-switch:checked::after { .dark .activity_stream .box { border-bottom: 1px solid #312979; + box-shadow: 1px -5px #312979; + border-radius: 10px; } .dark .poll_choices.answered div span { From b3564b712638e9c219fa74c354034e1ffb29b07d Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Sat, 21 Mar 2020 13:07:09 +0000 Subject: [PATCH 11/34] Update town_square.css --- app/assets/v2/css/town_square.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 15e9eab8d8d..147582e5be2 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1027,7 +1027,7 @@ input[type=checkbox].toggle-switch::after { content: ''; width: 2em; height: 2em; - background-color: white; + background-color: #f8f8f8; border-radius: 3em; position: absolute; left: -5px; @@ -1048,6 +1048,7 @@ input[type=checkbox].toggle-switch:checked:active::after { input[type=checkbox].toggle-switch:checked::after { left: 2em; background-color: #fff; + align-content: 10px center; } .dark { @@ -1165,3 +1166,8 @@ input[type=checkbox].toggle-switch:checked::after { background-color: #262661!important; border-bottom: 1px solid #262661!important; } + + +.dark #status .btn-group-toggle .btn-radio { + background-color: #2b3358!important; +} From f08dcc25f5958595cb01a3c10e56356a9ca96aa4 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Sat, 21 Mar 2020 13:09:09 +0000 Subject: [PATCH 12/34] Update index.html --- app/townsquare/templates/townsquare/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/app/townsquare/templates/townsquare/index.html b/app/townsquare/templates/townsquare/index.html index 96f122d17f0..987f398bda1 100644 --- a/app/townsquare/templates/townsquare/index.html +++ b/app/townsquare/templates/townsquare/index.html @@ -172,6 +172,7 @@
+
From 84977a1a1c847fe5317b5bd4d63eafd920542c76 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Sun, 22 Mar 2020 00:03:56 -0400 Subject: [PATCH 13/34] Update townsquare.js --- app/assets/v2/js/pages/townsquare.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/v2/js/pages/townsquare.js b/app/assets/v2/js/pages/townsquare.js index 86bc9f23293..cd580224332 100644 --- a/app/assets/v2/js/pages/townsquare.js +++ b/app/assets/v2/js/pages/townsquare.js @@ -99,7 +99,7 @@ $(document).ready(function() { // Enables Dark Mode $('body').toggleClass(localStorage.toggled); - $('.toggle-switch').on("click",function(event) { + $('.toggle-switch').on('click',function(event) { if (localStorage.toggled != 'dark') { $('body').toggleClass('dark', true) localStorage.toggled = 'dark'; From be4475354669ca885b52eaad7467094d85888e36 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Tue, 24 Mar 2020 17:39:40 -0400 Subject: [PATCH 14/34] Update townsquare.js --- app/assets/v2/js/pages/townsquare.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/v2/js/pages/townsquare.js b/app/assets/v2/js/pages/townsquare.js index cd580224332..8e42f6ada15 100644 --- a/app/assets/v2/js/pages/townsquare.js +++ b/app/assets/v2/js/pages/townsquare.js @@ -97,7 +97,7 @@ $(document).ready(function() { }, 10); }); - // Enables Dark Mode + // Enables Dope Mode $('body').toggleClass(localStorage.toggled); $('.toggle-switch').on('click',function(event) { if (localStorage.toggled != 'dark') { From a375c26257bc202716b518310a37f58e115c5666 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Tue, 24 Mar 2020 17:41:41 -0400 Subject: [PATCH 15/34] Update town_square.css --- app/assets/v2/css/town_square.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 147582e5be2..10be398c1fd 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1000,7 +1000,7 @@ body.green.offer_view .announce { } } -/* Toggle Switch for Dark Mode */ +/* Toggle Switch for Dope Mode */ input[type=checkbox].toggle-switch { transform: rotate(540deg); From 8a706dbb83dd10626c2a94c9e0d59fc023402069 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Sat, 4 Apr 2020 05:54:34 +0000 Subject: [PATCH 16/34] Update townsquare.js --- app/assets/v2/js/pages/townsquare.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/v2/js/pages/townsquare.js b/app/assets/v2/js/pages/townsquare.js index 9b985e1e3b7..9e5da6dc604 100644 --- a/app/assets/v2/js/pages/townsquare.js +++ b/app/assets/v2/js/pages/townsquare.js @@ -105,7 +105,8 @@ $(document).ready(function() { // Enables Dope Mode $('body').toggleClass(localStorage.toggled); - $('.toggle-switch').on('click',function(event) { + + $('#dopeSwitch').on("click",function(event) { if (localStorage.toggled != 'dark') { $('body').toggleClass('dark', true) localStorage.toggled = 'dark'; @@ -116,11 +117,11 @@ $(document).ready(function() { }); -if (!$('body').hasClass('dark', true)) { - $('.toggle-switch').prop('checked', true) -} else { - $('.toggle-switch').prop('checked', false) -} + if (!$('body').hasClass('dark', false)) { + $('#dopeSwitch').prop('checked', false) + } else { + $('#dopeSwitch').prop('checked', true) + } // toggles the daily email sender $('body').on('change', '#receive_daily_offers_in_inbox', function(e) { From 81decb54bb7914ccaf36e939382114cf69c139b1 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Sat, 4 Apr 2020 05:56:52 +0000 Subject: [PATCH 17/34] Bootstrap custom switch --- app/townsquare/templates/townsquare/index.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/townsquare/templates/townsquare/index.html b/app/townsquare/templates/townsquare/index.html index d24a6d34a42..2d20a76b847 100644 --- a/app/townsquare/templates/townsquare/index.html +++ b/app/townsquare/templates/townsquare/index.html @@ -179,8 +179,10 @@
- - +
+ + +
From de0a7332b05fe45b06149152b2a52c4a706836a2 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Tue, 7 Apr 2020 11:24:35 -0400 Subject: [PATCH 18/34] remove old toggle --- app/assets/v2/css/town_square.css | 50 +------------------------------ 1 file changed, 1 insertion(+), 49 deletions(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 272872c1cdc..84dd1540f12 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1004,55 +1004,7 @@ body.green.offer_view .announce { } } -/* Toggle Switch for Dope Mode */ -input[type=checkbox].toggle-switch { - transform: rotate(540deg); - appearance: none; - -moz-appearance: none; - -webkit-appearance: none; - outline: 0; - cursor: pointer; - width: 4em; - height: 1.2em; - border-radius: 2.5em; - background-color: #ebebeb; - transition: background-color 0.09s ease-in-out; - position: relative; -} - - -input[type=checkbox].toggle-switch:active::after { - background-color: #f2f2f2; - padding-right: .8em; -} - -input[type=checkbox].toggle-switch::after { - content: ''; - width: 2em; - height: 2em; - background-color: #f8f8f8; - border-radius: 3em; - position: absolute; - left: -5px; - top: 50%; - transform: translateY(-50%); - transition: left 0.3s cubic-bezier(0.175, 0.885, 0.32, 1.275), padding 0.3s ease, margin 0.3s ease; - box-shadow: 2px 0px 5px 0 rgba(0, 0, 0, 0.15); -} - -input[type=checkbox].toggle-switch:checked { - background-color: rgba(224, 214, 214, 0.493); -} - -input[type=checkbox].toggle-switch:checked:active::after { - margin-left: -.8em; -} - -input[type=checkbox].toggle-switch:checked::after { - left: 2em; - background-color: #fff; - align-content: 10px center; -} +/* Toggle Switch Dope Mode */ .dark { background-color: rgb(23, 7, 61); From 54098a27ac20b2f73b42bb0a08888184d4dccd16 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 8 Apr 2020 13:07:36 -0400 Subject: [PATCH 19/34] default background property --- app/assets/v2/css/gitcoin.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/v2/css/gitcoin.css b/app/assets/v2/css/gitcoin.css index 56779ad6e69..2222392f368 100644 --- a/app/assets/v2/css/gitcoin.css +++ b/app/assets/v2/css/gitcoin.css @@ -1,7 +1,7 @@ body { overflow-x: hidden; width: 100%; - background-color: #EFF3F6; + background-color: #fff; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } From 917e281f66b7b9460645f6b0685c9bdb8748685c Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 8 Apr 2020 13:29:33 -0400 Subject: [PATCH 20/34] indentation --- app/townsquare/templates/townsquare/index.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/townsquare/templates/townsquare/index.html b/app/townsquare/templates/townsquare/index.html index 2d20a76b847..d44e80f6d6f 100644 --- a/app/townsquare/templates/townsquare/index.html +++ b/app/townsquare/templates/townsquare/index.html @@ -180,11 +180,10 @@
- - + +
- {% include 'shared/analytics.html' %} {% include 'shared/footer_scripts.html' with slim=1 %} From f52f8b84bf212e6478042884121017cf5426fea4 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Thu, 9 Apr 2020 15:05:12 +0000 Subject: [PATCH 21/34] switch tag and some properties --- app/assets/v2/css/town_square.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 84dd1540f12..2b22a808f4a 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1006,6 +1006,11 @@ body.green.offer_view .announce { /* Toggle Switch Dope Mode */ +#dopeSwitch { + position: relative; + display: inline-block; +} + .dark { background-color: rgb(23, 7, 61); } From 31d1f6beb427b0c8718006d6b0c35a0ae719176e Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:10:36 +0000 Subject: [PATCH 22/34] "not available" actions tasty dark blue as per owocki's request --- app/assets/v2/css/town_square.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 3a328450f53..6dc7df13786 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1135,6 +1135,10 @@ body.green.offer_view .announce { background-color: #2b3358!important; } +.dark .empty { + background-color: #201a40; +} + .promo .logo { height: 55px; width: 65px; From fdf00e6f924b4e12242764e0e9b419578a8cce9b Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Thu, 9 Apr 2020 17:16:30 +0000 Subject: [PATCH 23/34] ref link background --- app/assets/v2/css/town_square.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 6dc7df13786..b1a33660ea6 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1139,6 +1139,10 @@ body.green.offer_view .announce { background-color: #201a40; } +.dark #reflink { + background-color: #201a40; +} + .promo .logo { height: 55px; width: 65px; From 81429755ddb468fe0ebfaa44626e8a83681c89d9 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 22 Apr 2020 08:25:33 -0400 Subject: [PATCH 24/34] willsputra feedback changes Explore Tribes & Create actions --- app/assets/v2/css/town_square.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index b1a33660ea6..7241080b503 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1143,6 +1143,10 @@ body.green.offer_view .announce { background-color: #201a40; } +.dark a { + color: #567AFF; +} + .promo .logo { height: 55px; width: 65px; From 9ed5a6b70d95452fc73b00ece3efb9e6a9cc99b0 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 22 Apr 2020 08:35:29 -0400 Subject: [PATCH 25/34] Popover in dark mode and some properties for octaviou --- app/assets/v2/css/town_square.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 7241080b503..d51367b5dc8 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1147,6 +1147,14 @@ body.green.offer_view .announce { color: #567AFF; } +.dark popover-body { + color: #dde5ee; +} + +.dark popover-user-card { + background-color: #201a40; +} + .promo .logo { height: 55px; width: 65px; From 6b0451dfe0a35586f1504e9c0575b0c0d3369a58 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 29 Apr 2020 09:44:59 -0400 Subject: [PATCH 26/34] Update town_square.css --- app/assets/v2/css/town_square.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index f8e7cd30680..7c4069a5586 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1106,10 +1106,6 @@ body.green.offer_view .announce { background-color: #232342!important; } -.dark .poll_choices.answered div.vote { - border: 1px solid #262661!important; -} - .dark #status .btn-group-toggle .btn-radio { background-color: black!important; } From e9f6f318f828bbf0957348ec689e0f7b06abe5c9 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 29 Apr 2020 09:53:28 -0400 Subject: [PATCH 27/34] Update town_square.css --- app/assets/v2/css/town_square.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 7c4069a5586..c6bd8adb0b5 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -69,6 +69,10 @@ body { color: white; text-decoration: underline; } + +.dark a { + color: #567AFF; +} .offer a:hover{ text-decoration: none; font-weight: bold; @@ -1140,10 +1144,6 @@ body.green.offer_view .announce { background-color: #201a40; } -.dark a { - color: #567AFF; -} - .dark popover-body { color: #dde5ee; } From e21cbe3f1206715d4a27e707752a1c397fca035d Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 29 Apr 2020 09:59:57 -0400 Subject: [PATCH 28/34] fixing lint errors --- app/assets/v2/css/town_square.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index c6bd8adb0b5..615ff762c95 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1106,6 +1106,10 @@ body.green.offer_view .announce { border-top: #8ab2b2!important; } +.promo p { + margin-bottom: 0; +} + .dark .poll_choices div.vote { background-color: #232342!important; } @@ -1175,10 +1179,6 @@ body.green.offer_view .announce { border-radius: 0; } -.promo p { - margin-bottom: 0; -} - .promo .action:hover { background-color: #101061; filter: brightness(130%); From 7527983177b9bf33aa1f45f28ca9b70ad0d29d72 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 29 Apr 2020 10:01:56 -0400 Subject: [PATCH 29/34] Update town_square.css --- app/assets/v2/css/town_square.css | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 615ff762c95..5b01f8b5165 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1122,6 +1122,12 @@ body.green.offer_view .announce { background-color: black!important; } +.promo .action { + background-color: #101061; + color: white; + border-radius: 0; +} + .dark .action:hover { background-color: black!important; } @@ -1173,12 +1179,6 @@ body.green.offer_view .announce { font-size: 0.9em; } -.promo .action { - background-color: #101061; - color: white; - border-radius: 0; -} - .promo .action:hover { background-color: #101061; filter: brightness(130%); From 44ca82ecf32751d433d1284a6893b9607360c0fc Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 29 Apr 2020 10:10:45 -0400 Subject: [PATCH 30/34] fixing lint errors --- app/assets/v2/css/town_square.css | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 5b01f8b5165..9a2aef98dd3 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1097,6 +1097,10 @@ body.green.offer_view .announce { color: #fff!important; } +.promo p { + margin-bottom: 0; +} + .dark .poll_choices div p { color: #fff!important; background-color: black!important; @@ -1106,10 +1110,6 @@ body.green.offer_view .announce { border-top: #8ab2b2!important; } -.promo p { - margin-bottom: 0; -} - .dark .poll_choices div.vote { background-color: #232342!important; } @@ -1141,11 +1141,6 @@ body.green.offer_view .announce { border-bottom: 1px solid #262661!important; } - -.dark #status .btn-group-toggle .btn-radio { - background-color: #2b3358!important; -} - .dark .empty { background-color: #201a40; } From 6ab35b5d30b0da30113390041af7e18ce3a93ecb Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 29 Apr 2020 10:20:27 -0400 Subject: [PATCH 31/34] lint errors --- app/assets/v2/css/town_square.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 9a2aef98dd3..aec210e8d44 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1149,14 +1149,6 @@ body.green.offer_view .announce { background-color: #201a40; } -.dark popover-body { - color: #dde5ee; -} - -.dark popover-user-card { - background-color: #201a40; -} - .promo .logo { height: 55px; width: 65px; From 24501dc5e42f1a0942ba51bf276e7474d6f2058b Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 29 Apr 2020 16:53:57 -0400 Subject: [PATCH 32/34] eslint errors --- app/assets/v2/js/pages/townsquare.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/v2/js/pages/townsquare.js b/app/assets/v2/js/pages/townsquare.js index 9e5da6dc604..f155254e2b9 100644 --- a/app/assets/v2/js/pages/townsquare.js +++ b/app/assets/v2/js/pages/townsquare.js @@ -106,9 +106,9 @@ $(document).ready(function() { // Enables Dope Mode $('body').toggleClass(localStorage.toggled); - $('#dopeSwitch').on("click",function(event) { - if (localStorage.toggled != 'dark') { - $('body').toggleClass('dark', true) + $('#dopeSwitch').on('click', function(event) { + if (localStorage.toggled != 'dark') { + $('body').toggleClass('dark', true) localStorage.toggled = 'dark'; } else { $('body').toggleClass('dark', false) From aa59ba302d1c6e680d85ffc33756a1b281e8fa5e Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 29 Apr 2020 17:03:18 -0400 Subject: [PATCH 33/34] lint errors --- app/assets/v2/js/pages/townsquare.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/assets/v2/js/pages/townsquare.js b/app/assets/v2/js/pages/townsquare.js index f155254e2b9..fe598a5fb9f 100644 --- a/app/assets/v2/js/pages/townsquare.js +++ b/app/assets/v2/js/pages/townsquare.js @@ -108,19 +108,19 @@ $(document).ready(function() { $('#dopeSwitch').on('click', function(event) { if (localStorage.toggled != 'dark') { - $('body').toggleClass('dark', true) - localStorage.toggled = 'dark'; - } else { - $('body').toggleClass('dark', false) - localStorage.toggled = ''; - } + $('body').toggleClass('dark', true); + localStorage.toggled = 'dark'; + } else { + $('body').toggleClass('dark', false); + localStorage.toggled = ''; + } }); - if (!$('body').hasClass('dark', false)) { - $('#dopeSwitch').prop('checked', false) + if (!$('body').hasClass('dark', false)) { + $('#dopeSwitch').prop('checked', false); } else { - $('#dopeSwitch').prop('checked', true) + $('#dopeSwitch').prop('checked', true); } // toggles the daily email sender From 1707b30b7ad93bec17cf4d478e62d5ac231a9535 Mon Sep 17 00:00:00 2001 From: Paul <41552663+molecula451@users.noreply.github.com> Date: Wed, 29 Apr 2020 17:09:24 -0400 Subject: [PATCH 34/34] lint errors --- app/assets/v2/js/pages/townsquare.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/v2/js/pages/townsquare.js b/app/assets/v2/js/pages/townsquare.js index fe598a5fb9f..a7786d4b59c 100644 --- a/app/assets/v2/js/pages/townsquare.js +++ b/app/assets/v2/js/pages/townsquare.js @@ -115,12 +115,12 @@ $(document).ready(function() { localStorage.toggled = ''; } -}); + }); - if (!$('body').hasClass('dark', false)) { + if (!$('body').hasClass('dark', false)) { $('#dopeSwitch').prop('checked', false); } else { - $('#dopeSwitch').prop('checked', true); + $('#dopeSwitch').prop('checked', true); } // toggles the daily email sender