[gnome-themes-standard] Merge separate backgrounds file into main css
- From: William Jon McCann <mccann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] Merge separate backgrounds file into main css
- Date: Tue, 6 May 2014 22:24:33 +0000 (UTC)
commit b3fed34f6919e7a5eba3e163d7705b296ba37654
Author: William Jon McCann <william jon mccann gmail com>
Date: Tue May 6 17:44:41 2014 -0400
Merge separate backgrounds file into main css
themes/Adwaita/gtk-3.0/gtk-main-dark.css | 1 -
themes/Adwaita/gtk-3.0/gtk-main.css | 1 -
themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 241 ------------------
themes/Adwaita/gtk-3.0/gtk-widgets.css | 267 +++++++++++++++++++-
themes/Adwaita/gtk-3.0/gtk.gresource.xml | 1 -
5 files changed, 261 insertions(+), 250 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index ce1105e..340ec19 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -208,7 +208,6 @@
@define-color wm_button_bg_active_c shade (@theme_bg_color, 0.7);
@import url("gtk-main-common.css");
- import url("gtk-widgets-backgrounds.css");
@import url("gtk-widgets-assets-dark.css");
@import url("gtk-widgets.css");
@import url("gtk-widgets-dark-overrides.css");
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index 39cce99..960c5df 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -208,7 +208,6 @@
@define-color wm_button_bg_active_c shade (@theme_bg_color, 0.9);
@import url("gtk-main-common.css");
- import url("gtk-widgets-backgrounds.css");
@import url("gtk-widgets-assets.css");
@import url("gtk-widgets.css");
@import url("gnome-applications.css");
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 7d88c8a..a91be6a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -541,12 +541,6 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop {
box-shadow: none;
}
-.spinbutton .button,
-.spinbutton .button:backdrop {
- background-color: transparent;
- background-image: none;
-}
-
.spinbutton .button:insensitive {
color: @internal_element_insensitive;
}
@@ -574,6 +568,34 @@ GtkComboBox.combobox-entry .button:insensitive:backdrop {
box-shadow: inset -1px 0 @inset_dark_color;
}
+.spinbutton .button,
+.spinbutton .button:backdrop,
+.spinbutton .button:insensitive,
+.spinbutton .button:active,
+.spinbutton .button:hover,
+.spinbutton .button:active:hover {
+ background-image: none;
+ background-color: transparent;
+}
+
+.spinbutton .button:active,
+.spinbutton .button:active:hover {
+ background-image: linear-gradient(to bottom,
+ shade(@entry_background_a, 0.9),
+ @entry_background_b
+ );
+}
+
+.spinbutton.vertical.entry:backdrop {
+ background-image: none;
+ background-color: @theme_unfocused_base_color;
+}
+
+.spinbutton.vertical.entry:insensitive:backdrop {
+ background-image: none;
+ background-color: @unfocused_insensitive_bg_color;
+}
+
/* Add back the glowy effect from the entry covered by the pushed button background*/
.spinbutton .button:active,
.spinbutton .button:active:hover {
@@ -919,6 +941,48 @@ GtkColorButton.button {
* Progress bar *
****************/
+/* Progressbar backgrounds */
+.progressbar,
+.progressbar row,
+.progressbar row:hover,
+.progressbar row:selected,
+.progressbar row:selected:focus {
+ background-image: linear-gradient(to left top,
+ alpha (@progressbar_pattern, 0.25),
+ alpha (@progressbar_pattern, 0.25) 25%,
+ transparent 25%,
+ transparent 50%,
+ alpha (@progressbar_pattern, 0.25) 50%,
+ alpha (@progressbar_pattern, 0.25) 75%,
+ transparent 75%,
+ transparent
+ ),
+ linear-gradient(to bottom,
+ @progressbar_background_a,
+ @progressbar_background_b 75%,
+ shade(@progressbar_background_a, 0.85)
+ );
+ background-size: 40px 40px, auto;
+ box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
+}
+
+.progressbar.vertical {
+ background-image: linear-gradient(to right top,
+ alpha (@progressbar_pattern, 0.25),
+ alpha (@progressbar_pattern, 0.25) 25%,
+ transparent 25%,
+ transparent 50%,
+ alpha (@progressbar_pattern, 0.25) 50%,
+ alpha (@progressbar_pattern, 0.25) 75%,
+ transparent 75%,
+ transparent),
+ linear-gradient(to right,
+ @progressbar_background_a,
+ @progressbar_background_b 75%,
+ shade(@progressbar_background_a, 0.85)
+ );
+}
+
/* FIXME: this should really be a margin... */
GtkProgressBar {
padding: 0 0 1px 0;
@@ -1275,6 +1339,107 @@ GtkScrolledWindow GtkViewport.frame {
/***********
* Buttons *
***********/
+
+.button,
+.toolbar .button.raised,
+.toolbar .raised .button,
+.toolbar GtkComboBox .button,
+.spinbutton.vertical .button {
+ background-image: linear-gradient(to bottom,
+ @button_gradient_color_a,
+ @button_gradient_color_b 40%,
+ @button_gradient_color_c
+ );
+ background-color: transparent;
+}
+
+/* Pushed buttons */
+.button:active,
+.button:active:hover,
+.spinbutton.vertical .button:active,
+.spinbutton.vertical .button:active:hover,
+.toolbar .button:active,
+.toolbar .button:active:hover,
+.toolbar .button.raised:active,
+.toolbar .raised .button:active,
+.toolbar .button.raised:active:hover,
+.toolbar .raised .button:active:hover {
+ box-shadow: inset 0 1px 1px alpha(black, 0.1);
+ /* background-color: mix(@borders, @theme_bg_color, 0.5); */
+ background-image: linear-gradient(to bottom,
+ @button_active_gradient_color_a,
+ @button_active_gradient_color_b 20%,
+ @button_active_gradient_color_c
+ );
+}
+
+/* Prelit button background */
+.button:hover,
+.toolbar .button:hover,
+.toolbar .button.raised:hover,
+.toolbar .raised .button:hover,
+.toolbar GtkComboBox .button:hover,
+.spinbutton.vertical .button:hover {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ @button_hover_gradient_color_a,
+ @button_hover_gradient_color_b
+ );
+}
+/* Insensitive button background */
+.button:insensitive,
+.spinbutton.vertical .button:insensitive,
+.toolbar GtkComboBox .button:insensitive,
+.toolbar .button.raised:insensitive,
+.toolbar .raised .button:insensitive {
+ background-image: none;
+ background-color: @insensitive_bg_color;
+}
+
+/* Pushed + Insensitive button background */
+.button:active:insensitive,
+.toolbar .button:active:insensitive,
+.toolbar GtkComboBox .button:active:insensitive {
+ background-image: linear-gradient(to bottom,
+ shade(@insensitive_bg_color, 0.95),
+ @insensitive_bg_color 40%,
+ @insensitive_bg_color
+ );
+ background-color: transparent;
+}
+
+/* Unfocused window button background */
+.button:backdrop,
+.toolbar .button.raised:backdrop,
+.toolbar .raised .button:backdrop,
+.toolbar .button:backdrop:hover,
+.toolbar GtkComboBox .button:backdrop,
+.toolbar GtkComboBox .button:backdrop:hover,
+.primary-toolbar .raised .button:backdrop:hover {
+ background-image: none;
+ background-color: @unfocused_button_background;
+}
+
+/* Unfocused window pushed button background */
+.button:active:backdrop,
+.toolbar .button:active:backdrop,
+.toolbar .button:active:hover:backdrop {
+ background-image: none;
+ background-color: @unfocused_borders;
+}
+
+/* Unfocused window insensitive button background */
+.button:insensitive:backdrop,
+.toolbar .button:insensitive:backdrop {
+ background-image: none;
+ background-color: @unfocused_insensitive_bg_color;
+}
+
+.button:insensitive:active:backdrop {
+ background-image: none;
+ background-color: mix(@unfocused_insensitive_bg_color, @unfocused_borders, 0.5);
+}
+
.button,
.button.menuitem.menubar,
GtkColorButton.button,
@@ -1354,6 +1519,28 @@ GtkComboBox.combobox-entry .button {
border-color: transparent;
}
+/* Primary and inline toolbars pushed button background */
+.primary-toolbar .button:active,
+.primary-toolbar .button:active:hover,
+.inline-toolbar .button:active,
+.inline-toolbar .button:active:hover {
+ background-image: linear-gradient(to bottom,
+ shade(@borders, 0.95),
+ shade(@theme_bg_color, 0.88)
+ );
+ background-color: transparent;
+}
+
+/* Prelit button on primary toolbar background */
+.primary-toolbar .button:hover {
+ background-color: transparent;
+ background-image: linear-gradient(to bottom,
+ alpha(@toolbar_button_prelight, 0),
+ @toolbar_button_prelight 54%,
+ alpha(@toolbar_button_prelight, 0)
+ );
+}
+
/* We may want a background for focused buttons, but in the meantime let's remove it too */
.primary-toolbar .button,
.primary-toolbar .button:insensitive,
@@ -2263,6 +2450,27 @@ GtkComboBox .button:hover {
color: @theme_text_color;
}
+GtkComboBox.combobox-entry .button,
+GtkComboBox.combobox-entry .button:hover,
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar GtkComboBox.combobox-entry .button:hover {
+ background-image: linear-gradient(to bottom,
+ @entry_background_a,
+ @entry_background_b
+ );
+}
+
+/* Entry pushed button background */
+.primary-toolbar GtkComboBox.combobox-entry .button:active,
+/* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
+GtkComboBox.combobox-entry .button:active {
+ background-image: linear-gradient(to bottom,
+ shade(@entry_background_a, 0.9),
+ @entry_background_b
+ );
+ background-color: transparent;
+}
+
/********************
* Various choosers *
********************/
@@ -3035,6 +3243,31 @@ GtkMessageDialog {
* Inline toolbars *
*******************/
+/* Inline toolbars background */
+.inline-toolbar.toolbar {
+ background-image: linear-gradient(to bottom,
+ @toolbar_gradient_a,
+ @toolbar_gradient_b 20%,
+ @toolbar_gradient_c
+ );
+ background-color: transparent;
+}
+
+.inline-toolbar.toolbar.vertical {
+ background-image: linear-gradient(to right,
+ @toolbar_gradient_a,
+ @toolbar_gradient_b 20%,
+ @toolbar_gradient_c
+ );
+ background-color: transparent;
+}
+
+/* Unfocused window inline toolbars background */
+.inline-toolbar.toolbar:backdrop {
+ background-image: none;
+ background-color: @unfocused_dark_bg;
+}
+
.inline-toolbar.toolbar {
border-width: 1px;
border-style: solid;
@@ -4131,6 +4364,28 @@ column-header .button.dnd {
border-image-slice: 0 1;
}
+column-header.button:active,
+column-header .button:active,
+column-header.button:active:hover,
+column-header .button:active:hover {
+ background-image: linear-gradient(to bottom,
+ shade(@entry_background_a, 0.9),
+ @entry_background_b
+ );
+ background-color: transparent;
+ box-shadow: inset 0 1px @entry_inset,
+ inset 0 2px alpha(@entry_inset, 0.4);
+}
+
+column-header.button:backdrop,
+column-header .button:backdrop,
+column-header.button:insensitive:backdrop,
+column-header .button:insensitive:backdrop {
+ background-image: none;
+ background-color: @theme_unfocused_base_color;
+ box-shadow: none;
+}
+
.expander {
color: @internal_element_color;
border-color: @internal_element_color;
diff --git a/themes/Adwaita/gtk-3.0/gtk.gresource.xml b/themes/Adwaita/gtk-3.0/gtk.gresource.xml
index 3b275cf..cdc69c6 100644
--- a/themes/Adwaita/gtk-3.0/gtk.gresource.xml
+++ b/themes/Adwaita/gtk-3.0/gtk.gresource.xml
@@ -384,7 +384,6 @@
<file>gnome-applications.css</file>
<file>gnome-applications-dark-overrides.css</file>
<file>gtk-widgets.css</file>
- <file>gtk-widgets-backgrounds.css</file>
<file>gtk-widgets-dark-overrides.css</file>
<file>gtk-widgets-assets.css</file>
<file>gtk-widgets-assets-dark.css</file>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]