BUGfix: GTK3&4 - sidebar text color too dark

thekomer · Feb 8, 2022 · d65253d · d65253d
1 parent ab09f9c
commit d65253d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 21 deletions.
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
@@ -4167,7 +4167,8 @@ treeview ~ scrollbar.vertical {
 .sidebar {
   border-style: none;
   border-width: 0;
-  background-color: #06070c; }
+  background-color: #06070c;
+  color: #b9bec9; }
   .sidebar .frame {
     border: none; }
   stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) {
@@ -4183,7 +4184,7 @@ treeview ~ scrollbar.vertical {
     padding: 8px 12px;
     transition: all .12s ease-in; }
     .sidebar row label {
-      color: rgba(191, 195, 205, 0.8); }
+      color: #b9bec9; }
     .sidebar row:selected {
       color: #fefefe; }
       .sidebar row:selected:backdrop {

diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
@@ -4167,7 +4167,8 @@ treeview ~ scrollbar.vertical {
 .sidebar {
   border-style: none;
   border-width: 0;
-  background-color: #06070c; }
+  background-color: #06070c;
+  color: #b9bec9; }
   .sidebar .frame {
     border: none; }
   stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) {
@@ -4183,7 +4184,7 @@ treeview ~ scrollbar.vertical {
     padding: 8px 12px;
     transition: all .12s ease-in; }
     .sidebar row label {
-      color: rgba(191, 195, 205, 0.8); }
+      color: #b9bec9; }
     .sidebar row:selected {
       color: #fefefe; }
       .sidebar row:selected:backdrop {

diff --git a/gtk-3.0/widgets/_sidebar.scss b/gtk-3.0/widgets/_sidebar.scss
@@ -4,8 +4,9 @@
 .sidebar {
   border-style: none;
   border-width: 0;
-  //background-color: mix($bg_color, $base_color, 50%);
-	background-color: $headerbar_color;
+	background-color: $sidebar_bg_color;
+	color: $sidebar_fg_color;
+
   .frame{
     border: none;
   }
@@ -34,8 +35,7 @@
     padding: 8px 12px;
     transition: all .12s ease-in;
     label{
-      // color: #98abb2;
-      color: transparentize($fg_color, 0.2);
+      color: $sidebar_fg_color;
     }
     &:selected{
       color: $selected_fg_color;
@@ -120,7 +120,7 @@ stacksidebar {
 
 placessidebar{
 	&.sidebar{
-		background-color: $headerbar_color;
+		background-color: transparent;
 		/* background-image:linear-gradient(to right, #171e27 40px,
 												$sidebar_bg_color 35px,$sidebar_bg_color 36px,
 												$sidebar_bg_color 36px,$sidebar_bg_color 99%,
@@ -133,7 +133,7 @@ placessidebar{
 						margin-right: 12px;
 						padding-left: 14px;
 						padding-right: 12px;
-						color: transparentize($selected_bg_color, 0.3);
+						color: $sidebar_fg_color;
 					}
 				}
 				&:hover{

diff --git a/gtk-4.0/gtk-dark.css b/gtk-4.0/gtk-dark.css
@@ -4112,7 +4112,8 @@ treeview ~ scrollbar.vertical {
 .sidebar {
   border-style: none;
   border-width: 0;
-  background-color: #06070c; }
+  background-color: #06070c;
+  color: #b9bec9; }
   .sidebar .frame {
     border: none; }
   stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) {
@@ -4128,7 +4129,7 @@ treeview ~ scrollbar.vertical {
     padding: 8px 12px;
     transition: all .12s ease-in; }
     .sidebar row label {
-      color: rgba(191, 195, 205, 0.8); }
+      color: #b9bec9; }
     .sidebar row:selected {
       color: #fefefe; }
       .sidebar row:selected:backdrop {
@@ -4181,7 +4182,7 @@ placessidebar.sidebar {
     margin-right: 12px;
     padding-left: 14px;
     padding-right: 12px;
-    color: rgba(255, 106, 0, 0.7); }
+    color: #b9bec9; }
   placessidebar.sidebar row.sidebar-row:hover {
     transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
     color: rgba(0, 0, 0, 0.76);

diff --git a/gtk-4.0/gtk.css b/gtk-4.0/gtk.css
@@ -4112,7 +4112,8 @@ treeview ~ scrollbar.vertical {
 .sidebar {
   border-style: none;
   border-width: 0;
-  background-color: #06070c; }
+  background-color: #06070c;
+  color: #b9bec9; }
   .sidebar .frame {
     border: none; }
   stacksidebar.sidebar:dir(ltr) list, stacksidebar.sidebar.left list, stacksidebar.sidebar.left:dir(rtl) list, .sidebar:dir(ltr), .sidebar.left, .sidebar.left:dir(rtl) {
@@ -4128,7 +4129,7 @@ treeview ~ scrollbar.vertical {
     padding: 8px 12px;
     transition: all .12s ease-in; }
     .sidebar row label {
-      color: rgba(191, 195, 205, 0.8); }
+      color: #b9bec9; }
     .sidebar row:selected {
       color: #fefefe; }
       .sidebar row:selected:backdrop {
@@ -4181,7 +4182,7 @@ placessidebar.sidebar {
     margin-right: 12px;
     padding-left: 14px;
     padding-right: 12px;
-    color: rgba(255, 106, 0, 0.7); }
+    color: #b9bec9; }
   placessidebar.sidebar row.sidebar-row:hover {
     transition: all 300ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
     color: rgba(0, 0, 0, 0.76);

diff --git a/gtk-4.0/widgets/_sidebar.scss b/gtk-4.0/widgets/_sidebar.scss
@@ -4,8 +4,9 @@
 .sidebar {
   border-style: none;
   border-width: 0;
-  //background-color: mix($bg_color, $base_color, 50%);
-	background-color: $headerbar_color;
+	background-color: $sidebar_bg_color;
+	color: $sidebar_fg_color;
+
   .frame{
     border: none;
   }
@@ -34,8 +35,7 @@
     padding: 8px 12px;
     transition: all .12s ease-in;
     label{
-      // color: #98abb2;
-      color: transparentize($fg_color, 0.2);
+      color: $sidebar_fg_color;
     }
     &:selected{
       color: $selected_fg_color;
@@ -133,7 +133,7 @@ placessidebar{
 						margin-right: 12px;
 						padding-left: 14px;
 						padding-right: 12px;
-						color: transparentize($selected_bg_color, 0.3);
+						color: $sidebar_fg_color;
 					}
 				}
 				&:hover{