[Xfce4-commits] <gtk-xfce-engine:master> Converting more gradient themes to Gtk 3

Peter de Ridder noreply at xfce.org
Sat Dec 17 17:16:08 CET 2011


Updating branch refs/heads/master
         to d21ebb88432202809961605797a5fcdc02da0e22 (commit)
       from 381e98fcc9ad07b1b5e15d85131581f74dad5e41 (commit)

commit d21ebb88432202809961605797a5fcdc02da0e22
Author: Peter de Ridder <peter at xfce.org>
Date:   Fri Nov 18 23:57:52 2011 +0100

    Converting more gradient themes to Gtk 3
    
    Xfce-orange, Xfce-redmondxp

 configure.in.in                              |    2 +
 themes/orange/Makefile.am                    |    3 +-
 themes/{dawn => orange}/gtk-3.0/Makefile.am  |    2 +-
 themes/{cadmium => orange}/gtk-3.0/gtk.css   |  220 +++++++++++++++++-------
 themes/redmondxp/Makefile.am                 |    3 +-
 themes/redmondxp/gtk-3.0/Makefile.am         |    5 +
 themes/{winter => redmondxp}/gtk-3.0/gtk.css |  233 ++++++++++++++++----------
 7 files changed, 314 insertions(+), 154 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 60718f4..ac53117 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -135,8 +135,10 @@ themes/light/Makefile
 themes/light/gtk-2.0/Makefile
 themes/light/gtk-3.0/Makefile
 themes/orange/gtk-2.0/Makefile
+themes/orange/gtk-3.0/Makefile
 themes/orange/Makefile
 themes/redmondxp/gtk-2.0/Makefile
+themes/redmondxp/gtk-3.0/Makefile
 themes/redmondxp/Makefile
 themes/saltlake/gtk-2.0/Makefile
 themes/saltlake/gtk-3.0/Makefile
diff --git a/themes/orange/Makefile.am b/themes/orange/Makefile.am
index 6f702b7..3263c58 100644
--- a/themes/orange/Makefile.am
+++ b/themes/orange/Makefile.am
@@ -1,3 +1,4 @@
-SUBDIRS = gtk-2.0
+SUBDIRS = $(GTK_SUBDIRS)
+DIST_SUBDIRS = gtk-2.0 gtk-3.0
 themedir = $(datadir)/themes/Xfce-orange
 
diff --git a/themes/dawn/gtk-3.0/Makefile.am b/themes/orange/gtk-3.0/Makefile.am
similarity index 50%
copy from themes/dawn/gtk-3.0/Makefile.am
copy to themes/orange/gtk-3.0/Makefile.am
index 0c75afe..7b537be 100644
--- a/themes/dawn/gtk-3.0/Makefile.am
+++ b/themes/orange/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-dawn/gtk-3.0
+themedir = $(datadir)/themes/Xfce-orange/gtk-3.0
 theme_DATA = gtk.css
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/orange/gtk-3.0/gtk.css
similarity index 50%
copy from themes/cadmium/gtk-3.0/gtk.css
copy to themes/orange/gtk-3.0/gtk.css
index 9723d08..84cd4ad 100644
--- a/themes/cadmium/gtk-3.0/gtk.css
+++ b/themes/orange/gtk-3.0/gtk.css
@@ -1,21 +1,21 @@
 
 @define-color fg_active #000000;
- at define-color fg_insensitive #8e8e8a;
+ at define-color fg_insensitive #858481;
 @define-color fg_normal #000000;
 @define-color fg_prelight #000000;
 @define-color fg_selected #000000;
 
- at define-color bg_active #cececa;
- at define-color bg_insensitive #eeeeef;
- at define-color bg_normal #eeeeef;
- at define-color bg_prelight #ddddea;
- at define-color bg_selected #ddddea;
+ at define-color bg_active #fff9e1;
+ at define-color bg_insensitive #f4f2ed;
+ at define-color bg_normal #f4f2ed;
+ at define-color bg_prelight #fff9e1;
+ at define-color bg_selected #e0dcd7;
 
