[gnome-themes-standard] more insensitive state fixes - set the correct bg to backdrop insensitive buttons - remove red a
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] more insensitive state fixes - set the correct bg to backdrop insensitive buttons - remove red a
- Date: Mon, 9 Jun 2014 13:19:38 +0000 (UTC)
commit 67271822d596d4e8e8cc3230da920c97d556fe0c
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Tue Jun 3 21:56:59 2014 +0200
more insensitive state fixes
- set the correct bg to backdrop insensitive buttons
- remove red and use a brighter then bg color gray for insensitive bg
themes/Adwaita/gtk-3.0/_colors.scss | 2 +-
themes/Adwaita/gtk-3.0/_drawing.scss | 1 +
themes/Adwaita/gtk-3.0/gtk-contained-dark.css | 32 ++++++++++++++----------
themes/Adwaita/gtk-3.0/gtk-contained.css | 32 ++++++++++++++----------
4 files changed, 40 insertions(+), 27 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_colors.scss b/themes/Adwaita/gtk-3.0/_colors.scss
index e4e7a89..989a644 100644
--- a/themes/Adwaita/gtk-3.0/_colors.scss
+++ b/themes/Adwaita/gtk-3.0/_colors.scss
@@ -19,7 +19,7 @@ $destructive_color: if($variant =='light', #ef2929, darken(#ef2929,10%));
//insensitive state derived colors
$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
-$insensitive_bg_color: red; // FIXME we need to use the insensitive bg color
+$insensitive_bg_color: mix($bg_color, $base_color, 60%);
$insensitive_borders_color: $borders_color;
//colors for the backdrop state, derived from the main colors.
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index 1ddfdf6..bccfbc0 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -258,6 +258,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
//
color: $backdrop_insensitive_color;
border-color: $backdrop_borders_color;
+ background-image: linear-gradient(to bottom, $backdrop_bg_color);
box-shadow: inset 0 1px transparentize(white,1);
}
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 5df2485..c1f2e22 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -62,7 +62,7 @@
background-color: #212424;
color: #eeeeec; }
.gtkstyle-fallback:insensitive {
- background-color: red;
+ background-color: #363a3a;
color: #939695; }
.gtkstyle-fallback:selected {
background-color: #215d9c;
@@ -116,7 +116,7 @@
background-image: linear-gradient(to bottom, #2b2b2b, #333333 90%);
color: #939695;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #363a3a);
box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
.entry:backdrop {
background-color: transparent;
@@ -214,6 +214,7 @@
border-style: solid;
color: #a0a3a2;
border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, #393f3f);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.button:backdrop:insensitive:active {
border-width: 1px;
@@ -227,7 +228,7 @@
border-style: solid;
color: #939695;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #363a3a);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -236,7 +237,7 @@
border-style: solid;
color: #939695;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, #e80303);
+ background-image: linear-gradient(to bottom, #333737);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
.button.suggested-action {
border-width: 1px;
@@ -279,13 +280,14 @@
border-style: solid;
color: #a0a3a2;
border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, #393f3f);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.button.suggested-action:insensitive {
border-width: 1px;
border-style: solid;
color: #939695;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #363a3a);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -330,13 +332,14 @@
border-style: solid;
color: #a0a3a2;
border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, #393f3f);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.button.destructive-action:insensitive {
border-width: 1px;
border-style: solid;
color: #939695;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #363a3a);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -376,7 +379,7 @@
text-shadow: none;
icon-shadow: none;
color: #939695;
- background-color: red;
+ background-color: #363a3a;
background-image: none;
border: none;
box-shadow: none; }
@@ -438,7 +441,7 @@ GtkColorButton.button {
border-style: solid;
color: #939695;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #363a3a);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -474,7 +477,7 @@ GtkColorButton.button {
border-style: solid;
color: #939695;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #363a3a);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -492,6 +495,7 @@ GtkColorButton.button {
border-style: solid;
color: #a0a3a2;
border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, #393f3f);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.spinbutton.vertical.entry {
border-radius: 0; }
@@ -892,7 +896,7 @@ GtkSwitch {
GtkSwitch.trough:insensitive {
color: #939695;
border-color: #1c1f1f;
- background-color: red;
+ background-color: #363a3a;
box-shadow: 0 1px rgba(238, 238, 236, 0.1);
text-shadow: none; }
GtkSwitch.trough:backdrop {
@@ -927,7 +931,7 @@ GtkSwitch {
border-style: solid;
color: #939695;
border-color: #1c1f1f;
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #363a3a);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -947,6 +951,7 @@ GtkSwitch {
border-style: solid;
color: #a0a3a2;
border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, #393f3f);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
/*************************
@@ -1183,7 +1188,7 @@ GtkCheckButton.text-button:selected {
border-color: #151717;
box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2a2f2f; }
.scale.slider:insensitive {
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #363a3a);
box-shadow: none; }
.scale.slider:backdrop {
border-color: #151717;
@@ -1194,6 +1199,7 @@ GtkCheckButton.text-button:selected {
border-style: solid;
color: #a0a3a2;
border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, #393f3f);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.scale.slider:active {
border: 1px solid #040a11; }
@@ -1217,7 +1223,7 @@ GtkCheckButton.text-button:selected {
box-shadow: none; }
.scale.trough:insensitive, .scale.trough.hilight:insensitive {
border-color: #1c1f1f;
- background-color: red;
+ background-color: #363a3a;
box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
.scale.trough:backdrop {
border-color: #1c1f1f;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 8a19a89..191051d 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -62,7 +62,7 @@
background-color: lightgray;
color: #2e3436; }
.gtkstyle-fallback:insensitive {
- background-color: red;
+ background-color: #f4f4f4;
color: #8d9091; }
.gtkstyle-fallback:selected {
background-color: #4a90d9;
@@ -116,7 +116,7 @@
background-image: linear-gradient(to bottom, #f7f7f7, white 90%);
color: #8d9091;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #f4f4f4);
box-shadow: 0 1px white; }
.entry:backdrop {
background-color: transparent;
@@ -214,6 +214,7 @@
border-style: solid;
color: #c7c7c7;
border-color: #a1a1a1;
+ background-image: linear-gradient(to bottom, #ededed);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.button:backdrop:insensitive:active {
border-width: 1px;
@@ -227,7 +228,7 @@
border-style: solid;
color: #8d9091;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, red);
+ 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; }
@@ -236,7 +237,7 @@
border-style: solid;
color: #8d9091;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, #f51010);
+ background-image: linear-gradient(to bottom, #ebebeb);
box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
.button.suggested-action {
border-width: 1px;
@@ -279,13 +280,14 @@
border-style: solid;
color: #c7c7c7;
border-color: #a1a1a1;
+ background-image: linear-gradient(to bottom, #ededed);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.button.suggested-action:insensitive {
border-width: 1px;
border-style: solid;
color: #8d9091;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, red);
+ 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; }
@@ -330,13 +332,14 @@
border-style: solid;
color: #c7c7c7;
border-color: #a1a1a1;
+ background-image: linear-gradient(to bottom, #ededed);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.button.destructive-action:insensitive {
border-width: 1px;
border-style: solid;
color: #8d9091;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, red);
+ 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; }
@@ -376,7 +379,7 @@
text-shadow: none;
icon-shadow: none;
color: #8d9091;
- background-color: red;
+ background-color: #f4f4f4;
background-image: none;
border: none;
box-shadow: none; }
@@ -438,7 +441,7 @@ GtkColorButton.button {
border-style: solid;
color: #8d9091;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #f4f4f4);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -474,7 +477,7 @@ GtkColorButton.button {
border-style: solid;
color: #8d9091;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, red);
+ 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; }
@@ -492,6 +495,7 @@ GtkColorButton.button {
border-style: solid;
color: #c7c7c7;
border-color: #a1a1a1;
+ background-image: linear-gradient(to bottom, #ededed);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.spinbutton.vertical.entry {
border-radius: 0; }
@@ -892,7 +896,7 @@ GtkSwitch {
GtkSwitch.trough:insensitive {
color: #8d9091;
border-color: #a1a1a1;
- background-color: red;
+ background-color: #f4f4f4;
box-shadow: 0 1px white;
text-shadow: none; }
GtkSwitch.trough:backdrop {
@@ -927,7 +931,7 @@ GtkSwitch {
border-style: solid;
color: #8d9091;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #f4f4f4);
text-shadow: none;
icon-shadow: none;
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -947,6 +951,7 @@ GtkSwitch {
border-style: solid;
color: #c7c7c7;
border-color: #a1a1a1;
+ background-image: linear-gradient(to bottom, #ededed);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
/*************************
@@ -1183,7 +1188,7 @@ GtkCheckButton.text-button:selected {
border-color: #999999;
box-shadow: inset 0 1px white, inset 0 -2px #ededed, inset 0 -1px #c7c7c7; }
.scale.slider:insensitive {
- background-image: linear-gradient(to bottom, red);
+ background-image: linear-gradient(to bottom, #f4f4f4);
box-shadow: none; }
.scale.slider:backdrop {
border-color: #999999;
@@ -1194,6 +1199,7 @@ GtkCheckButton.text-button:selected {
border-style: solid;
color: #c7c7c7;
border-color: #a1a1a1;
+ background-image: linear-gradient(to bottom, #ededed);
box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
.scale.slider:active {
border: 1px solid #153d65; }
@@ -1217,7 +1223,7 @@ GtkCheckButton.text-button:selected {
box-shadow: none; }
.scale.trough:insensitive, .scale.trough.hilight:insensitive {
border-color: #a1a1a1;
- background-color: red;
+ background-color: #f4f4f4;
box-shadow: 0 1px white; }
.scale.trough:backdrop {
border-color: #a1a1a1;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]