From 69e0f95bf2c3e4bfbbb3fcfb5925a76f4425f9b0 Mon Sep 17 00:00:00 2001
From: Dank Gabs <dankgabs@protonmail.com>
Date: Wed, 3 Jul 2019 13:49:45 -0400
Subject: [PATCH 1/2] Patch fixes to colors on the home feed accordion panel
 options.

---
 app/javascript/styles/gabsocial-light/diff.scss |  9 +--------
 app/javascript/styles/gabsocial/components.scss | 13 ++++++-------
 app/javascript/styles/gabsocial/variables.scss  | 10 +++++++++-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/javascript/styles/gabsocial-light/diff.scss b/app/javascript/styles/gabsocial-light/diff.scss
index 83e89b69..cd0c8ba8 100644
--- a/app/javascript/styles/gabsocial-light/diff.scss
+++ b/app/javascript/styles/gabsocial-light/diff.scss
@@ -210,7 +210,7 @@
 }
 
 .react-toggle.react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track {
-  background: lighten($ui-highlight-color, 10%);
+  background: lighten($gab-brand-default, 10%);
 }
 
 // Change the default color used for the text in an empty column or on the error column
@@ -278,13 +278,6 @@
   }
 }
 
-.status__content,
-.reply-indicator__content {
-  a {
-    color: $highlight-text-color;
-  }
-}
-
 .button.logo-button {
   color: $white;
 
diff --git a/app/javascript/styles/gabsocial/components.scss b/app/javascript/styles/gabsocial/components.scss
index 0b819e9f..8deef9b7 100644
--- a/app/javascript/styles/gabsocial/components.scss
+++ b/app/javascript/styles/gabsocial/components.scss
@@ -377,7 +377,7 @@
 	}
 
 	a {
-		color: $secondary-text-color;
+		color: $gab-brand-default;
 		text-decoration: none;
 
 		&:hover {
@@ -439,12 +439,11 @@
 	display: block;
 	font-size: 15px;
 	line-height: 20px;
-	color: lighten($ui-highlight-color, 8%);
+	color: $gab-brand-default;
 	border: 0;
 	background: transparent;
 	padding: 0;
 	padding-top: 8px;
-
 	&:hover,
 	&:active {
 		text-decoration: underline;
@@ -1881,11 +1880,11 @@ a.account__display-name {
 }
 
 .react-toggle--checked .react-toggle-track {
-	background-color: $ui-highlight-color;
+	background-color: $gab-brand-default;
 }
 
 .react-toggle--checked:hover:not(.react-toggle--disabled) .react-toggle-track {
-	background-color: lighten($ui-highlight-color, 10%);
+	background-color: lighten($gab-brand-default, 10%);
 }
 
 .react-toggle-track-check {
@@ -1941,7 +1940,7 @@ a.account__display-name {
 
 .react-toggle--checked .react-toggle-thumb {
 	left: 27px;
-	border-color: $ui-highlight-color;
+	border-color: $gab-brand-default;
 }
 
 .column-link {
@@ -2576,7 +2575,7 @@ a.status-card.compact:hover {
 }
 
 .column-header__collapsible-inner {
-	background: lighten($ui-base-color, 8%);
+	background: #e6e6e6;
 	padding: 15px;
 }
 
diff --git a/app/javascript/styles/gabsocial/variables.scss b/app/javascript/styles/gabsocial/variables.scss
index 5918e451..a06a028b 100644
--- a/app/javascript/styles/gabsocial/variables.scss
+++ b/app/javascript/styles/gabsocial/variables.scss
@@ -7,27 +7,35 @@
 // NOTE - will eventually create a systematic approach of setting color variables to easily change instance themes
 
 // STATIC COLORS
+
 $gab-brand-default: #21cf7a;
 $gab-alert-red: #cc6643;
 $gab-secondary-text: #999;
 $gab-text-highlight: $gab-brand-default;
 
+
 // THEME COLORS
+
 // default theme (dark)
 $gab-background-base: #333;
 $gab-background-container: #222;
 $gab-placeholder-accent: #666;
 
+
 // light theme
 $gab-background-base-light: #f2f3f6;
 $gab-background-container-light: #fff;
 $gab-default-text-light: #6c6c6c;
 
-// THEME MIXINS
+
+// theme mixins
 @mixin light-theme-shadow() {box-shadow: 0 0 6px 0 rgba(0,0,0,0.1);}
 
+
 // BREAKPOINT SETS
+
 // navigation breakpoints - by default show all elements and link names along with icons
+
 // turns navigation links into icon-only buttons
 $nav-breakpoint-1: 850px;
 // search field hidden and replaced with search icon link

From 9540eb27753c07dbd951bce43d794987c038a76c Mon Sep 17 00:00:00 2001
From: Dank Gabs <dankgabs@protonmail.com>
Date: Wed, 3 Jul 2019 14:18:54 -0400
Subject: [PATCH 2/2] Proper fix for the position of the notification counter
 in the mobile navigation. Everything in the main navigation is matching the
 mockup specs tightly.

---
 app/javascript/styles/gabsocial/components.scss | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/javascript/styles/gabsocial/components.scss b/app/javascript/styles/gabsocial/components.scss
index 8deef9b7..c5c403bb 100644
--- a/app/javascript/styles/gabsocial/components.scss
+++ b/app/javascript/styles/gabsocial/components.scss
@@ -1638,14 +1638,10 @@ a.account__display-name {
 		box-sizing: border-box;
 		left: -16px;
 		top: -14px;
-
-
-		// @media screen and (max-width: 970px) {
-		// 	left: 27px;
-		// 	top: 0;
-		// }
-
-
+		@media screen and (max-width: $nav-breakpoint-1) {
+			left: 27px;
+			top: 0;
+		}
 		min-width: 16px;
 		height: 16px;
 		padding: 1px 3px 0;