- at define-color base_active #cececa;
- at define-color base_insensitive #eeeeef;
+ at define-color base_active #e0dcd7;
+ at define-color base_insensitive #f4f2ed;
 @define-color base_normal #ffffff;
- at define-color base_prelight #d8dbe0;
- at define-color base_selected #ddddea;
+ at define-color base_prelight #fff9e1;
+ at define-color base_selected #ffe371;
 
 @define-color text_active #000000;
 @define-color text_insensitive #000000;
@@ -34,21 +34,21 @@
     -GtkButton-child-displacement-x  : 0;
     -GtkButton-child-displacement-y  : 1;
     -GtkButton-default-spacing       : 5;
-    -GtkWidget-focus-line-width      : 1;
-    -GtkWidget-focus-padding         : 2;
+    -GtkWidget-focus-padding         : 1;
     -GtkCheckButton-indicator-size   : 12;
-    -GtkMenuBar-internal-padding     : 0;
-    -GtkMenuBar-shadow-type          : out;
+    -GtkMenuItem-selected-shadow-type: none;
     /*GtkPaned::handle_full_size     : 1*/
     -GtkPaned-handle-size            : 7;
-    -GtkRange-slider-width           : 12;
-    -GtkRange-stepper-size           : 12;
+    -GtkRange-slider-width           : 15;
+    -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
+    -GtkScrollbar-has-backward-stepper: 1;
     -GtkScrollbar-min-slider-length  : 20;
-    -GtkToolBar-shadow-type          : out;
+    -GtkWidget-focus-line-width      : 1;
+    -GtkWidget-focus-padding         : 4;
     -GtkWidget-interior-focus        : 5;
-    -GtkWidget-internal-padding      : 2;
+    -GtkWidget-internal-padding      : 4;
 
     border-width: 2 2;
 
@@ -136,7 +136,7 @@ GtkCalendar {
     color: @text_normal;
 }
 
