From 5fc18c7167cacfe5d6344d7d0d3e1f496425621f Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Tue, 19 Apr 2016 22:57:28 +0200 Subject: [PATCH] Adwaita: link button style fix ensure the label color doesn't get overridden, fixes link button label being gray in backdrop. --- gtk/theme/Adwaita/_common.scss | 8 ++- gtk/theme/Adwaita/gtk-contained-dark.css | 63 +++++++++++++++++++----- gtk/theme/Adwaita/gtk-contained.css | 63 +++++++++++++++++++----- 3 files changed, 107 insertions(+), 27 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index b0e1a75db0..0ef2110e11 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -979,6 +979,8 @@ button.color { /********* * Links * *********/ + +%link, *:link { color: $link_color; @@ -1023,7 +1025,11 @@ button:visited { text-shadow: none; } - > label { text-decoration-line: underline; } + > label { + @extend %link; + + text-decoration-line: underline; + } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 2cbe977a03..cad7949772 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1416,31 +1416,61 @@ button.color { /********* * Links * *********/ -*:link, button:link, +button:link > label, +button:visited > label, +*:link, +button:link, button:visited { color: #4a90d9; } + button:link > label:visited, + button:visited > label:visited, *:link:visited, button:visited { color: #2a76c6; } - *:selected *:link:visited, *:selected button:visited:link, + *:selected button:link > label:visited, + *:selected button:visited > label:visited, *:selected + *:link:visited, *:selected + button:visited:link, *:selected button:visited { color: #a6bed7; } - *:link:hover, button:hover:link, + button:link > label:hover, + button:visited > label:hover, + *:link:hover, + button:hover:link, button:hover:visited { color: #74aae2; } - *:selected *:link:hover, *:selected button:hover:link, + *:selected button:link > label:hover, + *:selected button:visited > label:hover, *:selected + *:link:hover, *:selected + button:hover:link, *:selected button:hover:visited { color: #e9eff5; } - *:link:active, button:active:link, + button:link > label:active, + button:visited > label:active, + *:link:active, + button:active:link, button:active:visited { color: #4a90d9; } - *:selected *:link:active, *:selected button:active:link, + *:selected button:link > label:active, + *:selected button:visited > label:active, *:selected + *:link:active, *:selected + button:active:link, *:selected button:active:visited { color: #d3dfeb; } - *:link:backdrop:backdrop:hover, button:backdrop:backdrop:hover:link, - button:backdrop:backdrop:hover:visited, *:link:backdrop:backdrop:hover:selected, button:backdrop:backdrop:hover:selected:link, - button:backdrop:backdrop:hover:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, - headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, *:link:backdrop, button:backdrop:link, + button:link > label:backdrop:backdrop:hover, + button:visited > label:backdrop:backdrop:hover, button:link > label:backdrop:backdrop:hover:selected, + button:visited > label:backdrop:backdrop:hover:selected, button:link > label:backdrop, + button:visited > label:backdrop, + *:link:backdrop:backdrop:hover, + button:backdrop:backdrop:hover:link, + button:backdrop:backdrop:hover:visited, + *:link:backdrop:backdrop:hover:selected, + button:backdrop:backdrop:hover:selected:link, + button:backdrop:backdrop:hover:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, + headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, + *:link:backdrop, + button:backdrop:link, button:backdrop:visited { color: #215d9c; } .info *:link, .info button:link, @@ -1453,9 +1483,16 @@ button:visited { .warning button:visited, .error *:link, .error button:link, - .error button:visited, *:link:selected, button:selected:link, - button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link, - headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, + .error button:visited, button:link > label:selected, + button:visited > label:selected, *:selected button:link > label, + *:selected button:visited > label, + *:link:selected, + button:selected:link, + button:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:link, + headerbar.selection-mode .subtitle:link, *:selected + *:link, *:selected + button:link, *:selected button:visited { color: #d3dfeb; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 635583e077..332cc844c8 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1423,31 +1423,61 @@ button.color { /********* * Links * *********/ -*:link, button:link, +button:link > label, +button:visited > label, +*:link, +button:link, button:visited { color: #2a76c6; } + button:link > label:visited, + button:visited > label:visited, *:link:visited, button:visited { color: #215d9c; } - *:selected *:link:visited, *:selected button:visited:link, + *:selected button:link > label:visited, + *:selected button:visited > label:visited, *:selected + *:link:visited, *:selected + button:visited:link, *:selected button:visited { color: #b7d3f0; } - *:link:hover, button:hover:link, + button:link > label:hover, + button:visited > label:hover, + *:link:hover, + button:hover:link, button:hover:visited { color: #4a90d9; } - *:selected *:link:hover, *:selected button:hover:link, + *:selected button:link > label:hover, + *:selected button:visited > label:hover, *:selected + *:link:hover, *:selected + button:hover:link, *:selected button:hover:visited { color: #edf4fb; } - *:link:active, button:active:link, + button:link > label:active, + button:visited > label:active, + *:link:active, + button:active:link, button:active:visited { color: #2a76c6; } - *:selected *:link:active, *:selected button:active:link, + *:selected button:link > label:active, + *:selected button:visited > label:active, *:selected + *:link:active, *:selected + button:active:link, *:selected button:active:visited { color: #dbe9f7; } - *:link:backdrop:backdrop:hover, button:backdrop:backdrop:hover:link, - button:backdrop:backdrop:hover:visited, *:link:backdrop:backdrop:hover:selected, button:backdrop:backdrop:hover:selected:link, - button:backdrop:backdrop:hover:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, - headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, *:link:backdrop, button:backdrop:link, + button:link > label:backdrop:backdrop:hover, + button:visited > label:backdrop:backdrop:hover, button:link > label:backdrop:backdrop:hover:selected, + button:visited > label:backdrop:backdrop:hover:selected, button:link > label:backdrop, + button:visited > label:backdrop, + *:link:backdrop:backdrop:hover, + button:backdrop:backdrop:hover:link, + button:backdrop:backdrop:hover:visited, + *:link:backdrop:backdrop:hover:selected, + button:backdrop:backdrop:hover:selected:link, + button:backdrop:backdrop:hover:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:backdrop:backdrop:hover:link, + headerbar.selection-mode .subtitle:backdrop:backdrop:hover:link, + *:link:backdrop, + button:backdrop:link, button:backdrop:visited { color: #4a90d9; } .info *:link, .info button:link, @@ -1460,9 +1490,16 @@ button:visited { .warning button:visited, .error *:link, .error button:link, - .error button:visited, *:link:selected, button:selected:link, - button:selected:visited, .selection-mode.titlebar:not(headerbar) .subtitle:link, - headerbar.selection-mode .subtitle:link, *:selected *:link, *:selected button:link, + .error button:visited, button:link > label:selected, + button:visited > label:selected, *:selected button:link > label, + *:selected button:visited > label, + *:link:selected, + button:selected:link, + button:selected:visited, + .selection-mode.titlebar:not(headerbar) .subtitle:link, + headerbar.selection-mode .subtitle:link, *:selected + *:link, *:selected + button:link, *:selected button:visited { color: #dbe9f7; }