From c975b9ef9b686ef482a5334984e38c69dafca012 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Wed, 18 Jun 2014 16:07:59 +0200 Subject: [PATCH] Adwaita: more links styling --- gtk/resources/theme/Adwaita/_common.scss | 16 +++++++++++++--- .../theme/Adwaita/gtk-contained-dark.css | 15 +++++++++++---- gtk/resources/theme/Adwaita/gtk-contained.css | 15 +++++++++++---- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss index e124f858ad..adfa4d7bd5 100644 --- a/gtk/resources/theme/Adwaita/_common.scss +++ b/gtk/resources/theme/Adwaita/_common.scss @@ -360,20 +360,30 @@ GtkColorButton.button { padding: 4px; } // Uniform padding on the GtkColorButton * Links * *********/ -GtkLinkButton.button { +*:link { + color: $selected_bg_color; //FIXME use a proper color + &:hover, &:active, &:visited { + color: mix($fg_color, $selected_bg_color, 40%); //FIXME same here + } + &:backdrop, &:backdrop:hover { + color: $selected_bg_color; + } +} + +.button:link, .button:visited { color: $selected_bg_color; //FIXME use a proper color @extend %undecorated_button; text-shadow: none; &:hover, &:active { - color: mix($fg_color, $selected_bg_color, 40%); //FIXME same here @extend %undecorated_button; + color: mix($fg_color, $selected_bg_color, 40%); //FIXME same here text-shadow: none; } &:backdrop { - color: $selected_bg_color; @extend %undecorated_button; //This shouldn't be needed but avoids //a weird transition which for some reason //makes borders blink on hover + color: $selected_bg_color; //FIXME use a proper color } } diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css index b12301e7fb..934bd8d36f 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css @@ -435,7 +435,7 @@ border-radius: 3px; border-style: solid; } -GtkLinkButton.button, GtkLinkButton.button:hover, GtkLinkButton.button:active, GtkLinkButton.button:backdrop, .notebook tab .button { +.button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button { border-color: transparent; background-color: transparent; background-image: none; @@ -478,13 +478,20 @@ GtkColorButton.button { /********* * Links * *********/ -GtkLinkButton.button { +*:link { + color: #215d9c; } + *:link:hover, *:link:active, *:link:visited { + color: #7397bc; } + *:link:backdrop, *:link:backdrop:hover { + color: #215d9c; } + +.button:link, .button:visited { color: #215d9c; text-shadow: none; } - GtkLinkButton.button:hover, GtkLinkButton.button:active { + .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active { color: #7397bc; text-shadow: none; } - GtkLinkButton.button:backdrop { + .button:link:backdrop, .button:visited:backdrop { color: #215d9c; } /***************** diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css index 5ad9a37a82..7554c6500e 100644 --- a/gtk/resources/theme/Adwaita/gtk-contained.css +++ b/gtk/resources/theme/Adwaita/gtk-contained.css @@ -435,7 +435,7 @@ border-radius: 3px; border-style: solid; } -GtkLinkButton.button, GtkLinkButton.button:hover, GtkLinkButton.button:active, GtkLinkButton.button:backdrop, .notebook tab .button { +.button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button { border-color: transparent; background-color: transparent; background-image: none; @@ -478,13 +478,20 @@ GtkColorButton.button { /********* * Links * *********/ -GtkLinkButton.button { +*:link { + color: #4a90d9; } + *:link:hover, *:link:active, *:link:visited { + color: #3e6b97; } + *:link:backdrop, *:link:backdrop:hover { + color: #4a90d9; } + +.button:link, .button:visited { color: #4a90d9; text-shadow: none; } - GtkLinkButton.button:hover, GtkLinkButton.button:active { + .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active { color: #3e6b97; text-shadow: none; } - GtkLinkButton.button:backdrop { + .button:link:backdrop, .button:visited:backdrop { color: #4a90d9; } /*****************