Fixed issues

tienhuynh5312 · Nov 9, 2021 · 843b5ed · 843b5ed
1 parent 2d94f36
commit 843b5ed
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 11 deletions.
diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
@@ -4747,6 +4747,10 @@ stacksidebar.sidebar row:selected {
  font-weight: 500;
 }
 
+stacksidebar.sidebar row:selected label, stacksidebar.sidebar row:selected image {
+ color: rgba(0, 0, 0, 0.87);
+}
+
 stacksidebar.sidebar row + row {
  margin-top: 3px;
 }
@@ -5251,16 +5255,19 @@ cursor-handle.insertion-cursor:dir(ltr), cursor-handle.insertion-cursor:dir(rtl)
 
 stackswitcher {
  min-height: 0;
- padding: 0;
+ padding: 2px;
  margin: 6px 0;
  border-radius: 9999px;
- background-color: alpha(currentColor, 0.05);
+ background-color: transparent;
+ border: 2px solid #E0E0E0;
 }
 
 stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action) {
  margin: 0 0;
  border-radius: 9999px;
  background-color: transparent;
+ min-height: 20px;
+ padding: 5px 10px;
 }
 
 stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button {

diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
@@ -4747,6 +4747,10 @@ stacksidebar.sidebar row:selected {
  font-weight: 500;
 }
 
+stacksidebar.sidebar row:selected label, stacksidebar.sidebar row:selected image {
+ color: white;
+}
+
 stacksidebar.sidebar row + row {
  margin-top: 3px;
 }
@@ -5251,16 +5255,19 @@ cursor-handle.insertion-cursor:dir(ltr), cursor-handle.insertion-cursor:dir(rtl)
 
 stackswitcher {
  min-height: 0;
- padding: 0;
+ padding: 2px;
  margin: 6px 0;
  border-radius: 9999px;
- background-color: alpha(currentColor, 0.05);
+ background-color: transparent;
+ border: 2px solid #333333;
 }
 
 stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action) {
  margin: 0 0;
  border-radius: 9999px;
  background-color: transparent;
+ min-height: 20px;
+ padding: 5px 10px;
 }
 
 stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button {

diff --git a/src/main/gtk-3.0/gtk.css b/src/main/gtk-3.0/gtk.css
@@ -4747,6 +4747,10 @@ stacksidebar.sidebar row:selected {
  font-weight: 500;
 }
 
+stacksidebar.sidebar row:selected label, stacksidebar.sidebar row:selected image {
+ color: white;
+}
+
 stacksidebar.sidebar row + row {
  margin-top: 3px;
 }
@@ -5251,16 +5255,19 @@ cursor-handle.insertion-cursor:dir(ltr), cursor-handle.insertion-cursor:dir(rtl)
 
 stackswitcher {
  min-height: 0;
- padding: 0;
+ padding: 2px;
  margin: 6px 0;
  border-radius: 9999px;
- background-color: alpha(currentColor, 0.05);
+ background-color: transparent;
+ border: 2px solid #333333;
 }
 
 stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action) {
  margin: 0 0;
  border-radius: 9999px;
  background-color: transparent;
+ min-height: 20px;
+ padding: 5px 10px;
 }
 
 stackswitcher.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action).text-button {

diff --git a/src/sass/_tweaks-temp.scss b/src/sass/_tweaks-temp.scss
@@ -17,7 +17,7 @@ $panel_opacity: 1.0;
 $blackness: 'false';
 
 // Theme color type : default/nord/blackness
-$color_type: 'nord';
+$color_type: 'default';
 
 // Windows outline style
 $rimless: 'false';
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
@@ -3141,6 +3141,10 @@ stacksidebar.sidebar {
  background-color: $primary;
  color: on($primary);
  font-weight: 500;
+
+ label, image {
+ color: on($primary);
+ }
  }
 
  + row { margin-top: $space-size / 2; }
@@ -3734,15 +3738,18 @@ cursor-handle {
 
 stackswitcher {
  min-height: 0;
- padding: 0;
+ padding: 2px;
  margin: $space-size 0;
  border-radius: $circular-radius;
- background-color: $overlay-normal;
+ background-color: transparent;
+ border: 2px solid $primary;
 
  &.linked:not(.vertical) > button:not(.suggested-action):not(.destructive-action) {
  margin: 0 0;
  border-radius: $circular-radius;
  background-color: transparent;
+ min-height: 20px;
+ padding: ($medium-size - 26px) / 2 ($medium-size - 16px) / 2;
 
  &.text-button { min-width: 100px; }
 

diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
@@ -835,9 +835,9 @@ spinbutton {
  color: $text-secondary;
  }
 
- &.up { margin: 0 $space-size/2; }
+ &.up { margin: 0 $space-size / 2; }
 
- &.down { margin: 0 $space-size/2; }
+ &.down { margin: 0 $space-size / 2; }
  }
  }