[gnome-themes-standard] gtk3: add selectors for the new slider assets
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] gtk3: add selectors for the new slider assets
- Date: Tue, 25 Sep 2012 16:54:01 +0000 (UTC)
commit 20c9b985e00a62162edba91015cbf2156bcd28e8
Author: Cosimo Cecchi <cosimoc gnome org>
Date: Tue Sep 25 12:52:04 2012 -0400
gtk3: add selectors for the new slider assets
themes/Adwaita/gtk-3.0/assets/Makefile.am | 40 +++++++++++-----
themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css | 49 +++++++++++++++-----
themes/Adwaita/gtk-3.0/gtk-widgets-assets.css | 48 ++++++++++++++-----
themes/Adwaita/gtk-3.0/gtk.gresource.xml | 16 ++++++
4 files changed, 117 insertions(+), 36 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/assets/Makefile.am b/themes/Adwaita/gtk-3.0/assets/Makefile.am
index b75f76d..9ba79aa 100644
--- a/themes/Adwaita/gtk-3.0/assets/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/assets/Makefile.am
@@ -87,13 +87,17 @@ EXTRA_DIST = \
radio-unchecked-insensitive-dark.png \
resize-grip.svg \
scale-slider-down.png \
+ scale-slider-down-active.png \
+ scale-slider-down-hover.png \
+ scale-slider-down-insensitive.png \
scale-slider-down-backdrop.png \
- scale-slider-down-backdrop-dark.png \
scale-slider-down-backdrop-insensitive.png \
- scale-slider-down-backdrop-insensitive-dark.png \
scale-slider-down-dark.png \
- scale-slider-down-insensitive.png \
+ scale-slider-down-active-dark.png \
+ scale-slider-down-hover-dark.png \
scale-slider-down-insensitive-dark.png \
+ scale-slider-down-backdrop-dark.png \
+ scale-slider-down-backdrop-insensitive-dark.png \
scale-slider-horz.png \
scale-slider-horz-hover.png \
scale-slider-horz-active.png \
@@ -107,29 +111,41 @@ EXTRA_DIST = \
scale-slider-horz-insensitive.png \
scale-slider-horz-insensitive-dark.png \
scale-slider-left.png \
+ scale-slider-left-active.png \
+ scale-slider-left-hover.png \
+ scale-slider-left-insensitive.png \
scale-slider-left-backdrop.png \
- scale-slider-left-backdrop-dark.png \
scale-slider-left-backdrop-insensitive.png \
- scale-slider-left-backdrop-insensitive-dark.png \
scale-slider-left-dark.png \
- scale-slider-left-insensitive.png \
+ scale-slider-left-active-dark.png \
+ scale-slider-left-hover-dark.png \
+ scale-slider-left-backdrop-dark.png \
+ scale-slider-left-backdrop-insensitive-dark.png \
scale-slider-left-insensitive-dark.png \
scale-slider-right.png \
+ scale-slider-right-active.png \
+ scale-slider-right-hover.png \
+ scale-slider-right-insensitive.png \
scale-slider-right-backdrop.png \
- scale-slider-right-backdrop-dark.png \
scale-slider-right-backdrop-insensitive.png \
- scale-slider-right-backdrop-insensitive-dark.png \
scale-slider-right-dark.png \
- scale-slider-right-insensitive.png \
+ scale-slider-right-active-dark.png \
+ scale-slider-right-hover-dark.png \
scale-slider-right-insensitive-dark.png \
+ scale-slider-right-backdrop-dark.png \
+ scale-slider-right-backdrop-insensitive-dark.png \
scale-slider-up.png \
+ scale-slider-up-active.png \
+ scale-slider-up-hover.png \
+ scale-slider-up-insensitive.png \
scale-slider-up-backdrop.png \
- scale-slider-up-backdrop-dark.png \
scale-slider-up-backdrop-insensitive.png \
- scale-slider-up-backdrop-insensitive-dark.png \
scale-slider-up-dark.png \
- scale-slider-up-insensitive.png \
+ scale-slider-up-active-dark.png \
+ scale-slider-up-hover-dark.png \
scale-slider-up-insensitive-dark.png \
+ scale-slider-up-backdrop-dark.png \
+ scale-slider-up-backdrop-insensitive-dark.png \
scale-slider-vert.png \
scale-slider-vert-hover.png \
scale-slider-vert-active.png \
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
index 8f66f8a..1e76527 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
@@ -283,11 +283,17 @@
background-image: url("assets/scale-slider-vert-backdrop-insensitive-dark.png");
}
-.scale.scale-has-marks-above.slider.horizontal,
-.scale.scale-has-marks-above.slider.horizontal:hover,
+.scale.scale-has-marks-above.slider.horizontal {
+ background-image: url("assets/scale-slider-up-dark.png");
+}
+
+.scale.scale-has-marks-above.slider.horizontal:hover {
+ background-image: url("assets/scale-slider-up-hover-dark.png");
+}
+
.scale.scale-has-marks-above.slider.horizontal:active,
.scale.scale-has-marks-above.slider.horizontal:active:hover {
- background-image: url("assets/scale-slider-up-dark.png");
+ background-image: url("assets/scale-slider-up-active-dark.png");
}
.scale.scale-has-marks-above.slider.horizontal:insensitive,
@@ -305,11 +311,17 @@
background-image: url("assets/scale-slider-up-backdrop-insensitive-dark.png");
}
-.scale.scale-has-marks-above.slider.vertical,
-.scale.scale-has-marks-above.slider.vertical:hover,
+.scale.scale-has-marks-above.slider.vertical {
+ background-image: url("assets/scale-slider-left-dark.png");
+}
+
+.scale.scale-has-marks-above.slider.vertical:hover {
+ background-image: url("assets/scale-slider-left-hover-dark.png");
+}
+
.scale.scale-has-marks-above.slider.vertical:active,
.scale.scale-has-marks-above.slider.vertical:active:hover {
- background-image: url("assets/scale-slider-left-dark.png");
+ background-image: url("assets/scale-slider-left-active-dark.png");
}
.scale.scale-has-marks-above.slider.vertical:insensitive,
@@ -327,11 +339,17 @@
background-image: url("assets/scale-slider-left-backdrop-insensitive-dark.png");
}
-.scale.scale-has-marks-below.slider.horizontal,
-.scale.scale-has-marks-below.slider.horizontal:hover,
+.scale.scale-has-marks-below.slider.horizontal {
+ background-image: url("assets/scale-slider-down-dark.png");
+}
+
+.scale.scale-has-marks-below.slider.horizontal:hover {
+ background-image: url("assets/scale-slider-down-hover-dark.png");
+}
+
.scale.scale-has-marks-below.slider.horizontal:active,
.scale.scale-has-marks-below.slider.horizontal:active:hover {
- background-image: url("assets/scale-slider-down-dark.png");
+ background-image: url("assets/scale-slider-down-active-dark.png");
}
.scale.scale-has-marks-below.slider.horizontal:insensitive,
@@ -349,11 +367,17 @@
background-image: url("assets/scale-slider-down-backdrop-insensitive-dark.png");
}
-.scale.scale-has-marks-below.slider.vertical,
-.scale.scale-has-marks-below.slider.vertical:hover,
+.scale.scale-has-marks-below.slider.vertical {
+ background-image: url("assets/scale-slider-right-dark.png");
+}
+
+.scale.scale-has-marks-below.slider.vertical:hover {
+ background-image: url("assets/scale-slider-right-hover-dark.png");
+}
+
.scale.scale-has-marks-below.slider.vertical:active,
.scale.scale-has-marks-below.slider.vertical:active:hover {
- background-image: url("assets/scale-slider-right-dark.png");
+ background-image: url("assets/scale-slider-right-active-dark.png");
}
.scale.scale-has-marks-below.slider.vertical:insensitive,
@@ -370,6 +394,7 @@
.scale.scale-has-marks-below.slider.vertical:backdrop:insensitive:hover {
background-image: url("assets/scale-slider-right-backdrop-insensitive-dark.png");
}
+
/********************************
* Touch text selection handles *
********************************/
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
index 1589e43..e31efe7 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
@@ -283,11 +283,17 @@
background-image: url("assets/scale-slider-vert-backdrop-insensitive.png");
}
-.scale.scale-has-marks-above.slider.horizontal,
-.scale.scale-has-marks-above.slider.horizontal:hover,
+.scale.scale-has-marks-above.slider.horizontal {
+ background-image: url("assets/scale-slider-up.png");
+}
+
+.scale.scale-has-marks-above.slider.horizontal:hover {
+ background-image: url("assets/scale-slider-up-hover.png");
+}
+
.scale.scale-has-marks-above.slider.horizontal:active,
.scale.scale-has-marks-above.slider.horizontal:active:hover {
- background-image: url("assets/scale-slider-up.png");
+ background-image: url("assets/scale-slider-up-active.png");
}
.scale.scale-has-marks-above.slider.horizontal:insensitive,
@@ -305,11 +311,17 @@
background-image: url("assets/scale-slider-up-backdrop-insensitive.png");
}
-.scale.scale-has-marks-above.slider.vertical,
-.scale.scale-has-marks-above.slider.vertical:hover,
+.scale.scale-has-marks-above.slider.vertical {
+ background-image: url("assets/scale-slider-left.png");
+}
+
+.scale.scale-has-marks-above.slider.vertical:hover {
+ background-image: url("assets/scale-slider-left-hover.png");
+}
+
.scale.scale-has-marks-above.slider.vertical:active,
.scale.scale-has-marks-above.slider.vertical:active:hover {
- background-image: url("assets/scale-slider-left.png");
+ background-image: url("assets/scale-slider-left-active.png");
}
.scale.scale-has-marks-above.slider.vertical:insensitive,
@@ -327,11 +339,17 @@
background-image: url("assets/scale-slider-left-backdrop-insensitive.png");
}
-.scale.scale-has-marks-below.slider.horizontal,
-.scale.scale-has-marks-below.slider.horizontal:hover,
+.scale.scale-has-marks-below.slider.horizontal {
+ background-image: url("assets/scale-slider-down.png");
+}
+
+.scale.scale-has-marks-below.slider.horizontal:hover {
+ background-image: url("assets/scale-slider-down-hover.png");
+}
+
.scale.scale-has-marks-below.slider.horizontal:active,
.scale.scale-has-marks-below.slider.horizontal:active:hover {
- background-image: url("assets/scale-slider-down.png");
+ background-image: url("assets/scale-slider-down-active.png");
}
.scale.scale-has-marks-below.slider.horizontal:insensitive,
@@ -349,11 +367,17 @@
background-image: url("assets/scale-slider-down-backdrop-insensitive.png");
}
-.scale.scale-has-marks-below.slider.vertical,
-.scale.scale-has-marks-below.slider.vertical:hover,
+.scale.scale-has-marks-below.slider.vertical {
+ background-image: url("assets/scale-slider-right.png");
+}
+
+.scale.scale-has-marks-below.slider.vertical:hover {
+ background-image: url("assets/scale-slider-right-hover.png");
+}
+
.scale.scale-has-marks-below.slider.vertical:active,
.scale.scale-has-marks-below.slider.vertical:active:hover {
- background-image: url("assets/scale-slider-right.png");
+ background-image: url("assets/scale-slider-right-active.png");
}
.scale.scale-has-marks-below.slider.vertical:insensitive,
diff --git a/themes/Adwaita/gtk-3.0/gtk.gresource.xml b/themes/Adwaita/gtk-3.0/gtk.gresource.xml
index 6bffa31..93e7b5b 100644
--- a/themes/Adwaita/gtk-3.0/gtk.gresource.xml
+++ b/themes/Adwaita/gtk-3.0/gtk.gresource.xml
@@ -101,34 +101,50 @@
<file preprocess="to-pixdata">assets/scale-slider-horz-backdrop-insensitive.png</file>
<file preprocess="to-pixdata">assets/scale-slider-horz-backdrop-insensitive-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-up.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-up-active.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-up-hover.png</file>
<file preprocess="to-pixdata">assets/scale-slider-up-insensitive.png</file>
<file preprocess="to-pixdata">assets/scale-slider-up-backdrop.png</file>
<file preprocess="to-pixdata">assets/scale-slider-up-backdrop-insensitive.png</file>
<file preprocess="to-pixdata">assets/scale-slider-right.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-right-active.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-right-hover.png</file>
<file preprocess="to-pixdata">assets/scale-slider-right-insensitive.png</file>
<file preprocess="to-pixdata">assets/scale-slider-right-backdrop.png</file>
<file preprocess="to-pixdata">assets/scale-slider-right-backdrop-insensitive.png</file>
<file preprocess="to-pixdata">assets/scale-slider-down.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-down-active.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-down-hover.png</file>
<file preprocess="to-pixdata">assets/scale-slider-down-insensitive.png</file>
<file preprocess="to-pixdata">assets/scale-slider-down-backdrop.png</file>
<file preprocess="to-pixdata">assets/scale-slider-down-backdrop-insensitive.png</file>
<file preprocess="to-pixdata">assets/scale-slider-left.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-left-active.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-left-hover.png</file>
<file preprocess="to-pixdata">assets/scale-slider-left-insensitive.png</file>
<file preprocess="to-pixdata">assets/scale-slider-left-backdrop.png</file>
<file preprocess="to-pixdata">assets/scale-slider-left-backdrop-insensitive.png</file>
<file preprocess="to-pixdata">assets/scale-slider-up-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-up-active-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-up-hover-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-up-insensitive-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-up-backdrop-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-up-backdrop-insensitive-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-right-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-right-active-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-right-hover-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-right-insensitive-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-right-backdrop-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-right-backdrop-insensitive-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-down-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-down-active-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-down-hover-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-down-insensitive-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-down-backdrop-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-down-backdrop-insensitive-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-left-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-left-active-dark.png</file>
+ <file preprocess="to-pixdata">assets/scale-slider-left-hover-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-left-insensitive-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-left-backdrop-dark.png</file>
<file preprocess="to-pixdata">assets/scale-slider-left-backdrop-insensitive-dark.png</file>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]