-.button, .header {
+.header {
     color: @fg_normal;
 }
 
@@ -170,12 +170,20 @@ GtkCalendar:selected {
     background-color: @base_active;
 }
 
-.check, .radio {
+.check {
     color: @text_normal;
     background-color: @base_normal;
     border-color: @fg_normal;
 }
 
+.radio {
+    color: @text_normal;
+    background-color: @base_normal;
+    border-color: @fg_normal;
+
+    -GtkCheckButton-indicator-size: 14;
+}
+
 .check:active, .radio:active {
     color: @text_normal;
     background-color: @base_normal;
@@ -246,94 +254,180 @@ GtkCalendar:selected {
 }
 
 .progressbar {
-    background-color: @bg_prelight;
-    border-color: darker(@bg_prelight);
+    background-color: #ffe371;
+    border-color: darker(#ffe371);
+
+    border-width: 0 0;
 }
 
 .trough {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 2.0)));
-    border-color: darker(@bg_active);
+    background-color: #f4f2ed;
+    border-color: darker(#f4f2ed);
 }
 
-.trough.vertical {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 2.0)));
-    border-color: darker(@bg_active);
+.scale.trough, .scrollbar.trough {
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(#e0dcd7, 0.95)), to(shade(#e0dcd7, 1.05)));
+    border-color: darker(#e0dcd7);
+}
+
+.trough.horizontal {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#e0dcd7, 0.95)), to(shade(#e0dcd7, 1.05)));
+    border-color: darker(#e0dcd7);
+}
+
+.notebook {
+    background-color: #f8f7f5;
+    border-color: darker(#f8f7f5);
 }
 
 .notebook tab {
     color: @fg_active;
-    background-color: @bg_active;
-    border-color: darker(@bg_active);
+    background-color: #e0dcd7;
+    border-color: darker(#e0dcd7);
 }
 
 .notebook tab:active {
     color: @fg_normal;
-    background-color: @bg_normal;
-    border-color: darker(@bg_normal);
+    background-color: #f8f7f5;
+    border-color: darker(#f8f7f5);
+}
+
+.menu {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#f8f7f5, 1.05)), to(shade(#f8f7f5, 0.95)));
+    border-color: darker(#f8f7f5);
+}
+
+.menuitem {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#f8f7f5, 1.05)), to(shade(#f8f7f5, 0.95)));
+    border-color: darker(#f8f7f5);
+
+    border-width: 1 2;
+}
+
+.menuitem:active, .menu:active {
+    color: #000000;
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffe371, 0.95)), to(shade(#ffe371, 1.05)));
+    border-color: darker(#ffe371);
+}
+
+.menuitem:insensitive, .menu:insensitive {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#f8f7f5, 1.05)), to(shade(#f8f7f5, 0.95)));
+    border-color: darker(#f8f7f5);
 }
 
-.dock, .menubar, .toolbar {
+.menuitem:hover, .menu:hover {
+    color: #000000;
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffe371, 1.05)), to(shade(#ffe371, 0.95)));
+    border-color: darker(#ffe371);
+}
+
+.menuitem:selected, .menu:selected {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffe371, 0.95)), to(shade(#ffe371, 1.05)));
+    border-color: darker(#ffe371);
+}
+
+.menubar, .toolbar {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.05)), to(shade(@bg_normal, 0.95)));
 }
 
-.dock:active, .menubar:active, .toolbar:active {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 1.05)), to(shade(@bg_active, 0.95)));
+.menubar:active, .toolbar:active {
+    color: #000000;
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffe371, 0.95)), to(shade(#ffe371, 1.05)));
+    border-color: darker(#ffe371);
 }
 
-.dock:insensitive, .menubar:insensitive, .toolbar:insensitive {
+.menubar:insensitive, .toolbar:insensitive {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.05)), to(shade(@bg_insensitive, 0.95)));
 }
 
-.dock:hover, .menubar:hover, .toolbar:hover {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 1.05)), to(shade(@bg_prelight, 0.95)));
+.menubar:hover, .toolbar:hover {
+    color: #000000;
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#fff0b3, 1.05)), to(shade(#fff0b3, 0.95)));
+    border-color: darker(#fff0b3);
 }
 
-.dock:selected, .menubar:selected, .toolbar:selected {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.05)), to(shade(@bg_selected, 0.95)));
+.menubar:selected, .toolbar:selected {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffe371, 0.95)), to(shade(#ffe371, 1.05)));
+    border-color: darker(#ffe371);
 }
 
-.button, .slider.horizontal, .progressbar {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cdcdda, 2.0)), to(shade(#cdcdda, 1.0)));
-    border-color: darker(#cdcdda);
+.button {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ebe6e1, 1.05)), to(shade(#ebe6e1, 0.95)));
+    border-color: darker(#ebe6e1);
+}                                                         
+                                                          
+.button:active {                                          
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffe371, 0.95)), to(shade(#ffe371, 1.05)));
+    border-color: darker(#ffe371);
+}                                                         
+                                                          
+.button:insensitive {                                     
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.05)), to(shade(@bg_insensitive, 0.95)));
+    border-color: darker(@bg_insensitive);
+}                                                         
+                                                          
+.button:hover {                                           
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#fff0b3, 1.05)), to(shade(#fff0b3, 0.95)));
+    border-color: darker(#fff0b3);
 }
 
-.button:active, .slider.horizontal:active, .progressbar:active {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 2.0)));
+.button:selected {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.95)), to(shade(@bg_selected, 1.05)));
+    border-color: darker(@bg_selected);
 }
 
-.button:insensitive, .slider.horizontal:insensitive, .progressbar:insensitive {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 2.0)), to(shade(@bg_insensitive, 1.0)));
+.slider.horizontal {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#f4f2ed, 1.05)), to(shade(#f4f2ed, 0.95)));
+    border-color: darker(#f4f2ed);
 }
 
-.button:hover, .slider.horizontal:hover, .progressbar:hover {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 2.0)), to(shade(@bg_prelight, 1.0)));
+.slider.horizontal:active {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#e0dcd7, 0.95)), to(shade(#e0dcd7, 1.05)));
+    border-color: darker(#e0dcd7);
 }
 
-.button:selected, .slider.horizontal:selected, .progressbar:selected {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.0)), to(shade(@bg_selected, 2.0)));
+.slider.horizontal:insensitive {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.05)), to(shade(@bg_insensitive, 0.95)));
+    border-color: darker(@bg_insensitive);
 }
 
