[gtk/gtk-3-24] Adwaita: always use link specific colors for link selector

From: Jakub Steiner <jimmac src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk/gtk-3-24] Adwaita: always use link specific colors for link selector
Date: Wed, 5 Feb 2020 12:15:24 +0000 (UTC)

commit b50ccaea1289b2fb0ffe581b07630522dfd7a6e6
Author: Carlo Lobrano <c lobrano gmail com>
Date:   Thu Jan 30 17:11:16 2020 +0100

    Adwaita: always use link specific colors for link selector
    
    link target uses `$selected_bg_color` and `$selected_fg_color` for the
    definition of some selectors (e.g. selected).
    
    While `$link_color` and `$link_visited_color` are based on
    `$selected_bg_color`, this does not seem coherent.
    
    Replacing `$selected_*g_color` in link target style with link colors
    defined in `_colors.scss file`.

 gtk/theme/Adwaita/_common.scss           | 15 ++++++++-------
 gtk/theme/Adwaita/gtk-contained-dark.css | 10 +++++-----
 gtk/theme/Adwaita/gtk-contained.css      |  8 ++++----
 3 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index d93c451d4b..1a68e0c0da 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1182,28 +1182,29 @@ list row button.image-button:not(.flat) {
   &:visited {
     color: $link_visited_color;
 
-    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 60%); }
+    *:selected & { color: mix($selected_fg_color, $link_visited_color, 60%); }
   }
 
   &:hover {
-    color: lighten($link_color,10%);
+    $_fg: lighten($link_color, 10%);
+    color: $_fg;
 
-    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 90%); }
+    *:selected & { color: mix($selected_fg_color, $_fg, 90%); }
   }
 
   &:active {
     color: $link_color;
 
-    *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); }
+    *:selected & { color: mix($selected_fg_color, $link_color, 80%); }
   }
 
-  &:disabled, &:disabled:backdrop { color: transparentize(desaturate($link_color,100%), 0.2); }
+  &:disabled, &:disabled:backdrop { color: transparentize(desaturate($link_color, 100%), 0.2); }
 
-  &:backdrop { &:backdrop:hover, &:backdrop:hover:selected, & { color: $selected_bg_color; }}
+  &:backdrop { &:backdrop:hover, &:backdrop:hover:selected, & { color: transparentize($link_color, 0.1); }}
 
   @at-root %link_selected,
   &:selected,
