[gnome-themes-standard/wip/sass] tweak colors on all button states.
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard/wip/sass] tweak colors on all button states.
- Date: Wed, 21 May 2014 11:37:09 +0000 (UTC)
commit b21a444585efcc320703bdd7080fae56a077c7f6
Author: Jakub Steiner <jimmac gmail com>
Date: Wed May 21 13:36:48 2014 +0200
tweak colors on all button states.
themes/Adwaita/gtk-3.0/_common.scss | 31 +++++----
themes/Adwaita/gtk-3.0/_drawing.scss | 39 +++++++-----
themes/Adwaita/gtk-3.0/gtk-contained-dark.css | 81 ++++++++++++------------
themes/Adwaita/gtk-3.0/gtk-contained-dark.scss | 11 ++--
themes/Adwaita/gtk-3.0/gtk-contained.css | 59 +++++++++---------
themes/Adwaita/gtk-3.0/gtk-contained.scss | 11 ++--
6 files changed, 124 insertions(+), 108 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 143efea..31e291d 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -103,8 +103,8 @@
}
.gtkstyle-fallback:insensitive {
- background-color: $insensitive_bg_color;
- color: $insensitive_fg_color;
+ background-color: $_insensitive_bg_color;
+ color: $_insensitive_fg_color;
}
.gtkstyle-fallback:selected {
@@ -155,19 +155,19 @@ GtkGrid:insensitive {
transition: all 200ms ease-out;
border: 1px solid $borders_color;
background-image: linear-gradient(to bottom,
- darken($theme_base_color,5%) 0%,
+ darken($theme_base_color,3%) 0%,
$theme_base_color 90%
);
- box-shadow: inset 0 2px 2px -2px transparentize(black,0.6),
+ box-shadow: inset 0 2px 2px -2px $theme_shade,
0 1px $borders_edge; // not working
background-color: transparent; // this needs to be 'transparent'
// if we need a flat bg, let's abuse a gradient
&:insensitive {
- color: $insensitive_fg_color;
+ color: $_insensitive_fg_color;
background-image: none;
- background-color: $insensitive_bg_color;
+ background-color: $_insensitive_bg_color;
box-shadow: 0 1px $borders_edge; // not working
}
&:focus {
@@ -241,7 +241,7 @@ GtkGrid:insensitive {
@each $b_type, $b_color in (suggested-action, $theme_selected_bg_color),
(destructive-action, $destructive_color) {
&.#{$b_type} {
- @include button(normal,$b_color, white, true);
+ @include button(normal,$b_color, white, true); //FIXME: perhaps we should derive from bg color?
&:hover {
@include button(hover,$b_color, white, true);
}
@@ -284,8 +284,8 @@ GtkGrid:insensitive {
&:active:selected:backdrop {
text-shadow: none;
icon-shadow: none;
- color: $insensitive_fg_color;
- background-color: $insensitive_bg_color;
+ color: $_insensitive_fg_color;
+ background-color: $_insensitive_bg_color;
background-image: none;
border: none;
box-shadow: none;
@@ -356,9 +356,9 @@ GtkComboBox {
-GtkComboBox-arrow-scaling: 0.5;
-GtkComboBox-shadow-type: none;
- &:insensitive { color: $insensitive_fg_color; }
- &:backdrop { color: $insensitive_fg_color; }
- &:backdrop:insensitive { color: transparentize($insensitive_fg_color,0.5); }
+ &:insensitive { color: $_insensitive_fg_color; }
+ &:backdrop { color: $_insensitive_fg_color; }
+ &:backdrop:insensitive { color: transparentize($_insensitive_fg_color,0.5); }
.separator {
/* always disable separators */
@@ -567,7 +567,12 @@ GtkPopover {
border-radius: 7px 7px 0 0;
/* lamefun trick to get rounded borders regardless of CSD use */
border-width: 0px;
- box-shadow: 0 2px 10px 4px transparentize($wm_shadow, 0.4), 0 0 0 1px transparentize($wm_shadow,.5);
+ @if $variant == 'dark' {
+ box-shadow: 0 2px 10px 4px transparentize($wm_shadow, 0.4), 0 0 0 1px transparentize($wm_shadow,.2);
+ }
+ @else {
+ box-shadow: 0 2px 10px 4px transparentize($wm_shadow, 0.4), 0 0 0 1px transparentize($wm_shadow,.5);
+ }
/* this is used for the resize cursor area */
margin: 10px;
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index 808307d..a67b3e7 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -110,11 +110,17 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
color: $tc;
@if $colored_button { @include _button_border_color($c); }
@else { border-color: $borders_color; }
- background-image: linear-gradient(to bottom,
- darken($c,20%),
- darken($c,15%) 5%,
- darken($c,10%));
-
+ @if $variant == 'light' {
+ background-image: linear-gradient(to bottom,
+ darken($c,15%),
+ darken($c,11%) 3%,
+ darken($c,10%));
+ }
+ @else {
+ background-image: linear-gradient(to bottom,
+ darken($c,10%),
+ darken($c,5%) 3%);
+ }
@include _button_text_shadow($tc);
@include _button_box_shadow(inset 0 2px 3px -1px transparentize(black,0.7),
$widget_bottom_hilight);
@@ -123,8 +129,8 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
//
// insensitive button
//
- color: $insensitive_fg_color;
- border-color: $insensitive_fg_color;
+ color: $_insensitive_fg_color;
+ border-color: $_insensitive_borders_color;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -134,10 +140,11 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
//
// insensitive pushed button
//
- color: $insensitive_fg_color;
- border-color: $insensitive_fg_color;
- @include _button_box_shadow(inset 0 2px 3px -1px transparentize(black,0.8),
+ color: $_insensitive_fg_color;
+ border-color: $_insensitive_borders_color;
+ @include _button_box_shadow(none,
$widget_bottom_hilight);
+ background-image: linear-gradient(to bottom, transparentize($_backdrop_borders_color,.8));
}
@else if $t==backdrop { // backdrop button
@@ -150,21 +157,21 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
}
@else if $t==backdrop-active { // backdrop pushed button
- color: $_backdrop_bg_color;
+ color: $_backdrop_fg_color;
border-color: $_backdrop_borders_color;
- background-image: linear-gradient(to bottom, $_backdrop_fg_color);
+ background-image: linear-gradient(to bottom, transparentize($_backdrop_borders_color,.7));
}
@else if $t==backdrop-insensitive { // backdrop insensitive button
color: $_backdrop_insensitive_color;
- border-color: $_backdrop_insensitive_color;
+ border-color: $_backdrop_borders_color;
}
@else if $t==backdrop-insensitive-active { // backdrop insensitive
// pushed button
- color: $_backdrop_bg_color;
- border-color: $_backdrop_insensitive_color;
- background-image: linear-gradient(to bottom, $_backdrop_insensitive_color);
+ color: $_backdrop_insensitive_color;
+ border-color: $_backdrop_borders_color;
+ background-image: linear-gradient(to bottom, transparentize($_backdrop_borders_color,.8));
box-shadow: none;
}
}
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 1e1da8b..b7aa0e4 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -116,9 +116,9 @@ GtkGrid:insensitive {
color: #eeeeec;
border-radius: 3px;
transition: all 200ms ease-out;
- border: 1px solid #090909;
- background-image: linear-gradient(to bottom, #262626 0%, #333333 90%);
- box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.4), 0 1px rgba(238, 238, 236, 0.1);
+ border: 1px solid #1c1f1f;
+ background-image: linear-gradient(to bottom, #2b2b2b 0%, #333333 90%);
+ box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1);
background-color: transparent; }
.entry:insensitive {
color: white;
@@ -159,7 +159,7 @@ GtkGrid:insensitive {
border-style: solid;
color: #eeeeec;
background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
- border-color: #090909;
+ border-color: #1c1f1f;
text-shadow: 0 -1px rgba(17, 17, 19, 0.5);
icon-shadow: 0 -1px rgba(17, 17, 19, 0.5);
box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
@@ -185,8 +185,8 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: #eeeeec;
- border-color: #090909;
- background-image: linear-gradient(to bottom, #090909, #151717 5%, #212424);
+ border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, #212424, #2d3232 3%);
text-shadow: 0 -1px rgba(17, 17, 19, 0.5);
icon-shadow: 0 -1px rgba(17, 17, 19, 0.5);
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
@@ -198,7 +198,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: #eeeeec;
- border-color: #090909;
+ border-color: #1c1f1f;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -210,9 +210,9 @@ GtkGrid:insensitive {
.spinbutton.vertical .button:backdrop:active {
border-width: 1px;
border-style: solid;
- color: #393f3f;
- border-color: #090909;
- background-image: linear-gradient(to bottom, #eeeeec); }
+ color: #eeeeec;
+ border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, rgba(28, 31, 31, 0.3)); }
.button:backdrop:insensitive,
.toolbar .button.raised:backdrop:insensitive,
.toolbar .raised .button:backdrop:insensitive,
@@ -221,7 +221,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: white;
- border-color: white; }
+ border-color: #1c1f1f; }
.button:backdrop:insensitive:active,
.toolbar .button.raised:backdrop:insensitive:active,
.toolbar .raised .button:backdrop:insensitive:active,
@@ -229,9 +229,9 @@ GtkGrid:insensitive {
.spinbutton.vertical .button:backdrop:insensitive:active {
border-width: 1px;
border-style: solid;
- color: #393f3f;
- border-color: white;
- background-image: linear-gradient(to bottom, white);
+ color: white;
+ border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, rgba(28, 31, 31, 0.2));
box-shadow: none; }
.button:insensitive,
.toolbar .button.raised:insensitive,
@@ -241,7 +241,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: white;
- border-color: white;
+ border-color: #1c1f1f;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -254,8 +254,9 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: white;
- border-color: white;
- box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2), 0 1px rgba(238, 238, 236, 0.1); }
+ border-color: #1c1f1f;
+ box-shadow: none, 0 1px rgba(238, 238, 236, 0.1);
+ background-image: linear-gradient(to bottom, rgba(28, 31, 31, 0.2)); }
.button.suggested-action,
.toolbar .button.raised.suggested-action,
.toolbar .raised .button.suggested-action,
@@ -291,7 +292,7 @@ GtkGrid:insensitive {
border-style: solid;
color: white;
border-color: #215d9c;
- background-image: linear-gradient(to bottom, #184472, #1c5187 5%, #215d9c);
+ background-image: linear-gradient(to bottom, #215d9c, #256ab1 3%);
text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
@@ -303,7 +304,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: #eeeeec;
- border-color: #090909;
+ border-color: #1c1f1f;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -316,7 +317,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: white;
- border-color: white; }
+ border-color: #1c1f1f; }
.button.suggested-action:insensitive,
.toolbar .button.raised.suggested-action:insensitive,
.toolbar .raised .button.suggested-action:insensitive,
@@ -325,7 +326,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: white;
- border-color: white;
+ border-color: #1c1f1f;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -365,7 +366,7 @@ GtkGrid:insensitive {
border-style: solid;
color: white;
border-color: #a60c0c;
- background-image: linear-gradient(to bottom, #760909, #8e0b0b 5%, #a60c0c);
+ background-image: linear-gradient(to bottom, #a60c0c, #bd0e0e 3%);
text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
@@ -377,7 +378,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: #eeeeec;
- border-color: #090909;
+ border-color: #1c1f1f;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -390,7 +391,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: white;
- border-color: white; }
+ border-color: #1c1f1f; }
.button.destructive-action:insensitive,
.toolbar .button.raised.destructive-action:insensitive,
.toolbar .raised .button.destructive-action:insensitive,
@@ -399,7 +400,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: white;
- border-color: white;
+ border-color: #1c1f1f;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -453,14 +454,14 @@ GtkGrid:insensitive {
background-image: none;
border-radius: 0;
border-width: 0 0 0 1px;
- border-color: rgba(9, 9, 9, 0.3);
+ border-color: rgba(28, 31, 31, 0.3);
padding: 2px 6px; }
.spinbutton .button:active {
border-width: 1px;
border-style: solid;
color: #eeeeec;
- border-color: #090909;
- background-image: linear-gradient(to bottom, #393f3f, #454c4c 5%, #515a5a);
+ border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, #515a5a, #5d6767 3%);
text-shadow: 0 -1px rgba(17, 17, 19, 0.5);
icon-shadow: 0 -1px rgba(17, 17, 19, 0.5);
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
@@ -577,7 +578,7 @@ GtkPopover {
.notebook {
padding: 0;
border-style: solid;
- border-color: #090909;
+ border-color: #1c1f1f;
background-color: #333333;
-GtkNotebook-initial-gap: 10;
-GtkNotebook-arrow-spacing: 5;
@@ -597,7 +598,7 @@ GtkPopover {
border-width: 0px; }
.notebook.header.frame {
- border: 1px solid #090909; }
+ border: 1px solid #1c1f1f; }
.notebook.header.frame.top {
border-bottom: none; }
.notebook.header.frame.bottom {
@@ -627,19 +628,19 @@ GtkPopover {
color: #eeeeec; }
.notebook tab.top:hover {
- box-shadow: inset 0 -2px #090909; }
+ box-shadow: inset 0 -2px #1c1f1f; }
.notebook tab.top:active {
box-shadow: inset 0 -2px #2a76c6; }
.notebook tab.bottom:hover {
- box-shadow: inset 0 2px #090909; }
+ box-shadow: inset 0 2px #1c1f1f; }
.notebook tab.bottom:active {
box-shadow: inset 0 2px #2a76c6; }
.notebook tab.right:hover {
- box-shadow: inset 2px 0 #090909; }
+ box-shadow: inset 2px 0 #1c1f1f; }
.notebook tab.right:active {
box-shadow: inset 2px 0 #2a76c6; }
.notebook tab.left:hover {
- box-shadow: inset -2px 0 #090909; }
+ box-shadow: inset -2px 0 #1c1f1f; }
.notebook tab.left:active {
box-shadow: inset -2px 0 #2a76c6; }
@@ -650,11 +651,11 @@ GtkPopover {
border-radius: 7px 7px 0 0;
/* lamefun trick to get rounded borders regardless of CSD use */
border-width: 0px;
- box-shadow: 0 2px 10px 4px rgba(0, 0, 0, 0.05), 0 0 0 1px transparent;
+ box-shadow: 0 2px 10px 4px rgba(0, 0, 0, 0.45), 0 0 0 1px rgba(0, 0, 0, 0.65);
/* this is used for the resize cursor area */
margin: 10px; }
.window-frame:backdrop {
- box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.05), 0 0 0 1px transparent; }
+ box-shadow: 0 3px 6px 2px rgba(0, 0, 0, 0.45), 0 0 0 1px rgba(0, 0, 0, 0.35); }
.window-frame.tiled {
border-radius: 0;
background-color: #393f3f; }
@@ -669,7 +670,7 @@ GtkPopover {
border-style: solid;
color: #eeeeec;
background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
- border-color: #090909;
+ border-color: #1c1f1f;
text-shadow: 0 -1px rgba(17, 17, 19, 0.5);
icon-shadow: 0 -1px rgba(17, 17, 19, 0.5);
box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
@@ -677,8 +678,8 @@ GtkPopover {
border-width: 1px;
border-style: solid;
color: #eeeeec;
- border-color: #090909;
- background-image: linear-gradient(to bottom, #090909, #151717 5%, #212424);
+ border-color: #1c1f1f;
+ background-image: linear-gradient(to bottom, #212424, #2d3232 3%);
text-shadow: 0 -1px rgba(17, 17, 19, 0.5);
icon-shadow: 0 -1px rgba(17, 17, 19, 0.5);
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(238, 238, 236, 0.1); }
@@ -686,7 +687,7 @@ GtkPopover {
border-width: 1px;
border-style: solid;
color: #eeeeec;
- border-color: #090909;
+ border-color: #1c1f1f;
background-image: none;
text-shadow: none;
icon-shadow: none;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.scss b/themes/Adwaita/gtk-3.0/gtk-contained-dark.scss
index 03d1911..7833938 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.scss
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.scss
@@ -6,10 +6,10 @@ $theme_bg_color: #393f3f;
$theme_fg_color: #eeeeec;
$theme_selected_fg_color: lighten($theme_fg_color,10%);
$theme_selected_bg_color: darken(#4a90d9,10%);
-$borders_color: darken($theme_bg_color,20%);
+$borders_color: darken($theme_bg_color,12%);
$borders_edge: transparentize($theme_fg_color,.9);
$theme_shade: rgba(0,0,0,.6); //shadow seems to be a reserved word
-$wm_shadow: transparentize(black, 0.55);
+$wm_shadow: transparentize(black, 0.15);
$link_color: lighten($theme_selected_bg_color,10%);
$warning_color: #f57900;
@@ -17,14 +17,15 @@ $error_color: #cc0000;
$success_color: $theme_selected_bg_color;
$destructive_color: darken(#ef2929,10%);
-$insensitive_fg_color: lighten($theme_fg_color, 10%);
-$insensitive_bg_color: transparent;
+$_insensitive_fg_color: lighten($theme_fg_color, 10%);
+$_insensitive_bg_color: transparent;
+$_insensitive_borders_color: $borders_color;
//colors for the backdrop state, derived from the main colors.
$_backdrop_base_color: darken($theme_base_color,5%);
$_backdrop_bg_color: $theme_bg_color;
$_backdrop_fg_color: $theme_fg_color;
-$_backdrop_insensitive_color: lighten($insensitive_fg_color,5%); //FIXME
+$_backdrop_insensitive_color: lighten($_insensitive_fg_color,5%); //FIXME
$_backdrop_borders_color: $borders_color;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 950afc2..c943239 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -117,8 +117,8 @@ GtkGrid:insensitive {
border-radius: 3px;
transition: all 200ms ease-out;
border: 1px solid #a1a1a1;
- background-image: linear-gradient(to bottom, #f2f2f2 0%, white 90%);
- box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.4), 0 1px rgba(255, 255, 255, 0.05);
+ background-image: linear-gradient(to bottom, #f7f7f7 0%, white 90%);
+ box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.5), 0 1px rgba(255, 255, 255, 0.05);
background-color: transparent; }
.entry:insensitive {
color: #748489;
@@ -186,7 +186,7 @@ GtkGrid:insensitive {
border-style: solid;
color: #2e3436;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, #bababa, #c7c7c7 5%, lightgray);
+ background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray);
text-shadow: 0 1px white;
icon-shadow: 0 1px white;
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
@@ -197,8 +197,8 @@ GtkGrid:insensitive {
.spinbutton.vertical .button:backdrop {
border-width: 1px;
border-style: solid;
- color: #748489;
- border-color: #748489;
+ color: #2e3436;
+ border-color: #a1a1a1;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -210,9 +210,9 @@ GtkGrid:insensitive {
.spinbutton.vertical .button:backdrop:active {
border-width: 1px;
border-style: solid;
- color: #ededed;
- border-color: #748489;
- background-image: linear-gradient(to bottom, #748489); }
+ color: #2e3436;
+ border-color: #a1a1a1;
+ background-image: linear-gradient(to bottom, rgba(161, 161, 161, 0.3)); }
.button:backdrop:insensitive,
.toolbar .button.raised:backdrop:insensitive,
.toolbar .raised .button:backdrop:insensitive,
@@ -221,7 +221,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: #c7c7c7;
- border-color: #c7c7c7; }
+ border-color: #a1a1a1; }
.button:backdrop:insensitive:active,
.toolbar .button.raised:backdrop:insensitive:active,
.toolbar .raised .button:backdrop:insensitive:active,
@@ -229,9 +229,9 @@ GtkGrid:insensitive {
.spinbutton.vertical .button:backdrop:insensitive:active {
border-width: 1px;
border-style: solid;
- color: #ededed;
- border-color: #c7c7c7;
- background-image: linear-gradient(to bottom, #c7c7c7);
+ color: #c7c7c7;
+ border-color: #a1a1a1;
+ background-image: linear-gradient(to bottom, rgba(161, 161, 161, 0.2));
box-shadow: none; }
.button:insensitive,
.toolbar .button.raised:insensitive,
@@ -241,7 +241,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: #748489;
- border-color: #748489;
+ border-color: #a1a1a1;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -254,8 +254,9 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: #748489;
- border-color: #748489;
- box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.2), 0 1px rgba(255, 255, 255, 0.05); }
+ border-color: #a1a1a1;
+ box-shadow: none, 0 1px rgba(255, 255, 255, 0.05);
+ background-image: linear-gradient(to bottom, rgba(161, 161, 161, 0.2)); }
.button.suggested-action,
.toolbar .button.raised.suggested-action,
.toolbar .raised .button.suggested-action,
@@ -291,7 +292,7 @@ GtkGrid:insensitive {
border-style: solid;
color: white;
border-color: #2b537d;
- background-image: linear-gradient(to bottom, #386ca3, #3e78b6 5%, #4c85c2);
+ background-image: linear-gradient(to bottom, #3e78b6, #4883c1 3%, #4c85c2);
text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
@@ -302,8 +303,8 @@ GtkGrid:insensitive {
.spinbutton.vertical .button.suggested-action:backdrop {
border-width: 1px;
border-style: solid;
- color: #748489;
- border-color: #748489;
+ color: #2e3436;
+ border-color: #a1a1a1;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -316,7 +317,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: #c7c7c7;
- border-color: #c7c7c7; }
+ border-color: #a1a1a1; }
.button.suggested-action:insensitive,
.toolbar .button.raised.suggested-action:insensitive,
.toolbar .raised .button.suggested-action:insensitive,
@@ -325,7 +326,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: #748489;
- border-color: #748489;
+ border-color: #a1a1a1;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -365,7 +366,7 @@ GtkGrid:insensitive {
border-style: solid;
color: white;
border-color: #760909;
- background-image: linear-gradient(to bottom, #a60c0c, #bd0e0e 5%, #d51010);
+ background-image: linear-gradient(to bottom, #bd0e0e, #d01010 3%, #d51010);
text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
@@ -376,8 +377,8 @@ GtkGrid:insensitive {
.spinbutton.vertical .button.destructive-action:backdrop {
border-width: 1px;
border-style: solid;
- color: #748489;
- border-color: #748489;
+ color: #2e3436;
+ border-color: #a1a1a1;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -390,7 +391,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: #c7c7c7;
- border-color: #c7c7c7; }
+ border-color: #a1a1a1; }
.button.destructive-action:insensitive,
.toolbar .button.raised.destructive-action:insensitive,
.toolbar .raised .button.destructive-action:insensitive,
@@ -399,7 +400,7 @@ GtkGrid:insensitive {
border-width: 1px;
border-style: solid;
color: #748489;
- border-color: #748489;
+ border-color: #a1a1a1;
background-image: none;
text-shadow: none;
icon-shadow: none;
@@ -460,7 +461,7 @@ GtkGrid:insensitive {
border-style: solid;
color: #2e3436;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, #cccccc, #d9d9d9 5%, #e6e6e6);
+ background-image: linear-gradient(to bottom, #d9d9d9, #e3e3e3 3%, #e6e6e6);
text-shadow: 0 1px white;
icon-shadow: 0 1px white;
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
@@ -678,15 +679,15 @@ GtkPopover {
border-style: solid;
color: #2e3436;
border-color: #a1a1a1;
- background-image: linear-gradient(to bottom, #bababa, #c7c7c7 5%, lightgray);
+ background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray);
text-shadow: 0 1px white;
icon-shadow: 0 1px white;
box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
.button.titlebutton:backdrop {
border-width: 1px;
border-style: solid;
- color: #748489;
- border-color: #748489;
+ color: #2e3436;
+ border-color: #a1a1a1;
background-image: none;
text-shadow: none;
icon-shadow: none;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.scss b/themes/Adwaita/gtk-3.0/gtk-contained.scss
index 2946d90..64d15e3 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.scss
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.scss
@@ -14,12 +14,13 @@ $theme_fg_color: #2e3436;
$theme_selected_fg_color: #ffffff;
$theme_selected_bg_color: #729fcf;
-$insensitive_fg_color: lighten($theme_fg_color, 30%);
-$insensitive_bg_color: transparent;
-
$borders_color: darken($theme_bg_color,30%);
$borders_edge: transparentize($theme_base_color,0.95);
+$_insensitive_fg_color: lighten($theme_fg_color, 30%);
+$_insensitive_bg_color: transparent;
+$_insensitive_borders_color: $borders_color;
+
$theme_shade: rgba(0,0,0,.5); //shadow seems to be a reserved word
$wm_shadow: transparentize(black, 0.25);
@@ -34,9 +35,9 @@ $destructive_color: #ef2929;
//colors for the backdrop state, derived from the main colors.
$_backdrop_base_color: darken($theme_base_color,5%);
$_backdrop_bg_color: $theme_bg_color;
-$_backdrop_fg_color: $insensitive_fg_color;
+$_backdrop_fg_color: $theme_fg_color;
$_backdrop_insensitive_color: darken($_backdrop_bg_color,15%);
-$_backdrop_borders_color: $insensitive_fg_color;
+$_backdrop_borders_color: $borders_color;
// common drawing routines
@import 'drawing';
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