-.menuitem {
-    border-width: 1 2;
+.slider.horizontal:hover {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#fff0b3, 1.05)), to(shade(#fff0b3, 0.95)));
+    border-color: darker(#fff0b3);
+}
+
+.slider.horizontal:selected {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.95)), to(shade(@bg_selected, 1.05)));
+    border-color: darker(@bg_selected);
+}
+
+.slider.vertical {
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(#f4f2ed, 1.05)), to(shade(#f4f2ed, 0.95)));
+    border-color: darker(#f4f2ed);
 }
 
-.slider.vertical, .progressbar.vertical {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(#cdcdda, 2.0)), to(shade(#cdcdda, 1.0)));
-    border-color: darker(#cdcdda);
+.slider.vertical:active {
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(#e0dcd7, 0.95)), to(shade(#e0dcd7, 1.05)));
+    border-color: darker(#e0dcd7);
 }
 
-.slider.vertical:active, .progressbar.vertical:active {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 2.0)));
+.slider.vertical:insensitive {
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_insensitive, 1.05)), to(shade(@bg_insensitive, 0.95)));
+    border-color: darker(@bg_insensitive);
 }
 
-.slider.vertical:insensitive, .progressbar.vertical:insensitive {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_insensitive, 2.0)), to(shade(@bg_insensitive, 1.0)));
+.slider.vertical:hover {
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(#fff0b3, 1.05)), to(shade(#fff0b3, 0.95)));
+    border-color: darker(#fff0b3);
 }
 
-.slider.vertical:hover, .progressbar.vertical:hover {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_prelight, 2.0)), to(shade(@bg_prelight, 1.0)));
+.slider.vertical:selected {
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 0.95)), to(shade(@bg_selected, 1.05)));
+    border-color: darker(@bg_selected);
 }
 
