[Xfce4-commits] <gtk-xfce-engine:master> Converting last themes to Gtk 3
Peter de Ridder
noreply at xfce.org
Sat Dec 17 17:16:09 CET 2011
Updating branch refs/heads/master
to 9b1cb5cd048373e139b3b24509646b509bbc582c (commit)
from d21ebb88432202809961605797a5fcdc02da0e22 (commit)
commit 9b1cb5cd048373e139b3b24509646b509bbc582c
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Dec 11 23:10:31 2011 +0100
Converting last themes to Gtk 3
Xfce-4.0, Xfce-4.2, Xfce-4.4, Xfce-4.6, Xfce
configure.in.in | 5 +
themes/xfce-4.0/Makefile.am | 3 +-
themes/{b5 => xfce-4.0}/gtk-3.0/Makefile.am | 2 +-
themes/{winter => xfce-4.0}/gtk-3.0/gtk.css | 159 +++++++-----
themes/xfce-4.2/Makefile.am | 3 +-
themes/{b5 => xfce-4.2}/gtk-3.0/Makefile.am | 2 +-
themes/{redmondxp => xfce-4.2}/gtk-3.0/gtk.css | 233 +++++++++---------
themes/xfce-4.4/Makefile.am | 3 +-
themes/{b5 => xfce-4.4}/gtk-3.0/Makefile.am | 2 +-
themes/{orange => xfce-4.4}/gtk-3.0/gtk.css | 296 +++++++++++++----------
themes/xfce-4.6/Makefile.am | 3 +-
themes/{b5 => xfce-4.6}/gtk-3.0/Makefile.am | 2 +-
themes/{redmondxp => xfce-4.6}/gtk-3.0/gtk.css | 314 ++++++++++++++----------
themes/xfce/Makefile.am | 3 +-
themes/{b5 => xfce}/gtk-3.0/Makefile.am | 2 +-
themes/{redmondxp => xfce}/gtk-3.0/gtk.css | 314 ++++++++++++++----------
16 files changed, 770 insertions(+), 576 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index ac53117..56b448d 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -101,15 +101,20 @@ themes/b5/Makefile
themes/b5/gtk-2.0/Makefile
themes/b5/gtk-3.0/Makefile
themes/xfce/gtk-2.0/Makefile
+themes/xfce/gtk-3.0/Makefile
themes/xfce/Makefile
themes/xfce-4.0/gtk-2.0/Makefile
+themes/xfce-4.0/gtk-3.0/Makefile
themes/xfce-4.0/Makefile
themes/xfce-4.2/gtk-2.0/Makefile
+themes/xfce-4.2/gtk-3.0/Makefile
themes/xfce-4.2/Makefile
themes/xfce-4.4/Makefile
themes/xfce-4.4/gtk-2.0/Makefile
+themes/xfce-4.4/gtk-3.0/Makefile
themes/xfce-4.6/Makefile
themes/xfce-4.6/gtk-2.0/Makefile
+themes/xfce-4.6/gtk-3.0/Makefile
themes/basic/gtk-2.0/Makefile
themes/basic/gtk-3.0/Makefile
themes/basic/Makefile
diff --git a/themes/xfce-4.0/Makefile.am b/themes/xfce-4.0/Makefile.am
index 31a87c8..2690df5 100644
--- a/themes/xfce-4.0/Makefile.am
+++ b/themes/xfce-4.0/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-4.0
diff --git a/themes/b5/gtk-3.0/Makefile.am b/themes/xfce-4.0/gtk-3.0/Makefile.am
similarity index 52%
copy from themes/b5/gtk-3.0/Makefile.am
copy to themes/xfce-4.0/gtk-3.0/Makefile.am
index ee99671..db7f95d 100644
--- a/themes/b5/gtk-3.0/Makefile.am
+++ b/themes/xfce-4.0/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-b5/gtk-3.0
+themedir = $(datadir)/themes/Xfce-4.0/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/winter/gtk-3.0/gtk.css b/themes/xfce-4.0/gtk-3.0/gtk.css
similarity index 71%
copy from themes/winter/gtk-3.0/gtk.css
copy to themes/xfce-4.0/gtk-3.0/gtk.css
index 74763ff..24f15a9 100644
--- a/themes/winter/gtk-3.0/gtk.css
+++ b/themes/xfce-4.0/gtk-3.0/gtk.css
@@ -1,33 +1,36 @@
+/* Default Xfce theme
+ * Olivier Fourdan 05/2003
+ * Ported from gtk-2.0 to gtk-3.0 by Peter de Ridder <peter at xfce.org>
+ */
@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 #bfbdbb;
+ at define-color bg_insensitive #eae7e4;
+ at define-color bg_normal #eae7e4;
+ at define-color bg_prelight #eae7e4;
+ at define-color bg_selected #606080;
- 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 #bfbdbb;
+ at define-color base_insensitive #eae7e4;
+ at define-color base_normal #ffffff;
+ at define-color base_prelight #eae7e4;
+ at define-color base_selected #606080;
@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;
@@ -44,7 +47,7 @@
-GtkRange-stepper-spacing : 0;
-GtkRange-trough-border : 0;
-GtkScrollbar-min-slider-length : 20;
- -GtkToolbar-shadow-type : none;
+ -GtkToolbar-shadow-type : out;
-GtkWidget-focus-line-width : 1;
-GtkWidget-focus-padding : 2;
-GtkWidget-interior-focus : 5;
@@ -86,12 +89,14 @@
color: @text_normal;
background-color: @base_normal;
border-color: darker(@bg_normal);
+
+ border-width: 3 3;
}
.view:active, .entry:active {
- color: #224466;
+ color: #000000;
background-color: @base_active;
- border-color: darker(#A4B8CB);
+ border-color: darker(@bg_normal);
}
.view:insensitive, .entry:insensitive {
@@ -101,9 +106,9 @@
}
.view:hover, .entry:hover {
- color: #224466;
+ color: #ffffff;
background-color: @base_prelight;
- border-color: darker(#B3C8DD);
+ border-color: darker(@bg_normal);
}
.view:selected, .entry:selected {
@@ -246,15 +251,9 @@ 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(#606080, 0.8)), to(shade(#606080, 1.8)));
+ border-color: darker(#606080);
border-width: 1 1;
}
@@ -263,17 +262,24 @@ GtkCalendar:selected {
background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
}
-.trough.vertical {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
-}
-
.scrollbar.trough {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.8)), to(shade(@bg_active, 1.8)));
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 0.8)), to(shade(@bg_active, 1.8)));
border-color: darker(@bg_active);
+
+ border-width: 2 2;
}
-.scrollbar.vertical {
+.scale.trough {
background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 0.8)), to(shade(@bg_active, 1.8)));
+ border-color: darker(@bg_active);
+}
+
+.scrollbar.trough.horizontal {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.8)), to(shade(@bg_active, 1.8)));
+}
+
+.scale.trough.horizontal {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.8)), to(shade(@bg_active, 1.8)));
}
.notebook tab {
@@ -288,20 +294,20 @@ GtkCalendar:selected {
border-color: darker(@bg_normal);
}
-.dock, .menubar, .toolbar {
+.menubar, .dock, .toolbar {
border-width: 1 2;
}
-.dock:active, .menubar:active, .toolbar:active {
- color: #224466;
- background-color: #A4B8CB;
- border-color: darker(#A4B8CB);
+.menubar:active, .dock:active, .toolbar:active {
+ color: #000000;
+ background-color: #bfbdbb;
+ border-color: darker(#bfbdbb);
}
-.dock:hover, .menubar:hover, .toolbar:hover {
- color: #224466;
- background-color: #B3C8DD;
- border-color: darker(#B3C8DD);
+.menubar:hover, .dock:hover, .toolbar:hover {
+ color: #ffffff;
+ background-color: #606080;
+ border-color: darker(#606080);
}
.menuitem {
@@ -310,55 +316,52 @@ GtkCalendar:selected {
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)));
-
- border-width: 3 3;
+.menuitem:active {
+ color: #000000;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#bfbdbb, 1.8)), to(shade(#bfbdbb, 0.8)));
+ border-color: darker(#bfbdbb);
}
-.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);
-}
-
-.button:insensitive, .menuitem:insensitive {
+.menuitem:insensitive {
background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.8)), to(shade(@bg_insensitive, 1.8)));
}
-.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);
+.menuitem:hover {
+ color: #ffffff;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#606080, 0.8)), to(shade(#606080, 1.8)));
+ border-color: darker(#606080);
}
-.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)));
+.menuitem:selected {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.8)), to(shade(@bg_selected, 0.8)));
}
-.slider {
+.button.horizontal, .scrollbar.slider.horizontal {
background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
+
+ border-width: 2 2;
}
-.slider:active {
+.button.horizontal:active, .scrollbar.slider.horizontal:active {
background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 1.8)), to(shade(@bg_active, 0.8)));
}
-.slider:insensitive {
+.button.horizontal:insensitive, .scrollbar.slider.horizontal:insensitive {
background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.8)), to(shade(@bg_insensitive, 1.8)));
}
-.slider:hover {
+.button.horizontal:hover, .scrollbar.slider.horizontal:hover {
background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 0.8)), to(shade(@bg_prelight, 1.8)));
}
-.slider:selected {
- background-color: @base_selected;
+.button.horizontal:selected, .scrollbar.slider.horizontal:selected {
background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.8)), to(shade(@bg_selected, 0.8)));
}
.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)));
+
+ border-width: 2 2;
}
.button.vertical:active, .scrollbar.slider.vertical:active {
@@ -376,3 +379,27 @@ GtkCalendar:selected {
.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)));
}
+
+.button, .scale {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(#fafaf2, 1.8)));
+
+ border-width: 3 3;
+}
+
+.button:active, .scale:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#bfbdbb, 1.8)), to(shade(#bfbdbb, 0.8)));
+ border-color: darker(#bfbdbb);
+}
+
+.button:insensitive, .scale:insensitive {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.8)), to(shade(@bg_insensitive, 1.8)));
+}
+
+.button:hover, .scale:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#606080, 0.8)), to(shade(#606080, 1.8)));
+ border-color: darker(#606080);
+}
+
+.button:selected, .scale:selected {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.8)), to(shade(@bg_selected, 0.8)));
+}
diff --git a/themes/xfce-4.2/Makefile.am b/themes/xfce-4.2/Makefile.am
index 68b5c84..c12c508 100644
--- a/themes/xfce-4.2/Makefile.am
+++ b/themes/xfce-4.2/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-4.2
diff --git a/themes/b5/gtk-3.0/Makefile.am b/themes/xfce-4.2/gtk-3.0/Makefile.am
similarity index 52%
copy from themes/b5/gtk-3.0/Makefile.am
copy to themes/xfce-4.2/gtk-3.0/Makefile.am
index ee99671..41e48e4 100644
--- a/themes/b5/gtk-3.0/Makefile.am
+++ b/themes/xfce-4.2/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-b5/gtk-3.0
+themedir = $(datadir)/themes/Xfce-4.2/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/redmondxp/gtk-3.0/gtk.css b/themes/xfce-4.2/gtk-3.0/gtk.css
similarity index 56%
copy from themes/redmondxp/gtk-3.0/gtk.css
copy to themes/xfce-4.2/gtk-3.0/gtk.css
index 5892444..9cc3813 100644
--- a/themes/redmondxp/gtk-3.0/gtk.css
+++ b/themes/xfce-4.2/gtk-3.0/gtk.css
@@ -1,21 +1,25 @@
+/* Created June 2005 by Olivier Fourdan
+ * Ported from gtk-2.0 to gtk-3.0 by Peter de Ridder <peter at xfce.org>
+ * Released under the GPL license
+ */
@define-color fg_active #000000;
- at define-color fg_insensitive #7f7f79;
+ at define-color fg_insensitive #8e8e8a;
@define-color fg_normal #000000;
@define-color fg_prelight #000000;
@define-color fg_selected #ffffff;
- 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 bg_active #e6e8ea;
+ at define-color bg_insensitive #edeff2;
+ at define-color bg_normal #edeff2;
+ at define-color bg_prelight #f2f4f7;
+ at define-color bg_selected #5582c2;
- at define-color base_active #e5e5e5;
- at define-color base_insensitive #efebdf;
+ at define-color base_active #d3d7e0;
+ at define-color base_insensitive #edeff2;
@define-color base_normal #ffffff;
- at define-color base_prelight #efebdf;
- at define-color base_selected #0055ef;
+ at define-color base_prelight #e6e8ea;
+ at define-color base_selected #5582c2;
@define-color text_active #000000;
@define-color text_insensitive #000000;
@@ -27,23 +31,30 @@
engine: xfce;
-xfce-smooth-edge: true;
+ -xfce-grip-style: disabled;
-GtkButton-default-border : 0;
-GtkButton-default-outside-border: 0;
- -GtkButton-default-spacing : 10;
- -GtkWidget-focus-line-width : 1;
- -GtkWidget-focus-padding : 0;
- -GtkCheckButton-indicator-size : 14;
+ -GtkButton-child-displacement-x : 0;
+ -GtkButton-child-displacement-y : 1;
+ -GtkButton-default-spacing : 5;
+ -GtkCheckButton-indicator-size : 12;
+ -GtkMenuBar-internal-padding : 2;
-GtkMenuBar-shadow-type : out;
- -GtkMenuItem-selected-shadow-type: none;
+ -GtkHandleBox-shadow-type : out;
+ -GtkMenuItem-selected-shadow-type: etched-in;
/*GtkPaned::handle_full_size : 1*/
+ -GtkPaned-handle-full-size : 7;
-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-interior-focus : 1;
+ -GtkWidget-focus-line-width : 1;
+ -GtkWidget-focus-padding : 4;
+ -GtkWidget-interior-focus : 5;
-GtkWidget-internal-padding : 4;
border-width: 2 2;
@@ -82,8 +93,6 @@
color: @text_normal;
background-color: @base_normal;
border-color: darker(@bg_normal);
-
- border-width: 1 1;
}
.view:active, .entry:active {
@@ -99,8 +108,8 @@
}
.view:hover, .entry:hover {
- color: @text_prelight;
- background-color: @base_prelight;
+ color: #ffffff;
+ background-color: #5582c2;
border-color: darker(@bg_normal);
}
@@ -244,57 +253,53 @@ GtkCalendar:selected {
}
.progressbar {
- 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);
+ background-color: #5582c2;
+ border-color: darker(#5582c2);
- border-width: 1 1;
+ border-width: 0 0;
}
.trough {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.9)), to(shade(@bg_normal, 1.1)));
+ background-color: #d3d7e0;
+ border-color: darker(#d3d7e0);
}
.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);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#edeff2, 0.95)), to(shade(#edeff2, 1.1)));
+ border-color: darker(#edeff2);
}
-.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);
+.scale.trough.vertical, .scrollbar.trough.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#edeff2, 0.95)), to(shade(#edeff2, 1.1)));
+ border-color: darker(#edeff2);
}
.notebook {
- background-color: #fafaf2;
- border-color: darker(#fafaf2);
-
- border-width: 1 1;
+ background-color: #f5f5f5;
+ border-color: darker(#f5f5f5);
}
.notebook tab {
color: @fg_active;
- background-color: #d4d4ce;
- border-color: darker(#d4d4ce);
+ background-color: #d3d7e0;
+ border-color: darker(#d3d7e0);
}
.notebook tab:active {
color: @fg_normal;
- background-color: #fafaf2;
- border-color: darker(#fafaf2);
+ background-color: #f5f5f5;
+ border-color: darker(#f5f5f5);
}
.menu {
background-color: #ffffff;
border-color: darker(#ffffff);
-
- border-width: 1 1;
}
.menu:active {
color: #ffffff;
- background-color: #0055ef;
- border-color: darker(#0055ef);
+ background-color: #d3d7e0;
+ border-color: darker(#d3d7e0);
}
.menu:insensitive {
@@ -304,8 +309,8 @@ GtkCalendar:selected {
.menu:hover {
color: #ffffff;
- background-color: #0055ef;
- border-color: darker(#0055ef);
+ background-color: #5582c2;
+ border-color: darker(#5582c2);
}
.menu:selected {
@@ -313,123 +318,129 @@ GtkCalendar:selected {
border-color: darker(@bg_selected);
}
-.menubar {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.9)), to(shade(@bg_normal, 1.1)));
+.menuitem {
+ background-color: #ffffff;
+ border-color: darker(#ffffff);
- border-width: 2 2;
+ border-width: 1 2;
+}
+
+.menuitem:active {
+ color: #ffffff;
+ background-color: #d3d7e0;
+ border-color: darker(#d3d7e0);
+}
+
+.menuitem:insensitive {
+ background-color: #ffffff;
+ border-color: darker(#ffffff);
}
-.menubar:active {
+.menuitem:hover {
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);
+ background-color: #5582c2;
+ border-color: darker(#5582c2);
}
-.menubar:insensitive {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.9)), to(shade(@bg_insensitive, 1.1)));
+.menuitem:selected {
+ background-color: @bg_selected;
+ border-color: darker(@bg_selected);
}
-.menubar:hover {
+.menubar:active .toolbar:active {
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);
+ background-color: #d3d7e0;
+ border-color: darker(#d3d7e0);
}
-.menubar:selected {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.1)), to(shade(@bg_selected, 0.9)));
+
+.menubar:hover .toolbar:hover {
+ color: #ffffff;
+ background-color: #5582c2;
+ border-color: darker(#5582c2);
}
.button {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#fafaf2, 1.1)), to(shade(#fafaf2, 0.9)));
- border-color: darker(#fafaf2);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#e6e8ea, 1.1)), to(shade(#e6e8ea, 0.95)));
+ border-color: darker(#e6e8ea);
+
+ -GtkWidget-focus-padding: 1;
}
.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);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#c2cacf, 0.95)), to(shade(#c2cacf, 1.1)));
+ border-color: darker(#c2cacf);
}
.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);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.95)));
+ border-color: darker(@bg_insensitive);
}
.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);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#f2f4f7, 1.1)), to(shade(#f2f4f7, 0.95)));
+ border-color: darker(#f2f4f7);
}
.button:selected {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.1)));
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.95)), to(shade(@bg_selected, 1.1)));
+ border-color: darker(@bg_selected);
}
-.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);
+.button.horizontal, .slider.horizontal {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#e6e8ea, 1.1)), to(shade(#e6e8ea, 0.95)));
+ border-color: darker(#e6e8ea);
}
-.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:active, .slider.horizontal:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#edeff2, 0.95)), to(shade(#edeff2, 1.1)));
+ border-color: darker(#edeff2);
}
-.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)));
+.button.horizontal:insensitive, .slider.horizontal:insensitive {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.95)));
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:hover, .slider.horizontal:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#f2f4f7, 1.1)), to(shade(#f2f4f7, 0.95)));
+ border-color: darker(#f2f4f7);
}
-.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.horizontal:selected, .slider.horizontal:selected {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.95)), to(shade(@bg_selected, 1.1)));
+ border-color: darker(@bg_selected);
}
-.button.vertical, .scrollbar.slider.vertical {
- 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, .slider.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#e6e8ea, 1.1)), to(shade(#e6e8ea, 0.95)));
+ border-color: darker(#e6e8ea);
}
-.button.vertical:active, .scrollbar.slider.vertical:active {
- 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:active, .slider.vertical:active {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#edeff2, 0.95)), to(shade(#edeff2, 1.1)));
+ border-color: darker(#edeff2);
}
-.button.vertical:insensitive, .scrollbar.slider.vertical:insensitive {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.9)));
+.button.vertical:insensitive, .slider.vertical:insensitive {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.95)));
border-color: darker(@bg_insensitive);
}
-.button.vertical:hover, .scrollbar.slider.vertical:hover {
- 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:hover, .slider.vertical:hover {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#f2f4f7, 1.1)), to(shade(#f2f4f7, 0.95)));
+ border-color: darker(#f2f4f7);
}
-.button.vertical:selected, .scrollbar.slider.vertical:selected {
- 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);
+.button.vertical:selected, .slider.vertical:selected {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 0.95)), to(shade(@bg_selected, 1.1)));
+ border-color: darker(@bg_selected);
}
-.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);
+.dock {
+ border-width: 0 2;
}
-.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);
+.radio {
+ -GtkCheckButton-indicator-size: 14;
}
diff --git a/themes/xfce-4.4/Makefile.am b/themes/xfce-4.4/Makefile.am
index 85df91b..de33bfb 100644
--- a/themes/xfce-4.4/Makefile.am
+++ b/themes/xfce-4.4/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-4.4
diff --git a/themes/b5/gtk-3.0/Makefile.am b/themes/xfce-4.4/gtk-3.0/Makefile.am
similarity index 52%
copy from themes/b5/gtk-3.0/Makefile.am
copy to themes/xfce-4.4/gtk-3.0/Makefile.am
index ee99671..12416e9 100644
--- a/themes/b5/gtk-3.0/Makefile.am
+++ b/themes/xfce-4.4/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-b5/gtk-3.0
+themedir = $(datadir)/themes/Xfce-4.4/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/orange/gtk-3.0/gtk.css b/themes/xfce-4.4/gtk-3.0/gtk.css
similarity index 57%
copy from themes/orange/gtk-3.0/gtk.css
copy to themes/xfce-4.4/gtk-3.0/gtk.css
index 84cd4ad..4279822 100644
--- a/themes/orange/gtk-3.0/gtk.css
+++ b/themes/xfce-4.4/gtk-3.0/gtk.css
@@ -1,27 +1,35 @@
+/* Created July 2006
+ * Modified Dec. 2006
+ * Modified Jan. 2007
+ * Olivier Fourdan <fourdan at xfce.org>
+ * Based on Tango color scheme http://tango-project.org
+ * Ported from gtk-2.0 to gtk-3.0 by Peter de Ridder <peter at xfce.org>
+ * Released under the GPL license
+ */
@define-color fg_active #000000;
- at define-color fg_insensitive #858481;
- at define-color fg_normal #000000;
- at define-color fg_prelight #000000;
+ at define-color fg_insensitive #888a85;
+ at define-color fg_normal #101010;
+ at define-color fg_prelight #101010;
@define-color fg_selected #000000;
- 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 bg_active #d3d7cf;
+ at define-color bg_insensitive #eeeeec;
+ at define-color bg_normal #eeeeec;
+ at define-color bg_prelight #eeeeec;
+ at define-color bg_selected #d3d7cf;
- at define-color base_active #e0dcd7;
- at define-color base_insensitive #f4f2ed;
+ at define-color base_active #d3d7cf;
+ at define-color base_insensitive #eeeeec;
@define-color base_normal #ffffff;
- at define-color base_prelight #fff9e1;
- at define-color base_selected #ffe371;
+ at define-color base_prelight #eeeeec;
+ at define-color base_selected #3465a4;
- at define-color text_active #000000;
- at define-color text_insensitive #000000;
- at define-color text_normal #000000;
- at define-color text_prelight #000000;
- at define-color text_selected #000000;
+ at define-color text_active #101010;
+ at define-color text_insensitive #101010;
+ at define-color text_normal #101010;
+ at define-color text_prelight #101010;
+ at define-color text_selected #ffffff;
* {
engine: xfce;
@@ -29,26 +37,26 @@
-xfce-smooth-edge: true;
-xfce-grip-style: disabled;
+ -GtkWidget-focus-line-width : 1;
+ -GtkWidget-focus-padding : 4;
+ -GtkWidget-interior-focus : 5;
+ -GtkWidget-internal-padding : 4;
-GtkButton-default-border : 0;
-GtkButton-default-outside-border: 0;
-GtkButton-child-displacement-x : 0;
-GtkButton-child-displacement-y : 1;
-GtkButton-default-spacing : 5;
- -GtkWidget-focus-padding : 1;
+ -GtkButton-focus-padding : 1;
-GtkCheckButton-indicator-size : 12;
- -GtkMenuItem-selected-shadow-type: none;
+ -GtkMenuItem-selected-shadow-type: etched-in;
/*GtkPaned::handle_full_size : 1*/
- -GtkPaned-handle-size : 7;
+ -GtkPaned-handle-full-size : 7;
-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;
- -GtkWidget-focus-line-width : 1;
- -GtkWidget-focus-padding : 4;
- -GtkWidget-interior-focus : 5;
- -GtkWidget-internal-padding : 4;
border-width: 2 2;
@@ -170,20 +178,12 @@ GtkCalendar:selected {
background-color: @base_active;
}
-.check {
+.check, .radio {
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;
@@ -254,180 +254,214 @@ GtkCalendar:selected {
}
.progressbar {
- background-color: #ffe371;
- border-color: darker(#ffe371);
+ color: #4e9a06;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#8ae234, 1.1)), to(shade(#8ae234, 0.95)));
+ border-color: darker(#8ae234);
border-width: 0 0;
}
-.trough {
- background-color: #f4f2ed;
- border-color: darker(#f4f2ed);
+.progressbar.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#8ae234, 1.1)), to(shade(#8ae234, 0.95)));
}
-.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 {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#e8e8e6, 0.95)), to(shade(#e8e8e6, 1.1)));
+ border-color: darker(#e8e8e6);
}
-.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);
+.trough.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#e8e8e6, 0.95)), to(shade(#e8e8e6, 1.1)));
}
.notebook {
- background-color: #f8f7f5;
- border-color: darker(#f8f7f5);
+ color: #101010;
+ background-color: #ffffff;
+ border-color: darker(#ffffff);
}
.notebook tab {
color: @fg_active;
- background-color: #e0dcd7;
- border-color: darker(#e0dcd7);
+ background-color: #e8e8e6;
+ border-color: darker(#e8e8e6);
}
.notebook tab:active {
- color: @fg_normal;
- background-color: #f8f7f5;
- border-color: darker(#f8f7f5);
+ color: #101010;
+ background-color: #ffffff;
+ border-color: darker(#ffffff);
}
.menu {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#f8f7f5, 1.05)), to(shade(#f8f7f5, 0.95)));
- border-color: darker(#f8f7f5);
+ background-color: #ffffff;
+ border-color: darker(#ffffff);
+}
+
+.menu:active {
+ background-color: @bg_active;
+ border-color: darker(@bg_active);
+}
+
+.menu:insensitive {
+ background-color: #ffffff;
+ border-color: darker(#ffffff);
+}
+
+.menu:hover {
+ background-color: #d3d7cf;
+ border-color: darker(#d3d7cf);
+}
+
+.menu:selected {
+ color: #000000;
+ background-color: @bg_selected;
+ border-color: darker(@bg_selected);
}
.menuitem {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#f8f7f5, 1.05)), to(shade(#f8f7f5, 0.95)));
- border-color: darker(#f8f7f5);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffffff, 1.1)), to(shade(#ffffff, 0.95)));
+ border-color: darker(#ffffff);
border-width: 1 2;
+ -GtkWidget-internal-padding: 5;
}
-.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:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.95)), to(shade(@bg_active, 1.1)));
+ border-color: darker(@bg_active);
+}
+
+.menuitem:insensitive {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffffff, 1.1)), to(shade(#ffffff, 0.95)));
+ border-color: darker(#ffffff);
}
-.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);
+.menuitem:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 1.1)), to(shade(#d3d7cf, 0.95)));
+ border-color: darker(#d3d7cf);
}
-.menuitem:hover, .menu:hover {
+.menuitem:selected {
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);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.95)), to(shade(@bg_selected, 1.1)));
+ border-color: darker(@bg_selected);
}
-.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 {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.2)), to(shade(#eeeeec, 0.9)));
+ border-color: darker(#eeeeec);
+
+ border-width: 1 3;
}
-.menubar, .toolbar {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.05)), to(shade(@bg_normal, 0.95)));
+.menubar:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.9)), to(shade(@bg_active, 1.2)));
+ border-color: darker(@bg_active);
}
-.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);
+.menubar:insensitive {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.2)), to(shade(#eeeeec, 0.9)));
+ border-color: darker(#eeeeec);
}
-.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)));
+.menubar:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 1.2)), to(shade(#d3d7cf, 0.9)));
+ border-color: darker(#d3d7cf);
}
-.menubar:hover, .toolbar:hover {
+.menubar:selected {
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);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.2)));
+ border-color: darker(@bg_selected);
}
-.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 {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.1)), to(shade(#eeeeec, 0.95)));
+ border-color: darker(#eeeeec);
}
-.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)));
+.button:active {
+ color: #000000;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 0.95)), to(shade(#d3d7cf, 1.1)));
+ border-color: darker(#d3d7cf);
+}
+
+.button:insensitive {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.1)), 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:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 0.95)), to(shade(#d3d7cf, 1.1)));
+ border-color: darker(#d3d7cf);
}
.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);
+ color: #ffffff;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#3465a4, 1.1)), to(shade(#3465a4, 0.95)));
+ border-color: darker(#3465a4);
+}
+
+.tooltip {
+ color: #101010;
+ background-color: #ffffdf;
+ border-color: darker(#ffffdf);
}
-.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);
+.scrollbar {
+ -xfce-grip-style: rough;
}
-.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.horizontal, .slider.horizontal {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 1.1)), to(shade(#d3d7cf, 0.95)));
+ border-color: darker(#d3d7cf);
}
-.slider.horizontal:insensitive {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.05)), to(shade(@bg_insensitive, 0.95)));
+.button.horizontal:active, .slider.horizontal:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#e8e8e6, 0.95)), to(shade(#e8e8e6, 1.1)));
+ border-color: darker(#e8e8e6);
+}
+
+.button.horizontal:insensitive, .slider.horizontal:insensitive {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.95)));
border-color: darker(@bg_insensitive);
}
-.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);
+.button.horizontal:hover, .slider.horizontal:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 1.1)), to(shade(#d3d7cf, 0.95)));
+ border-color: darker(#d3d7cf);
}
-.slider.horizontal:selected {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.95)), to(shade(@bg_selected, 1.05)));
+.button.horizontal:selected, .slider.horizontal:selected {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.95)), to(shade(@bg_selected, 1.1)));
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);
+.button.vertical, .slider.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#d3d7cf, 1.1)), to(shade(#d3d7cf, 0.95)));
+ border-color: darker(#d3d7cf);
}
-.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);
+.button.vertical:active, .slider.vertical:active {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#e8e8e6, 0.95)), to(shade(#e8e8e6, 1.1)));
+ border-color: darker(#e8e8e6);
}
-.slider.vertical:insensitive {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_insensitive, 1.05)), to(shade(@bg_insensitive, 0.95)));
+.button.vertical:insensitive, .slider.vertical:insensitive {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.95)));
border-color: darker(@bg_insensitive);
}
-.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);
+.button.vertical:hover, .slider.vertical:hover {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#d3d7cf, 1.1)), to(shade(#d3d7cf, 0.95)));
+ border-color: darker(#d3d7cf);
}
-.slider.vertical:selected {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 0.95)), to(shade(@bg_selected, 1.05)));
+.button.vertical:selected, .slider.vertical:selected {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 0.95)), to(shade(@bg_selected, 1.1)));
border-color: darker(@bg_selected);
}
-.tooltip {
- color: #000000;
- background-color: #ffffdf;
- border-color: darker(#ffffdf);
+.radio {
+ -GtkCheckButton-indicator-size: 14;
}
diff --git a/themes/xfce-4.6/Makefile.am b/themes/xfce-4.6/Makefile.am
index 7b4ab13..fde6903 100644
--- a/themes/xfce-4.6/Makefile.am
+++ b/themes/xfce-4.6/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-4.6
diff --git a/themes/b5/gtk-3.0/Makefile.am b/themes/xfce-4.6/gtk-3.0/Makefile.am
similarity index 52%
copy from themes/b5/gtk-3.0/Makefile.am
copy to themes/xfce-4.6/gtk-3.0/Makefile.am
index ee99671..9d6d9b8 100644
--- a/themes/b5/gtk-3.0/Makefile.am
+++ b/themes/xfce-4.6/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-b5/gtk-3.0
+themedir = $(datadir)/themes/Xfce-4.6/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/redmondxp/gtk-3.0/gtk.css b/themes/xfce-4.6/gtk-3.0/gtk.css
similarity index 53%
copy from themes/redmondxp/gtk-3.0/gtk.css
copy to themes/xfce-4.6/gtk-3.0/gtk.css
index 5892444..d792e95 100644
--- a/themes/redmondxp/gtk-3.0/gtk.css
+++ b/themes/xfce-4.6/gtk-3.0/gtk.css
@@ -1,50 +1,102 @@
+/* Created July 2006
+ * Modified Dec. 2006
+ * Modified Jan. 2007
+ * Modified Jul. 2008 for xfce 4.6
+ * Modified Feb. 2009 for xfce 4.6
+ * Olivier Fourdan <fourdan at xfce.org>
+ * Ported from gtk-2.0 to gtk-3.0 by Peter de Ridder <peter at xfce.org>
+ * Released under the GPL license
+ */
@define-color fg_active #000000;
- at define-color fg_insensitive #7f7f79;
- at define-color fg_normal #000000;
- at define-color fg_prelight #000000;
- at define-color fg_selected #ffffff;
-
- 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 #e5e5e5;
- at define-color base_insensitive #efebdf;
+ at define-color fg_insensitive #888a85;
+ at define-color fg_normal #101010;
+ at define-color fg_prelight #101010;
+ at define-color fg_selected #000000;
+
+ at define-color bg_active #d9d7d6;
+ at define-color bg_insensitive #eeeeec;
+ at define-color bg_normal #eeeeec;
+ at define-color bg_prelight #eeeeec;
+ at define-color bg_selected #d9d7d6;
+
+ at define-color base_active #d9d7d6;
+ at define-color base_insensitive #eeeeec;
@define-color base_normal #ffffff;
- at define-color base_prelight #efebdf;
- at define-color base_selected #0055ef;
+ at define-color base_prelight #eeeeec;
+ at define-color base_selected #bad8ff;
- at define-color text_active #000000;
- at define-color text_insensitive #000000;
- at define-color text_normal #000000;
- at define-color text_prelight #000000;
- at define-color text_selected #ffffff;
+ at define-color text_active #101010;
+ at define-color text_insensitive #101010;
+ at define-color text_normal #101010;
+ at define-color text_prelight #101010;
+ at define-color text_selected #101010;
* {
engine: xfce;
-xfce-smooth-edge: true;
+ -xfce-grip-style: disabled;
- -GtkButton-default-border : 0;
- -GtkButton-default-outside-border: 0;
- -GtkButton-default-spacing : 10;
-GtkWidget-focus-line-width : 1;
-GtkWidget-focus-padding : 0;
- -GtkCheckButton-indicator-size : 14;
- -GtkMenuBar-shadow-type : out;
- -GtkMenuItem-selected-shadow-type: none;
+ -GtkWidget-interior-focus : 0;
+ -GtkWidget-internal-padding : 0;
+
+ -GtkButton-child-displacement-x : 0;
+ -GtkButton-child-displacement-y : 1;
+ -GtkButton-default-border : 0;
+ -GtkButton-default-outside-border: 0;
+ /*-GtkButton-focus-line-pattern : "\0";*/
+
+ -GtkButtonBox-child-internal-pad-x: 0;
+ -GtkButtonBox-child-internal-pad-y: 0;
+ -GtkButtonBox-child-min-height : 0;
+ -GtkButtonBox-child-min-width : 0;
+
+ -GtkCheckButton-indicator-size : 12;
+ /*-GtkCheckButton-focus-line-pattern: "\1\1";*/
+
+ /*-GtkEntry-focus-line-pattern : "\0";*/
+
+ /*-GtkRadioButton-focus-line-pattern: "\1\1";*/
+
+ -GtkExpander-expander-size : 11;
+ -GtkExpander-expander-spacing : 0;
+
+ -GtkMenuBar-internal-padding : 0;
+
+ -GtkMenu-horizontal-padding : 0;
+ -GtkMenu-vertical-padding : 0;
+
+ -GtkMenuItem-internal-padding : 2;
+ -GtkMenuItem-selected-shadow-type: etched-in;
+
+ -GtkOptionMenu-indicator-size : 0;
+ -GtkOptionMenu-indicator-spacing : 0;
+
/*GtkPaned::handle_full_size : 1*/
+ -GtkPaned-handle-full-size : 3;
+
-GtkRange-slider-width : 15;
-GtkRange-stepper-size : 15;
-GtkRange-stepper-spacing : 0;
-GtkRange-trough-border : 0;
+
+ -GtkScale-trough-size-details : 1;
+ -GtkScale-value-spacing : 0;
+
+ -GtkScrollbar-has-backward-stepper: 1;
-GtkScrollbar-min-slider-length : 20;
- -GtkToolbar-shadow-type : out;
- -GtkWidget-interior-focus : 1;
- -GtkWidget-internal-padding : 4;
+
+ /*-GtkTextView-focus-line-pattern : "\0";*/
+
+ -GtkToolbar-internal-padding : 0;
+ -GtkToolbar-space-size : 10;
+
+ -GtkTreeView-expander-size : 11;
+ -GtkTreeView-horizontal-separator: 0;
+ -GtkTreeView-vertical-separator : 0;
border-width: 2 2;
@@ -82,8 +134,6 @@
color: @text_normal;
background-color: @base_normal;
border-color: darker(@bg_normal);
-
- border-width: 1 1;
}
.view:active, .entry:active {
@@ -244,192 +294,198 @@ GtkCalendar:selected {
}
.progressbar {
- 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);
+ color: #4e9a06;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.9)));
+ border-color: darker(#cce2ff);
- border-width: 1 1;
+ border-width: 0 0;
}
-.trough {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.9)), to(shade(@bg_normal, 1.1)));
+.progressbar.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.9)));
}
-.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);
+.trough {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#e8e8e6, 0.9)), to(shade(#e8e8e6, 1.1)));
+ border-color: darker(#e8e8e6);
}
-.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);
+.trough.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#e8e8e6, 0.9)), to(shade(#e8e8e6, 1.1)));
}
.notebook {
- background-color: #fafaf2;
- border-color: darker(#fafaf2);
+ color: #101010;
+ background-color: #ffffff;
+ border-color: darker(#ffffff);
border-width: 1 1;
}
.notebook tab {
color: @fg_active;
- background-color: #d4d4ce;
- border-color: darker(#d4d4ce);
+ background-color: #e8e8e6;
+ border-color: darker(#e8e8e6);
}
.notebook tab:active {
- color: @fg_normal;
- background-color: #fafaf2;
- border-color: darker(#fafaf2);
+ color: #101010;
+ background-color: #ffffff;
+ border-color: darker(#ffffff);
}
.menu {
- background-color: #ffffff;
- border-color: darker(#ffffff);
+ background-color: #fafaf7;
+ border-color: darker(#fafaf7);
+}
- border-width: 1 1;
+.menuitem {
+ background-color: #fafaf7;
+ border-color: darker(#fafaf7);
+
+ border-width: 1 2;
}
-.menu:active {
- color: #ffffff;
- background-color: #0055ef;
- border-color: darker(#0055ef);
+.menu:active, .memuitem:active {
+ color: #101010;
+ background-color: @bg_active;
+ border-color: darker(@bg_active);
}
-.menu:insensitive {
- background-color: #ffffff;
- border-color: darker(#ffffff);
+.menu:insensitive, .menuitem:insensitive {
+ background-color: #fafaf7;
+ border-color: darker(#fafaf7);
}
-.menu:hover {
- color: #ffffff;
- background-color: #0055ef;
- border-color: darker(#0055ef);
+.menu:hover, .menuitem:hover {
+ color: #101010;
+ background-color: #cce2ff;
+ border-color: darker(#cce2ff);
}
-.menu:selected {
+.menu:selected, .menuitem:selected {
+ color: #101010;
background-color: @bg_selected;
border-color: darker(@bg_selected);
}
.menubar {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.9)), to(shade(@bg_normal, 1.1)));
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.0)), to(shade(#eeeeec, 0.9)));
+ border-color: darker(#eeeeec);
- border-width: 2 2;
+ border-width: 1 2;
}
.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);
+ color: #101010;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.9)), to(shade(@bg_active, 1.0)));
+ border-color: darker(@bg_active);
}
.menubar:insensitive {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.9)), to(shade(@bg_insensitive, 1.1)));
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.0)), to(shade(#eeeeec, 0.9)));
+ border-color: darker(#eeeeec);
}
.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);
+ color: #101010;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.0)), to(shade(#cce2ff, 0.9)));
+ border-color: darker(#cce2ff);
}
.menubar:selected {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.1)), to(shade(@bg_selected, 0.9)));
+ color: #101010;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.0)));
+ border-color: darker(@bg_selected);
}
.button {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#fafaf2, 1.1)), to(shade(#fafaf2, 0.9)));
- border-color: darker(#fafaf2);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.1)), to(shade(#eeeeec, 0.95)));
+ border-color: darker(#eeeeec);
}
.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);
+ color: #000000;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 0.95)), to(shade(#d3d7cf, 1.1)));
+ border-color: darker(#d3d7cf);
}
.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);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.95)));
+ border-color: darker(@bg_insensitive);
}
.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);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 0.95)), to(shade(#d3d7cf, 1.1)));
+ border-color: darker(#d3d7cf);
}
.button:selected {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.1)));
+ color: #ffffff;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#3465a4, 1.1)), to(shade(#3465a4, 0.95)));
+ border-color: darker(#3465a4);
}
-.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);
+.tooltip {
+ color: #101010;
+ background-color: #ffffdf;
+ border-color: darker(#ffffdf);
}
-.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);
+.scrollbar {
+ -xfce-grip-style: rough;
}
-.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, .slider.horizontal {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d9d7d6, 1.1)), to(shade(#d9d7d6, 0.9)));
+ border-color: darker(#d9d7d6);
}
-.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:active, .slider.horizontal:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#e8e8e6, 0.9)), to(shade(#e8e8e6, 1.1)));
+ border-color: darker(#e8e8e6);
}
-.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.horizontal:insensitive, .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.vertical, .scrollbar.slider.vertical {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(#c6d3ff, 1.1)), to(shade(#c6d3ff, 0.9)));
- border-color: darker(#c6d3ff);
+.button.horizontal:hover, .slider.horizontal:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.9)));
+ border-color: darker(#cce2ff);
}
-.button.vertical:active, .scrollbar.slider.vertical:active {
- 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, 1.1)), to(shade(@bg_insensitive, 0.9)));
- border-color: darker(@bg_insensitive);
+.button.horizontal:selected, .slider.horizontal:selected {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.1)));
+ border-color: darker(@bg_selected);
}
-.button.vertical:hover, .scrollbar.slider.vertical:hover {
- 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, .slider.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#d9d7d6, 1.1)), to(shade(#d9d7d6, 0.9)));
+ border-color: darker(#d9d7d6);
}
-.button.vertical:selected, .scrollbar.slider.vertical:selected {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(#efebdf, 0.9)), to(shade(#efebdf, 1.1)));
- border-color: darker(#efebdf);
+.button.vertical:active, .slider.vertical:active {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#e8e8e6, 0.9)), to(shade(#e8e8e6, 1.1)));
+ border-color: darker(#e8e8e6);
}
-.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);
+.button.vertical:insensitive, .slider.vertical:insensitive {
+ 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);
}
-.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);
+.button.vertical:hover, .slider.vertical:hover {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.9)));
+ border-color: darker(#cce2ff);
}
-.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);
+.button.vertical:selected, .slider.vertical:selected {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.1)));
+ border-color: darker(@bg_selected);
}
-.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);
+.radio {
+ -GtkCheckButton-indicator-size: 14;
}
diff --git a/themes/xfce/Makefile.am b/themes/xfce/Makefile.am
index ec524ef..655896d 100644
--- a/themes/xfce/Makefile.am
+++ b/themes/xfce/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
diff --git a/themes/b5/gtk-3.0/Makefile.am b/themes/xfce/gtk-3.0/Makefile.am
similarity index 52%
copy from themes/b5/gtk-3.0/Makefile.am
copy to themes/xfce/gtk-3.0/Makefile.am
index ee99671..51d5846 100644
--- a/themes/b5/gtk-3.0/Makefile.am
+++ b/themes/xfce/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-b5/gtk-3.0
+themedir = $(datadir)/themes/Xfce/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/redmondxp/gtk-3.0/gtk.css b/themes/xfce/gtk-3.0/gtk.css
similarity index 53%
copy from themes/redmondxp/gtk-3.0/gtk.css
copy to themes/xfce/gtk-3.0/gtk.css
index 5892444..d792e95 100644
--- a/themes/redmondxp/gtk-3.0/gtk.css
+++ b/themes/xfce/gtk-3.0/gtk.css
@@ -1,50 +1,102 @@
+/* Created July 2006
+ * Modified Dec. 2006
+ * Modified Jan. 2007
+ * Modified Jul. 2008 for xfce 4.6
+ * Modified Feb. 2009 for xfce 4.6
+ * Olivier Fourdan <fourdan at xfce.org>
+ * Ported from gtk-2.0 to gtk-3.0 by Peter de Ridder <peter at xfce.org>
+ * Released under the GPL license
+ */
@define-color fg_active #000000;
- at define-color fg_insensitive #7f7f79;
- at define-color fg_normal #000000;
- at define-color fg_prelight #000000;
- at define-color fg_selected #ffffff;
-
- 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 #e5e5e5;
- at define-color base_insensitive #efebdf;
+ at define-color fg_insensitive #888a85;
+ at define-color fg_normal #101010;
+ at define-color fg_prelight #101010;
+ at define-color fg_selected #000000;
+
+ at define-color bg_active #d9d7d6;
+ at define-color bg_insensitive #eeeeec;
+ at define-color bg_normal #eeeeec;
+ at define-color bg_prelight #eeeeec;
+ at define-color bg_selected #d9d7d6;
+
+ at define-color base_active #d9d7d6;
+ at define-color base_insensitive #eeeeec;
@define-color base_normal #ffffff;
- at define-color base_prelight #efebdf;
- at define-color base_selected #0055ef;
+ at define-color base_prelight #eeeeec;
+ at define-color base_selected #bad8ff;
- at define-color text_active #000000;
- at define-color text_insensitive #000000;
- at define-color text_normal #000000;
- at define-color text_prelight #000000;
- at define-color text_selected #ffffff;
+ at define-color text_active #101010;
+ at define-color text_insensitive #101010;
+ at define-color text_normal #101010;
+ at define-color text_prelight #101010;
+ at define-color text_selected #101010;
* {
engine: xfce;
-xfce-smooth-edge: true;
+ -xfce-grip-style: disabled;
- -GtkButton-default-border : 0;
- -GtkButton-default-outside-border: 0;
- -GtkButton-default-spacing : 10;
-GtkWidget-focus-line-width : 1;
-GtkWidget-focus-padding : 0;
- -GtkCheckButton-indicator-size : 14;
- -GtkMenuBar-shadow-type : out;
- -GtkMenuItem-selected-shadow-type: none;
+ -GtkWidget-interior-focus : 0;
+ -GtkWidget-internal-padding : 0;
+
+ -GtkButton-child-displacement-x : 0;
+ -GtkButton-child-displacement-y : 1;
+ -GtkButton-default-border : 0;
+ -GtkButton-default-outside-border: 0;
+ /*-GtkButton-focus-line-pattern : "\0";*/
+
+ -GtkButtonBox-child-internal-pad-x: 0;
+ -GtkButtonBox-child-internal-pad-y: 0;
+ -GtkButtonBox-child-min-height : 0;
+ -GtkButtonBox-child-min-width : 0;
+
+ -GtkCheckButton-indicator-size : 12;
+ /*-GtkCheckButton-focus-line-pattern: "\1\1";*/
+
+ /*-GtkEntry-focus-line-pattern : "\0";*/
+
+ /*-GtkRadioButton-focus-line-pattern: "\1\1";*/
+
+ -GtkExpander-expander-size : 11;
+ -GtkExpander-expander-spacing : 0;
+
+ -GtkMenuBar-internal-padding : 0;
+
+ -GtkMenu-horizontal-padding : 0;
+ -GtkMenu-vertical-padding : 0;
+
+ -GtkMenuItem-internal-padding : 2;
+ -GtkMenuItem-selected-shadow-type: etched-in;
+
+ -GtkOptionMenu-indicator-size : 0;
+ -GtkOptionMenu-indicator-spacing : 0;
+
/*GtkPaned::handle_full_size : 1*/
+ -GtkPaned-handle-full-size : 3;
+
-GtkRange-slider-width : 15;
-GtkRange-stepper-size : 15;
-GtkRange-stepper-spacing : 0;
-GtkRange-trough-border : 0;
+
+ -GtkScale-trough-size-details : 1;
+ -GtkScale-value-spacing : 0;
+
+ -GtkScrollbar-has-backward-stepper: 1;
-GtkScrollbar-min-slider-length : 20;
- -GtkToolbar-shadow-type : out;
- -GtkWidget-interior-focus : 1;
- -GtkWidget-internal-padding : 4;
+
+ /*-GtkTextView-focus-line-pattern : "\0";*/
+
+ -GtkToolbar-internal-padding : 0;
+ -GtkToolbar-space-size : 10;
+
+ -GtkTreeView-expander-size : 11;
+ -GtkTreeView-horizontal-separator: 0;
+ -GtkTreeView-vertical-separator : 0;
border-width: 2 2;
@@ -82,8 +134,6 @@
color: @text_normal;
background-color: @base_normal;
border-color: darker(@bg_normal);
-
- border-width: 1 1;
}
.view:active, .entry:active {
@@ -244,192 +294,198 @@ GtkCalendar:selected {
}
.progressbar {
- 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);
+ color: #4e9a06;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.9)));
+ border-color: darker(#cce2ff);
- border-width: 1 1;
+ border-width: 0 0;
}
-.trough {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.9)), to(shade(@bg_normal, 1.1)));
+.progressbar.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.9)));
}
-.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);
+.trough {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#e8e8e6, 0.9)), to(shade(#e8e8e6, 1.1)));
+ border-color: darker(#e8e8e6);
}
-.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);
+.trough.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#e8e8e6, 0.9)), to(shade(#e8e8e6, 1.1)));
}
.notebook {
- background-color: #fafaf2;
- border-color: darker(#fafaf2);
+ color: #101010;
+ background-color: #ffffff;
+ border-color: darker(#ffffff);
border-width: 1 1;
}
.notebook tab {
color: @fg_active;
- background-color: #d4d4ce;
- border-color: darker(#d4d4ce);
+ background-color: #e8e8e6;
+ border-color: darker(#e8e8e6);
}
.notebook tab:active {
- color: @fg_normal;
- background-color: #fafaf2;
- border-color: darker(#fafaf2);
+ color: #101010;
+ background-color: #ffffff;
+ border-color: darker(#ffffff);
}
.menu {
- background-color: #ffffff;
- border-color: darker(#ffffff);
+ background-color: #fafaf7;
+ border-color: darker(#fafaf7);
+}
- border-width: 1 1;
+.menuitem {
+ background-color: #fafaf7;
+ border-color: darker(#fafaf7);
+
+ border-width: 1 2;
}
-.menu:active {
- color: #ffffff;
- background-color: #0055ef;
- border-color: darker(#0055ef);
+.menu:active, .memuitem:active {
+ color: #101010;
+ background-color: @bg_active;
+ border-color: darker(@bg_active);
}
-.menu:insensitive {
- background-color: #ffffff;
- border-color: darker(#ffffff);
+.menu:insensitive, .menuitem:insensitive {
+ background-color: #fafaf7;
+ border-color: darker(#fafaf7);
}
-.menu:hover {
- color: #ffffff;
- background-color: #0055ef;
- border-color: darker(#0055ef);
+.menu:hover, .menuitem:hover {
+ color: #101010;
+ background-color: #cce2ff;
+ border-color: darker(#cce2ff);
}
-.menu:selected {
+.menu:selected, .menuitem:selected {
+ color: #101010;
background-color: @bg_selected;
border-color: darker(@bg_selected);
}
.menubar {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.9)), to(shade(@bg_normal, 1.1)));
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.0)), to(shade(#eeeeec, 0.9)));
+ border-color: darker(#eeeeec);
- border-width: 2 2;
+ border-width: 1 2;
}
.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);
+ color: #101010;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.9)), to(shade(@bg_active, 1.0)));
+ border-color: darker(@bg_active);
}
.menubar:insensitive {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.9)), to(shade(@bg_insensitive, 1.1)));
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.0)), to(shade(#eeeeec, 0.9)));
+ border-color: darker(#eeeeec);
}
.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);
+ color: #101010;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.0)), to(shade(#cce2ff, 0.9)));
+ border-color: darker(#cce2ff);
}
.menubar:selected {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.1)), to(shade(@bg_selected, 0.9)));
+ color: #101010;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.0)));
+ border-color: darker(@bg_selected);
}
.button {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#fafaf2, 1.1)), to(shade(#fafaf2, 0.9)));
- border-color: darker(#fafaf2);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#eeeeec, 1.1)), to(shade(#eeeeec, 0.95)));
+ border-color: darker(#eeeeec);
}
.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);
+ color: #000000;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 0.95)), to(shade(#d3d7cf, 1.1)));
+ border-color: darker(#d3d7cf);
}
.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);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.95)));
+ border-color: darker(@bg_insensitive);
}
.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);
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 0.95)), to(shade(#d3d7cf, 1.1)));
+ border-color: darker(#d3d7cf);
}
.button:selected {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.1)));
+ color: #ffffff;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#3465a4, 1.1)), to(shade(#3465a4, 0.95)));
+ border-color: darker(#3465a4);
}
-.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);
+.tooltip {
+ color: #101010;
+ background-color: #ffffdf;
+ border-color: darker(#ffffdf);
}
-.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);
+.scrollbar {
+ -xfce-grip-style: rough;
}
-.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, .slider.horizontal {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d9d7d6, 1.1)), to(shade(#d9d7d6, 0.9)));
+ border-color: darker(#d9d7d6);
}
-.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:active, .slider.horizontal:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#e8e8e6, 0.9)), to(shade(#e8e8e6, 1.1)));
+ border-color: darker(#e8e8e6);
}
-.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.horizontal:insensitive, .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.vertical, .scrollbar.slider.vertical {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(#c6d3ff, 1.1)), to(shade(#c6d3ff, 0.9)));
- border-color: darker(#c6d3ff);
+.button.horizontal:hover, .slider.horizontal:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.9)));
+ border-color: darker(#cce2ff);
}
-.button.vertical:active, .scrollbar.slider.vertical:active {
- 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, 1.1)), to(shade(@bg_insensitive, 0.9)));
- border-color: darker(@bg_insensitive);
+.button.horizontal:selected, .slider.horizontal:selected {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.1)));
+ border-color: darker(@bg_selected);
}
-.button.vertical:hover, .scrollbar.slider.vertical:hover {
- 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, .slider.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#d9d7d6, 1.1)), to(shade(#d9d7d6, 0.9)));
+ border-color: darker(#d9d7d6);
}
-.button.vertical:selected, .scrollbar.slider.vertical:selected {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(#efebdf, 0.9)), to(shade(#efebdf, 1.1)));
- border-color: darker(#efebdf);
+.button.vertical:active, .slider.vertical:active {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#e8e8e6, 0.9)), to(shade(#e8e8e6, 1.1)));
+ border-color: darker(#e8e8e6);
}
-.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);
+.button.vertical:insensitive, .slider.vertical:insensitive {
+ 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);
}
-.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);
+.button.vertical:hover, .slider.vertical:hover {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(#cce2ff, 1.1)), to(shade(#cce2ff, 0.9)));
+ border-color: darker(#cce2ff);
}
-.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);
+.button.vertical:selected, .slider.vertical:selected {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.1)));
+ border-color: darker(@bg_selected);
}
-.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);
+.radio {
+ -GtkCheckButton-indicator-size: 14;
}
More information about the Xfce4-commits
mailing list