[gnome-themes-standard] header-bar: more fixes for selection mode and backdrop
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] header-bar: more fixes for selection mode and backdrop
- Date: Wed, 20 Feb 2013 16:50:38 +0000 (UTC)
commit a0d54acad31c5af506d54b38d69559622bfb5a3b
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Wed Feb 20 11:50:21 2013 -0500
header-bar: more fixes for selection mode and backdrop
themes/Adwaita/gtk-3.0/gtk-main-dark.css | 21 ++++++++++++---------
themes/Adwaita/gtk-3.0/gtk-main.css | 21 ++++++++++++---------
themes/Adwaita/gtk-3.0/gtk-widgets.css | 22 ++++++++++++++++------
3 files changed, 40 insertions(+), 24 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index f35077d..4d3c3ee 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -143,10 +143,18 @@
/**************************
* Selection Mode classes *
**************************/
- define-color selection_toolbar_button_a #729fcf;
- define-color selection_toolbar_button_b #3465a4;
+ define-color selection_toolbar_bg_a #3465a4;
+ define-color selection_toolbar_bg_b #1d437b;
+ define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_b;
+ define-color selection_toolbar_fg #729fcf;
+ define-color selection_toolbar_shadow #204a87;
+ define-color selection_toolbar_border #183967;
+
+ define-color selection_toolbar_button_a @selection_toolbar_fg;
+ define-color selection_toolbar_button_b @selection_toolbar_bg_a;
@define-color selection_toolbar_button_fg #bfbfbf;
@define-color selection_toolbar_button_border #23446f;
+ define-color selection_toolbar_button_border_backdrop shade(@selection_toolbar_button_border, 0.80);
@define-color selection_toolbar_button_shadow alpha(black, 0.30);
@define-color selection_toolbar_suggested_button_a #3e4545;
@@ -154,14 +162,9 @@
@define-color selection_toolbar_suggested_button_c #2a2828;
@define-color selection_toolbar_suggested_button_fg #ffffff;
@define-color selection_toolbar_suggested_button_border #1f2020;
+ define-color selection_toolbar_suggested_button_border_backdrop
shade(@selection_toolbar_suggested_button_border, 1.30);
- define-color selection_toolbar_bg_a #3465a4;
- define-color selection_toolbar_bg_b #1d437b;
- define-color selection_toolbar_fg #729fcf;
- define-color selection_toolbar_shadow #204a87;
- define-color selection_toolbar_border #183967;
-
- define-color selection_menu_fg #729fcf;
+ define-color selection_menu_fg @selection_toolbar_fg;
@define-color selection_menu_hover shade(@selection_menu_fg, 1.15);
@define-color selection_menu_active shade(@selection_menu_fg, 1.30);
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index 82429c5..e9258d7 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -143,25 +143,28 @@
/**************************
* Selection Mode classes *
**************************/
+ define-color selection_toolbar_bg_a #97b9db;
+ define-color selection_toolbar_bg_b #729fcf;
+ define-color selection_toolbar_bg_backdrop @selection_toolbar_bg_a;
+ define-color selection_toolbar_fg #3465a4;
+ define-color selection_toolbar_shadow alpha(white, 0.40);
+ define-color selection_toolbar_border shade(@selection_toolbar_bg_b, 0.75);
+
@define-color selection_toolbar_button_a #bcd1e8;
@define-color selection_toolbar_button_b #5a8fc7;
@define-color selection_toolbar_button_fg @theme_base_color;
- define-color selection_toolbar_button_border #3465a4;
+ define-color selection_toolbar_button_border @selection_toolbar_fg;
+ define-color selection_toolbar_button_border_backdrop alpha(@selection_toolbar_button_border, 0.30);
@define-color selection_toolbar_button_shadow alpha(white, 0.15);
@define-color selection_toolbar_suggested_button_a @theme_base_color;
@define-color selection_toolbar_suggested_button_b @theme_bg_color;
@define-color selection_toolbar_suggested_button_c #f3f4f3;
@define-color selection_toolbar_suggested_button_fg @theme_text_color;
- define-color selection_toolbar_suggested_button_border #3465a4;
-
- define-color selection_toolbar_bg_a #97b9db;
- define-color selection_toolbar_bg_b #729fcf;
- define-color selection_toolbar_fg #3465a4;
- define-color selection_toolbar_shadow alpha(white, 0.40);
- define-color selection_toolbar_border @selection_toolbar_bg;
+ define-color selection_toolbar_suggested_button_border @selection_toolbar_button_border;
+ define-color selection_toolbar_suggested_button_border_backdrop @selection_toolbar_button_border_backdrop;
- define-color selection_menu_fg #3465a4;
+ define-color selection_menu_fg @selection_toolbar_fg;
@define-color selection_menu_hover shade(@selection_menu_fg, 0.80);
@define-color selection_menu_active shade(@selection_menu_fg, 0.60);
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 367f940..17c358e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -2527,6 +2527,7 @@ GtkCheckButton:selected:focus {
@unfocused_borders,
@unfocused_borders 1px,
@theme_unfocused_bg_color 1px) 0 0 2;
+ box-shadow: none;
background-color: @theme_unfocused_bg_color;
}
@@ -3091,21 +3092,30 @@ GtkProgressBar.osd.progressbar {
border-color: @borders;
border-style: solid;
+ border-image: none;
text-shadow: 0 1px @selection_toolbar_shadow;
}
.selection-mode.header-bar {
border-top-color: @selection_toolbar_bg_a;
- border-bottom-color: shade(@selection_toolbar_bg_b, 0.75);
+ border-bottom-color: @selection_toolbar_border;
border-width: 1px 0;
- box-shadow: inset 0 -1px shade(@selection_toolbar_bg_b, 0.90);
+ box-shadow: inset 0 -1px shade(@selection_toolbar_border, 1.20);
}
.selection-mode.toolbar {
padding: 6px;
}
+.selection-mode.header-bar:backdrop,
+.selection-mode.toolbar:backdrop {
+ background-image: none;
+ background-color: @selection_toolbar_bg_backdrop;
+ border-color: @selection_toolbar_bg_backdrop;
+ box-shadow: none;
+}
+
/* regular button */
.selection-mode.header-bar .button,
.selection-mode.toolbar .button,
@@ -3151,7 +3161,7 @@ GtkProgressBar.osd.progressbar {
background-image: none;
background-color: transparent;
- border-color: alpha(@selection_toolbar_button_border, 0.3);
+ border-color: @selection_toolbar_button_border_backdrop;
box-shadow: none;
color: @selection_toolbar_button_fg;
@@ -3227,7 +3237,7 @@ GtkProgressBar.osd.progressbar {
background-image: none; /* remove custom bg, we want colored buttons to look like normal buttons in
backdrop*/
background-color: @selection_toolbar_suggested_button_b;
- border-color: alpha(@selection_toolbar_suggested_button_border, 0.3);
+ border-color: @selection_toolbar_suggested_button_border_backdrop;
box-shadow: none;
color: @theme_unfocused_fg_color;
@@ -3249,8 +3259,8 @@ GtkProgressBar.osd.progressbar {
icon-shadow: 0 1px @button_text_shadow;
}
-.selection-mode.toolbar .suggested-action.button *:backdrop,
-.selection-mode.header-bar .suggested-action.button *:backdrop {
+.selection-mode.header-bar .suggested-action.button *:backdrop,
+.selection-mode.toolbar .suggested-action.button *:backdrop {
text-shadow: none;
icon-shadow: none;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]