-.slider.vertical:selected, .progressbar.vertical:selected {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 1.0)), to(shade(@bg_selected, 2.0)));
+.tooltip {
+    color: #000000;
+    background-color: #ffffdf;
+    border-color: darker(#ffffdf);
 }
diff --git a/themes/redmondxp/Makefile.am b/themes/redmondxp/Makefile.am
index e833304..f0af13d 100644
--- a/themes/redmondxp/Makefile.am
+++ b/themes/redmondxp/Makefile.am
@@ -1,3 +1,4 @@
-SUBDIRS = gtk-2.0
+SUBDIRS = $(GTK_SUBDIRS)
+DIST_SUBDIRS = gtk-2.0 gtk-3.0
 themedir = $(datadir)/themes/Xfce-redmondxp
 
diff --git a/themes/redmondxp/gtk-3.0/Makefile.am b/themes/redmondxp/gtk-3.0/Makefile.am
new file mode 100644
index 0000000..f677f5d
--- /dev/null
+++ b/themes/redmondxp/gtk-3.0/Makefile.am
@@ -0,0 +1,5 @@
+themedir = $(datadir)/themes/Xfce-redmondxp/gtk-3.0
+theme_DATA = gtk.css
+
+EXTRA_DIST = $(theme_DATA)
+
diff --git a/themes/winter/gtk-3.0/gtk.css b/themes/redmondxp/gtk-3.0/gtk.css
similarity index 56%
copy from themes/winter/gtk-3.0/gtk.css
copy to themes/redmondxp/gtk-3.0/gtk.css
index 74763ff..5892444 100644
--- a/themes/winter/gtk-3.0/gtk.css
+++ b/themes/redmondxp/gtk-3.0/gtk.css
@@ -1,33 +1,32 @@
 
 @define-color fg_active #000000;
- at define-color fg_insensitive #808080;
+ at define-color fg_insensitive #7f7f79;
 @define-color fg_normal #000000;
 @define-color fg_prelight #000000;
- at define-color fg_selected #224466;
+ at define-color fg_selected #ffffff;
 
- at define-color bg_active #d8d8d6;
- at define-color bg_insensitive #e8e8e6;
- at define-color bg_normal #e8e8e6;
- at define-color bg_prelight #e8e8e6;
- at define-color bg_selected #a5abba;
+ at define-color bg_active #d4d4ce;
+ at define-color bg_insensitive #efebdf;
+ at define-color bg_normal #efebdf;
+ at define-color bg_prelight #efebdf;
+ at define-color bg_selected #0055ef;
 
- at define-color base_active #d8d8d6;
- at define-color base_insensitive #e8e8e6;
- at define-color base_normal #f0f0f0;
- at define-color base_prelight #a5abba;
- at define-color base_selected #b3c8dd;
+ at define-color base_active #e5e5e5;
+ at define-color base_insensitive #efebdf;
+ at define-color base_normal #ffffff;
+ at define-color base_prelight #efebdf;
+ at define-color base_selected #0055ef;
 
 @define-color text_active #000000;
 @define-color text_insensitive #000000;
 @define-color text_normal #000000;
 @define-color text_prelight #000000;
- at define-color text_selected #224466;
+ at define-color text_selected #ffffff;
 
 * {
     engine: xfce;
 
     -xfce-smooth-edge: true;
-    -xfce-grip-style: slide;
 
     -GtkButton-default-border        : 0;
     -GtkButton-default-outside-border: 0;
@@ -36,19 +35,16 @@
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 14;
     -GtkMenuBar-shadow-type          : out;
-    -GtkMenuItem-selected-shadow-type: out;
+    -GtkMenuItem-selected-shadow-type: none;
     /*GtkPaned::handle_full_size     : 1*/
-    -GtkPaned-handle-size            : 8;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
     -GtkRange-trough-border          : 0;
     -GtkScrollbar-min-slider-length  : 20;
-    -GtkToolbar-shadow-type          : none;
-    -GtkWidget-focus-line-width      : 1;
-    -GtkWidget-focus-padding         : 2;
-    -GtkWidget-interior-focus        : 5;
-    -GtkWidget-internal-padding      : 0;
+    -GtkToolbar-shadow-type          : out;
+    -GtkWidget-interior-focus        : 1;
+    -GtkWidget-internal-padding      : 4;
 
     border-width: 2 2;
 
@@ -86,12 +82,14 @@
     color: @text_normal;
     background-color: @base_normal;
     border-color: darker(@bg_normal);
+
+    border-width: 1 1;
 }
 
 .view:active, .entry:active {
-    color: #224466;
+    color: @text_active;
     background-color: @base_active;
-    border-color: darker(#A4B8CB);
+    border-color: darker(@bg_normal);
 }
 
 .view:insensitive, .entry:insensitive {
@@ -101,9 +99,9 @@
 }
 
 .view:hover, .entry:hover {
-    color: #224466;
+    color: @text_prelight;
     background-color: @base_prelight;
-    border-color: darker(#B3C8DD);
+    border-color: darker(@bg_normal);
 }
 
 .view:selected, .entry:selected {
@@ -246,133 +244,192 @@ GtkCalendar:selected {
 }
 
 .progressbar {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 0.8)), to(shade(@bg_prelight, 1.8)));
-    border-color: darker(@bg_prelight);
-
-    border-width: 1 1;
-}
-
-.progressbar.vertical {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_prelight, 0.8)), to(shade(@bg_prelight, 1.8)));
-    border-color: darker(@bg_prelight);
+    color: #ffffff;
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#0055ef, 0.9)), to(shade(#0055ef, 1.1)));
+    border-color: darker(#0055ef);
 
     border-width: 1 1;
 }
 
 .trough {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.9)), to(shade(@bg_normal, 1.1)));
 }
 