-  *:selected & { color: mix($selected_fg_color, $selected_bg_color, 80%); }
+  *:selected & { color: mix($selected_fg_color, $link_color, 80%); }
 }
 
 button:link,
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index e5b8428a84..1fc7cf346f 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -440,21 +440,21 @@ button:link, button:visited, button:link > label, button:visited > label, *:link
 
 button:visited, button:link > label:visited, button:visited > label:visited, *:link:visited { color: 
#1b6acb; }
 
-*:selected button:visited, *:selected button:link > label:visited, *:selected button:visited > 
label:visited, *:selected *:link:visited { color: #a1bad8; }
+*:selected button:visited, *:selected button:link > label:visited, *:selected button:visited > 
label:visited, *:selected *:link:visited { color: #a4c4ea; }
 
 button:hover:link, button:hover:visited, button:link > label:hover, button:visited > label:hover, 
*:link:hover { color: #629fea; }
 
-*:selected button:hover:link, *:selected button:hover:visited, *:selected button:link > label:hover, 
*:selected button:visited > label:hover, *:selected *:link:hover { color: #e8eef5; }
+*:selected button:hover:link, *:selected button:hover:visited, *:selected button:link > label:hover, 
*:selected button:visited > label:hover, *:selected *:link:hover { color: #eff5fd; }
 
 button:active:link, button:active:visited, button:link > label:active, button:visited > label:active, 
*:link:active { color: #3584e4; }
 
-*:selected button:active:link, *:selected button:active:visited, *:selected button:link > label:active, 
*:selected button:visited > label:active, *:selected *:link:active { color: #d0ddec; }
+*:selected button:active:link, *:selected button:active:visited, *:selected button:link > label:active, 
*:selected button:visited > label:active, *:selected *:link:active { color: #d7e6fa; }
 
 button:disabled:link, button:disabled:visited, button:link > label:disabled, button:visited > 
label:disabled, button:disabled:backdrop:link, button:disabled:backdrop:visited, button:link > 
label:disabled:backdrop, button:visited > label:disabled:backdrop, *:link:disabled, *:link:disabled:backdrop 
{ color: rgba(141, 141, 141, 0.8); }
 
-button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, button:link > 
label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, 
button:backdrop:backdrop:hover:selected:link, button:backdrop:backdrop:hover:selected:visited, button:link > 
label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, 
button:backdrop:link, button:backdrop:visited, button:link > label:backdrop, button:visited > label:backdrop, 
*:link:backdrop:backdrop:hover, *:link:backdrop:backdrop:hover:selected, *:link:backdrop { color: #15539e; }
+button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, button:link > 
label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, 
button:backdrop:backdrop:hover:selected:link, button:backdrop:backdrop:hover:selected:visited, button:link > 
label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, 
button:backdrop:link, button:backdrop:visited, button:link > label:backdrop, button:visited > label:backdrop, 
*:link:backdrop:backdrop:hover, *:link:backdrop:backdrop:hover:selected, *:link:backdrop { color: rgba(53, 
132, 228, 0.9); }
 
-.selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) 
.subtitle:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, 
button:selected:link, button:selected:visited, button:link > label:selected, button:visited > label:selected, 
*:selected button:link, *:selected button:visited, *:selected button:link > label, *:selected button:visited

label, *:link:selected, *:selected *:link { color: #d0ddec; }

+.selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) 
.subtitle:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, 
button:selected:link, button:selected:visited, button:link > label:selected, button:visited > label:selected, 
*:selected button:link, *:selected button:visited, *:selected button:link > label, *:selected button:visited

label, *:link:selected, *:selected *:link { color: #d7e6fa; }

 
 button:link, button:visited { text-shadow: none; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index b2c62700d6..a45ea2ca70 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -448,7 +448,7 @@ button:link, button:visited, button:link > label, button:visited > label, *:link
 
 button:visited, button:link > label:visited, button:visited > label:visited, *:link:visited { color: 
#15539e; }
 
-*:selected button:visited, *:selected button:link > label:visited, *:selected button:visited > 
label:visited, *:selected *:link:visited { color: #aecef4; }
+*:selected button:visited, *:selected button:link > label:visited, *:selected button:visited > 
label:visited, *:selected *:link:visited { color: #a1bad8; }
 
 button:hover:link, button:hover:visited, button:link > label:hover, button:visited > label:hover, 
*:link:hover { color: #3584e4; }
 
@@ -456,13 +456,13 @@ button:hover:link, button:hover:visited, button:link > label:hover, button:visit
 
 button:active:link, button:active:visited, button:link > label:active, button:visited > label:active, 
*:link:active { color: #1b6acb; }
 
-*:selected button:active:link, *:selected button:active:visited, *:selected button:link > label:active, 
*:selected button:visited > label:active, *:selected *:link:active { color: #d7e6fa; }
+*:selected button:active:link, *:selected button:active:visited, *:selected button:link > label:active, 
*:selected button:visited > label:active, *:selected *:link:active { color: #d1e1f5; }
 
 button:disabled:link, button:disabled:visited, button:link > label:disabled, button:visited > 
label:disabled, button:disabled:backdrop:link, button:disabled:backdrop:visited, button:link > 
label:disabled:backdrop, button:visited > label:disabled:backdrop, *:link:disabled, *:link:disabled:backdrop 
{ color: rgba(115, 115, 115, 0.8); }
 
-button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, button:link > 
label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, 
button:backdrop:backdrop:hover:selected:link, button:backdrop:backdrop:hover:selected:visited, button:link > 
label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, 
button:backdrop:link, button:backdrop:visited, button:link > label:backdrop, button:visited > label:backdrop, 
*:link:backdrop:backdrop:hover, *:link:backdrop:backdrop:hover:selected, *:link:backdrop { color: #3584e4; }
+button:backdrop:backdrop:hover:link, button:backdrop:backdrop:hover:visited, button:link > 
label:backdrop:backdrop:hover, button:visited > label:backdrop:backdrop:hover, 
button:backdrop:backdrop:hover:selected:link, button:backdrop:backdrop:hover:selected:visited, button:link > 
label:backdrop:backdrop:hover:selected, button:visited > label:backdrop:backdrop:hover:selected, 
button:backdrop:link, button:backdrop:visited, button:link > label:backdrop, button:visited > label:backdrop, 
*:link:backdrop:backdrop:hover, *:link:backdrop:backdrop:hover:selected, *:link:backdrop { color: rgba(27, 
106, 203, 0.9); }
 
-.selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) 
.subtitle:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, 
button:selected:link, button:selected:visited, button:link > label:selected, button:visited > label:selected, 
*:selected button:link, *:selected button:visited, *:selected button:link > label, *:selected button:visited

label, *:link:selected, *:selected *:link { color: #d7e6fa; }

+.selection-mode .titlebar:not(headerbar) .subtitle:link, .selection-mode.titlebar:not(headerbar) 
.subtitle:link, .selection-mode headerbar .subtitle:link, headerbar.selection-mode .subtitle:link, 
button:selected:link, button:selected:visited, button:link > label:selected, button:visited > label:selected, 
*:selected button:link, *:selected button:visited, *:selected button:link > label, *:selected button:visited

label, *:link:selected, *:selected *:link { color: #d1e1f5; }

 
 button:link, button:visited { text-shadow: none; }

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]