[gtk+] Adwaita: don't color insensitive `colored` buttons.
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: don't color insensitive `colored` buttons.
- Date: Thu, 4 Sep 2014 17:05:36 +0000 (UTC)
commit 5420e48fbf8e5d360503110a9862fbad66cc45f2
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Thu Sep 4 19:02:13 2014 +0200
Adwaita: don't color insensitive `colored` buttons.
Insensitive suggested or destructive action buttons make no sense,
so Adwaita doesn't color them.
gtk/resources/theme/Adwaita/_common.scss | 4 +-
gtk/resources/theme/Adwaita/gtk-contained-dark.css | 24 ++++++++++----------
gtk/resources/theme/Adwaita/gtk-contained.css | 24 ++++++++++----------
3 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index c6f35eb..be1e8ed 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -456,14 +456,14 @@ $_dot_color: if($variant=='light', $selected_bg_color,
@include button(backdrop-active, $b_color, white);
}
&:insensitive {
- @include button(backdrop-insensitive, $b_color,white);
+ @include button(backdrop-insensitive);
&:active, &:checked {
@include button(backdrop-insensitive-active, $b_color, white);
}
}
}
&:insensitive {
- @include button(insensitive, $b_color, white);
+ @include button(insensitive);
&:active, &:checked {
@include button(insensitive-active, $b_color, white);
}
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 5c74a4c..c40df3e 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -545,9 +545,9 @@ GtkCalendar.header .button.titlebutton {
background-image: linear-gradient(to bottom, #184472);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
.button.suggested-action:backdrop:insensitive {
- color: #6f90b2;
- border-color: #0b1e33;
- background-image: linear-gradient(to bottom, #22558a);
+ color: #5d6767;
+ border-color: #1e2222;
+ background-image: linear-gradient(to bottom, #323636);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -561,9 +561,9 @@ GtkCalendar.header .button.titlebutton {
.button.suggested-action:backdrop:insensitive:active > GtkLabel,
.button.suggested-action:backdrop:insensitive:checked > GtkLabel {
color: inherit; }
.button.suggested-action:insensitive {
- color: #90aac4;
- border-color: #0b1e33;
- background-image: linear-gradient(to bottom, #22558a);
+ color: #939695;
+ border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, #323636);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -653,9 +653,9 @@ GtkCalendar.header .button.titlebutton {
background-image: linear-gradient(to bottom, #a60c0c);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
.button.destructive-action:backdrop:insensitive {
- color: #d26565;
- border-color: #5e0707;
- background-image: linear-gradient(to bottom, #bb1313);
+ color: #5d6767;
+ border-color: #1e2222;
+ background-image: linear-gradient(to bottom, #323636);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
@@ -669,9 +669,9 @@ GtkCalendar.header .button.titlebutton {
.button.destructive-action:backdrop:insensitive:active > GtkLabel,
.button.destructive-action:backdrop:insensitive:checked > GtkLabel {
color: inherit; }
.button.destructive-action:insensitive {
- color: #dd8989;
- border-color: #5e0707;
- background-image: linear-gradient(to bottom, #bb1313);
+ color: #939695;
+ border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, #323636);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index fb7b37f..f7f469d 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -537,9 +537,9 @@ GtkCalendar.header .button.titlebutton {
background-image: linear-gradient(to bottom, #2a76c6);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.button.suggested-action:backdrop:insensitive {
- color: #9ac1e9;
- border-color: #65a0de;
- background-image: linear-gradient(to bottom, #65a0de);
+ color: #c7c7c7;
+ border-color: #a8a8a8;
+ background-image: linear-gradient(to bottom, #f4f4f4);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -553,9 +553,9 @@ GtkCalendar.header .button.titlebutton {
.button.suggested-action:backdrop:insensitive:active > GtkLabel,
.button.suggested-action:backdrop:insensitive:checked > GtkLabel {
color: inherit; }
.button.suggested-action:insensitive {
- color: #b2cfee;
- border-color: #1c5187;
- background-image: linear-gradient(to bottom, #65a0de);
+ color: #8d9091;
+ border-color: #a1a1a1;
+ background-image: linear-gradient(to bottom, #f4f4f4);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
@@ -645,9 +645,9 @@ GtkCalendar.header .button.titlebutton {
background-image: linear-gradient(to bottom, #d51010);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
.button.destructive-action:backdrop:insensitive {
- color: #f58888;
- border-color: #f14949;
- background-image: linear-gradient(to bottom, #f14949);
+ color: #c7c7c7;
+ border-color: #a8a8a8;
+ background-image: linear-gradient(to bottom, #f4f4f4);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -661,9 +661,9 @@ GtkCalendar.header .button.titlebutton {
.button.destructive-action:backdrop:insensitive:active > GtkLabel,
.button.destructive-action:backdrop:insensitive:checked > GtkLabel {
color: inherit; }
.button.destructive-action:insensitive {
- color: #f8a4a4;
- border-color: #8e0b0b;
- background-image: linear-gradient(to bottom, #f14949);
+ color: #8d9091;
+ border-color: #a1a1a1;
+ background-image: linear-gradient(to bottom, #f4f4f4);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]