-.trough.vertical {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
+.scale.trough, .scrollbar.trough {
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 0.9)), to(shade(@bg_active, 1.1)));
+    border-color: darker(@bg_active);
 }
 
-.scrollbar.trough {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.8)), to(shade(@bg_active, 1.8)));
+.trough.horizontal {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.9)), to(shade(@bg_active, 1.1)));
     border-color: darker(@bg_active);
 }
 
-.scrollbar.vertical {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 0.8)), to(shade(@bg_active, 1.8)));
+.notebook {
+    background-color: #fafaf2;
+    border-color: darker(#fafaf2);
+
+    border-width: 1 1;
 }
 
 .notebook tab {
     color: @fg_active;
-    background-color: @bg_active;
-    border-color: darker(@bg_active);
+    background-color: #d4d4ce;
+    border-color: darker(#d4d4ce);
 }
 
 .notebook tab:active {
     color: @fg_normal;
-    background-color: @bg_normal;
-    border-color: darker(@bg_normal);
+    background-color: #fafaf2;
+    border-color: darker(#fafaf2);
+}
+
+.menu {
+    background-color: #ffffff;
+    border-color: darker(#ffffff);
+
+    border-width: 1 1;
+}
+
+.menu:active {
+    color: #ffffff;
+    background-color: #0055ef;
+    border-color: darker(#0055ef);
 }
 
-.dock, .menubar, .toolbar {
-    border-width: 1 2;
+.menu:insensitive {
+    background-color: #ffffff;
+    border-color: darker(#ffffff);
 }
 
-.dock:active, .menubar:active, .toolbar:active {
-    color: #224466;
-    background-color: #A4B8CB;
-    border-color: darker(#A4B8CB);
+.menu:hover {
+    color: #ffffff;
+    background-color: #0055ef;
+    border-color: darker(#0055ef);
 }
 
-.dock:hover, .menubar:hover, .toolbar:hover {
-    color: #224466;
-    background-color: #B3C8DD;
-    border-color: darker(#B3C8DD);
+.menu:selected {
+    background-color: @bg_selected;
+    border-color: darker(@bg_selected);
 }
 
-.menuitem {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
+.menubar {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.9)), to(shade(@bg_normal, 1.1)));
 
     border-width: 2 2;
 }
 
-.button {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
+.menubar:active {
+    color: #ffffff;
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#0055ef, 1.1)), to(shade(#0055ef, 0.9)));
+    border-color: darker(#0055ef);
+}
 
-    border-width: 3 3;
+.menubar:insensitive {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.9)), to(shade(@bg_insensitive, 1.1)));
 }
 
-.button:active, .menuitem:active {
-    color: #224466;
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#A4B8CB, 0.8)), to(shade(#A4B8CB, 1.8)));
-    border-color: darker(#A4B8CB);
+.menubar:hover {
+    color: #ffffff;
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#0055ef, 0.9)), to(shade(#0055ef, 1.1)));
+    border-color: darker(#0055ef);
 }
 
-.button:insensitive, .menuitem:insensitive {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.8)), to(shade(@bg_insensitive, 1.8)));
+.menubar:selected {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.1)), to(shade(@bg_selected, 0.9)));
 }
 
-.button:hover, .menuitem:hover {
-    color: #224466;
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#B3C8DD, 0.8)), to(shade(#B3C8DD, 1.8)));
-    border-color: darker(#B3C8DD);
+.button {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#fafaf2, 1.1)), to(shade(#fafaf2, 0.9)));
+    border-color: darker(#fafaf2);
 }
 
-.button:selected, .menuitem:selected {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.8)), to(shade(@bg_selected, 1.8)));
+.button:active {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffcb39, 0.9)), to(shade(#ffcb39, 1.1)));
+    border-color: darker(#ffcb39);
 }
 
-.slider {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
+.button:insensitive {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#fafaf2, 1.1)), to(shade(#fafaf2, 0.9)));
+    border-color: darker(#fafaf2);
 }
 
-.slider:active {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 1.8)), to(shade(@bg_active, 0.8)));
+.button:hover {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#fafaf2, 1.1)), to(shade(#fafaf2, 0.9)));
+    border-color: darker(#fafaf2);
 }
 
-.slider:insensitive {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.8)), to(shade(@bg_insensitive, 1.8)));
+.button:selected {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.1)));
 }
 
-.slider:hover {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 0.8)), to(shade(@bg_prelight, 1.8)));
+.button.horizontal, .scrollbar.slider.horizontal {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#c6d3ff, 1.1)), to(shade(#c6d3ff, 0.9)));
+    border-color: darker(#c6d3ff);
 }
 
-.slider:selected {
-    background-color: @base_selected;
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.8)), to(shade(@bg_selected, 0.8)));
+.button.horizontal:active, .scrollbar.slider.horizontal:active {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.9)), to(shade(@bg_active, 1.1)));
+    border-color: darker(@bg_active);
+}
+
+.button.horizontal:insensitive, .scrollbar.slider.horizontal:insensitive {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.9)));
+    border-color: darker(@bg_insensitive);
+}
+
+.button.horizontal:hover, .scrollbar.slider.horizontal:hover {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#c6d3ff, 1.1)), to(shade(#c6d3ff, 0.9)));
+    border-color: darker(#c6d3ff);
+}
+
+.button.horizontal:selected, .scrollbar.slider.horizontal:selected {
+    color: #000000;
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#efebdf, 0.9)), to(shade(#efebdf, 1.1)));
+    border-color: darker(#efebdf);
 }
 
 .button.vertical, .scrollbar.slider.vertical {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(#c6d3ff, 1.1)), to(shade(#c6d3ff, 0.9)));
+    border-color: darker(#c6d3ff);
 }
 
 .button.vertical:active, .scrollbar.slider.vertical:active {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 1.8)), to(shade(@bg_active, 0.8)));
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 0.9)), to(shade(@bg_active, 1.1)));
+    border-color: darker(@bg_active);
 }
 
 .button.vertical:insensitive, .scrollbar.slider.vertical:insensitive {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_insensitive, 0.8)), to(shade(@bg_insensitive, 1.8)));
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.9)));
+    border-color: darker(@bg_insensitive);
 }
 
 .button.vertical:hover, .scrollbar.slider.vertical:hover {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_prelight, 0.8)), to(shade(@bg_prelight, 1.8)));
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(#c6d3ff, 1.1)), to(shade(#c6d3ff, 0.9)));
+    border-color: darker(#c6d3ff);
 }
 
 .button.vertical:selected, .scrollbar.slider.vertical:selected {
-    background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 1.8)), to(shade(@bg_selected, 0.8)));
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(#efebdf, 0.9)), to(shade(#efebdf, 1.1)));
+    border-color: darker(#efebdf);
+}
+
+.scale.slider.horizontal {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#efebdf, 1.1)), to(shade(#efebdf, 0.9)));
+    border-color: darker(#efebdf);
+}
+
+.scale.slider.horizontal:insensitive {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#efebdf, 1.1)), to(shade(#efebdf, 0.9)));
+    border-color: darker(#efebdf);
+}
+
+.scale.slider.vertical {
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(#efebdf, 1.1)), to(shade(#efebdf, 0.9)));
+    border-color: darker(#efebdf);
+}
+
+.scale.slider.vertical:insensitive {
+    background-image: -gtk-gradient(linear, left top, right top, from(shade(#efebdf, 1.1)), to(shade(#efebdf, 0.9)));
+    border-color: darker(#efebdf);
 }


More information about the Xfce4-commits mailing list