[gtk+] Adwaita: set color on flat buttons in selected list-rows
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: set color on flat buttons in selected list-rows
- Date: Sat, 6 Sep 2014 15:10:05 +0000 (UTC)
commit 66accf2b37270fac79b8a57b3107eb22854fac2c
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Sat Sep 6 17:09:08 2014 +0200
Adwaita: set color on flat buttons in selected list-rows
gtk/resources/theme/Adwaita/_common.scss | 17 ++++++++++-------
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 6 ++++--
gtk/resources/theme/Adwaita/gtk-contained.css | 6 ++++--
3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index ca7bf5a..bad740c 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -2257,7 +2257,10 @@ GtkScrolledWindow {
.button {
@include button(normal, $edge:none);
@if $variant == 'light' { border-color: $selected_borders_color; }
- &.flat { @include button(undecorated, $edge:none); }
+ &.flat {
+ @include button(undecorated, $edge:none);
+ color: $selected_fg_color;
+ }
&:hover {
@include button(hover, $edge:none);
@if $variant == 'light' { border-color: $selected_borders_color; }
@@ -2282,7 +2285,10 @@ GtkScrolledWindow {
}
}
}
- &.flat:backdrop { @include button(undecorated); }
+ &.flat:backdrop {
+ @include button(undecorated);
+ color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color);
+ }
&:insensitive {
@include button(insensitive, $edge:none);
@if $variant == 'light' { border-color: $selected_borders_color; }
@@ -2781,9 +2787,6 @@ GtkVolumeButton.button { padding: 8px; }
@if $variant == 'light' {
outline-color: transparentize($selected_fg_color, 0.7);
}
- &:backdrop {
- @if $variant == 'light' { color: $backdrop_base_color; }
- @else { color: $backdrop_fg_color; };
- }
+ &:backdrop { color: if($variant=='light', $backdrop_base_color,
+ $backdrop_fg_color); }
}
-
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 6204790..a8f9346 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -3383,7 +3383,8 @@ GtkCalendar.header .list-row.button.titlebutton {
background-image: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
- icon-shadow: none; }
+ icon-shadow: none;
+ color: #ffffff; }
.list-row:selected .button:hover {
color: #eeeeec;
outline-color: rgba(238, 238, 236, 0.3);
@@ -3474,7 +3475,8 @@ GtkCalendar.header .list-row.button.titlebutton {
background-image: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0);
text-shadow: none;
- icon-shadow: none; }
+ icon-shadow: none;
+ color: #c9cbc9; }
.list-row:selected .button:insensitive {
color: #939695;
border-color: #1c1f1f;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 415ef16..1453805 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -3534,7 +3534,8 @@ GtkCalendar.header .list-row.button.titlebutton {
background-image: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
- icon-shadow: none; }
+ icon-shadow: none;
+ color: #ffffff; }
.list-row:selected .button:hover {
color: #2e3436;
outline-color: rgba(46, 52, 54, 0.3);
@@ -3631,7 +3632,8 @@ GtkCalendar.header .list-row.button.titlebutton {
background-image: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
text-shadow: none;
- icon-shadow: none; }
+ icon-shadow: none;
+ color: #fcfcfc; }
.list-row:selected .button:insensitive {
color: #8d9091;
border-color: #a1a1a1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]