gtk3: Avoid tooltip's invisible text color with change_color.sh

nana-4 · Mar 20, 2018 · a8bbbe9 · a8bbbe9
1 parent ac9d3a9
commit a8bbbe9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/_sass/_colors.scss b/src/_sass/_colors.scss
@@ -55,8 +55,6 @@ $inverse_panel_bg_color: rgba($inverse_fg_color, 0.1);
 $solid_panel_bg_color:   if($titlebar == 'dark', $grey_900, $panel_bg_color);
 $opaque_panel_bg_color:  if($titlebar == 'dark', $grey_900, mix($grey_300, $grey_400, 50%)); // for Unity panel which cannot use translucent colors
 
-$tooltip_bg_color: $grey_800;
-
 $gdm_bg_color: $grey_850;
 
 $fill_color:      gtkalpha(currentColor, $lower_opacity);
@@ -84,6 +82,9 @@ $question_bg_color: $blue_400;
 $warning_bg_color:  $orange_400;
 $error_bg_color:    $red_400;
 
+$tooltip_bg_color: $grey_800;
+$tooltip_fg_color: $inverse_fg_color;
+
 $border_color:             if($variant == 'light', rgba($black, 0.12), rgba($black, 0.26));
 $alt_border_color:         rgba($black, 0.26); // for non-native GTK+ apps (e.g. Firefox and Chrome)
 $highlight_color:          if($variant == 'light', rgba($white, 0.4),  rgba($white, 0.1));

diff --git a/src/_sass/_colors.scss.template b/src/_sass/_colors.scss.template
@@ -57,8 +57,6 @@ $inverse_panel_bg_color: rgba($inverse_fg_color, 0.1);
 $solid_panel_bg_color:   if($titlebar == 'dark', %MENU_BG%, %MENU_BG%);
 $opaque_panel_bg_color:  if($titlebar == 'dark', %MENU_BG%, mix(%MENU_BG%, %MENU_BG%, 50%)); // for Unity panel which cannot use translucent colors
 
-$tooltip_bg_color: %MENU_BG%;
-
 $gdm_bg_color: if($variant == 'light', %MENU_BG%, %MENU_BG2%);
 
 $fill_color:      gtkalpha(currentColor, $lower_opacity);
@@ -86,6 +84,9 @@ $question_bg_color: $info_bg_color;
 $warning_bg_color: $warning_color;
 $error_bg_color: $error_color;
 
+$tooltip_bg_color: %MENU_BG%;
+$tooltip_fg_color: %MENU_FG%;
+
 $border_color:             if($variant == 'light', rgba(%FG%, 0.12), rgba(%FG%, 0.26));
 $alt_border_color:         rgba(%FG%, 0.26); // for non-native GTK+ apps (e.g. Firefox and Chrome)
 $highlight_color:          if($variant == 'light', rgba(%TXT_BG%, 0.4),  rgba(%TXT_BG%, 0.1));

diff --git a/src/_sass/gtk/_common-3.18.scss b/src/_sass/gtk/_common-3.18.scss
@@ -2057,7 +2057,7 @@ GtkInfoBar {
   }
 
   // @extend %osd;
-  color: $inverse_fg_color;
+  color: $tooltip_fg_color;
   padding: 4px; /* not working */
   border-radius: 2px;
   box-shadow: none; // otherwise it gets inherited by windowframe.csd

diff --git a/src/_sass/gtk/_common-3.20.scss b/src/_sass/gtk/_common-3.20.scss
@@ -3154,7 +3154,7 @@ tooltip {
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
     // box-shadow: inset 0 1px $highlight_color;
     background-color: rgba($tooltip_bg_color, $higher_opacity);
-    color: $inverse_fg_color;
+    color: $tooltip_fg_color;
   }
 
   // @extend %osd;