[Xfce4-commits] <gtk-xfce-engine:master> Converted basic theme to Gtk 3 not matching Gtk 2 colors

[Peter de Ridder]

Updating branch refs/heads/master
         to 64be8a6e7ef052dff61c6a8dbf6902af200429f2 (commit)
       from 1fa76c110247ec0f456da415a7ef6530c37c48b4 (commit)

commit 64be8a6e7ef052dff61c6a8dbf6902af200429f2
Author: Peter de Ridder <peter at xfce.org>
Date:   Thu Nov 17 22:19:12 2011 +0100

    Converted basic theme to Gtk 3 not matching Gtk 2 colors
    
    Xfce-basic

 configure.in.in                            |    1 +
 themes/basic/Makefile.am                   |    3 +-
 themes/{dusk => basic}/gtk-3.0/Makefile.am |    2 +-
 themes/basic/gtk-3.0/gtk.css               |   46 ++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index bae092d..60718f4 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -111,6 +111,7 @@ themes/xfce-4.4/gtk-2.0/Makefile
 themes/xfce-4.6/Makefile
 themes/xfce-4.6/gtk-2.0/Makefile
 themes/basic/gtk-2.0/Makefile
+themes/basic/gtk-3.0/Makefile
 themes/basic/Makefile
 themes/cadmium/gtk-2.0/Makefile
 themes/cadmium/gtk-3.0/Makefile
diff --git a/themes/basic/Makefile.am b/themes/basic/Makefile.am
index 77e790f..e055dab 100644
--- a/themes/basic/Makefile.am
+++ b/themes/basic/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-basic
 
diff --git a/themes/dusk/gtk-3.0/Makefile.am b/themes/basic/gtk-3.0/Makefile.am
similarity index 51%
copy from themes/dusk/gtk-3.0/Makefile.am
copy to themes/basic/gtk-3.0/Makefile.am
index 7391e83..50aad2d 100644
--- a/themes/dusk/gtk-3.0/Makefile.am
+++ b/themes/basic/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-dusk/gtk-3.0
+themedir = $(datadir)/themes/Xfce-basic/gtk-3.0
 theme_DATA = gtk.css
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/themes/basic/gtk-3.0/gtk.css b/themes/basic/gtk-3.0/gtk.css
new file mode 100644
index 0000000..994601d
--- /dev/null
+++ b/themes/basic/gtk-3.0/gtk.css
@@ -0,0 +1,46 @@
+* {
+    engine: xfce;
+
+    -xfce-smooth-edge: true;
+    -xfce-grip-style: disabled;
+
+    -GtkButton-default-border        : 0;
+    -GtkButton-default-outside-border: 0;
+    -GtkButton-default-spacing       : 8;
+    -GtkWidget-focus-line-width      : 1;
+    -GtkWidget-focus-padding         : 2;
+    -GtkMenuItem-shadow-type         : out;
+    /*GtkPaned::handle_full_size     : 1*/
+    -GtkToolbar-shadow-type          : out;
+    -GtkWidget-interior-focus        : 1;
+    -GtkRange-slider-width           : 14;
+    -GtkRange-stepper-size           : 14;
+    -GtkRange-stepper-spacing        : 0;
+    -GtkRange-trough-border          : 0;
+}
+
+.button {
+    border-width: 2 2;
+
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#DCDAD5, 1.1)), to(shade(#DCDAD5, 1.0)));
+}                                                         
+                                                          
+.button:active {                                          
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#9E9A91, 1.1)), to(shade(#9E9A91, 1.0)));
+}                                                         
+                                                          
+.button:insensitive {                                     
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#C8C5BE, 1.1)), to(shade(#C8C5BE, 1.0)));
+}                                                         
+                                                          
+.button:hover {                                           
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4B6983, 1.1)), to(shade(#4B6983, 1.0)));
+}
+
+.button:selected {
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4B6983, 1.1)), to(shade(#4B6983, 1.0)));
+}
+
+.scrollbar, .scale {
+    border-width: 2 2;
+}