[Xfce4-commits] <gtk-xfce-engine:peter/gtk3> Started on converting gradient themes to Gtk 3
Peter de Ridder
noreply at xfce.org
Sun Nov 13 14:42:01 CET 2011
Updating branch refs/heads/peter/gtk3
to 1fa76c110247ec0f456da415a7ef6530c37c48b4 (commit)
from e40aac426d54806bd1965a7409e6d6abadd62ef0 (commit)
commit 1fa76c110247ec0f456da415a7ef6530c37c48b4
Author: Peter de Ridder <peter at xfce.org>
Date: Sun Nov 13 14:36:43 2011 +0100
Started on converting gradient themes to Gtk 3
Xfce-dawn, Xfce-dusk, Xfce-kde2, Xfce-kolors, Xfce-winter
configure.in.in | 5 +
themes/dawn/Makefile.am | 3 +-
themes/{b5 => dawn}/gtk-3.0/Makefile.am | 2 +-
themes/{cadmium => dawn}/gtk-3.0/gtk.css | 140 ++++++++++----------
themes/dusk/Makefile.am | 3 +-
themes/{b5 => dusk}/gtk-3.0/Makefile.am | 2 +-
themes/{cadmium => dusk}/gtk-3.0/gtk.css | 152 +++++++++++-----------
themes/kde2/Makefile.am | 3 +-
themes/{b5 => kde2}/gtk-3.0/Makefile.am | 2 +-
themes/{smooth => kde2}/gtk-3.0/gtk.css | 87 +++++++++----
themes/kolors/Makefile.am | 3 +-
themes/{smooth => kolors}/gtk-3.0/Makefile.am | 2 +-
themes/{cadmium => kolors}/gtk-3.0/gtk.css | 173 +++++++++++++------------
themes/winter/Makefile.am | 3 +-
themes/{smooth => winter}/gtk-3.0/Makefile.am | 2 +-
themes/{cadmium => winter}/gtk-3.0/gtk.css | 171 +++++++++++++++----------
16 files changed, 421 insertions(+), 332 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 2417cf5..bae092d 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -119,12 +119,16 @@ themes/curve/gtk-2.0/Makefile
themes/curve/gtk-3.0/Makefile
themes/curve/Makefile
themes/dawn/gtk-2.0/Makefile
+themes/dawn/gtk-3.0/Makefile
themes/dawn/Makefile
themes/dusk/gtk-2.0/Makefile
+themes/dusk/gtk-3.0/Makefile
themes/dusk/Makefile
themes/kolors/gtk-2.0/Makefile
+themes/kolors/gtk-3.0/Makefile
themes/kolors/Makefile
themes/kde2/gtk-2.0/Makefile
+themes/kde2/gtk-3.0/Makefile
themes/kde2/Makefile
themes/light/Makefile
themes/light/gtk-2.0/Makefile
@@ -143,6 +147,7 @@ themes/stellar/gtk-2.0/Makefile
themes/stellar/gtk-3.0/Makefile
themes/stellar/Makefile
themes/winter/gtk-2.0/Makefile
+themes/winter/gtk-3.0/Makefile
themes/winter/Makefile
themes/Makefile
])
diff --git a/themes/dawn/Makefile.am b/themes/dawn/Makefile.am
index 3237f52..3678158 100644
--- a/themes/dawn/Makefile.am
+++ b/themes/dawn/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-dawn
diff --git a/themes/b5/gtk-3.0/Makefile.am b/themes/dawn/gtk-3.0/Makefile.am
similarity index 51%
copy from themes/b5/gtk-3.0/Makefile.am
copy to themes/dawn/gtk-3.0/Makefile.am
index ee99671..0c75afe 100644
--- a/themes/b5/gtk-3.0/Makefile.am
+++ b/themes/dawn/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-b5/gtk-3.0
+themedir = $(datadir)/themes/Xfce-dawn/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/dawn/gtk-3.0/gtk.css
similarity index 64%
copy from themes/cadmium/gtk-3.0/gtk.css
copy to themes/dawn/gtk-3.0/gtk.css
index d8be6b8..1a48901 100644
--- a/themes/cadmium/gtk-3.0/gtk.css
+++ b/themes/dawn/gtk-3.0/gtk.css
@@ -1,27 +1,27 @@
- at define-color fg_active #000000;
+ at define-color fg_active #1f1f1f;
@define-color fg_insensitive #8e8e8a;
- at define-color fg_normal #000000;
+ at define-color fg_normal #1f1f1f;
@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 #bfbfbc;
+ at define-color bg_insensitive #ebe8e4;
+ at define-color bg_normal #ebe8e4;
+ at define-color bg_prelight #b0c0d0;
+ at define-color bg_selected #b0c0d0;
- at define-color base_active #cececa;
- at define-color base_insensitive #eeeeef;
+ at define-color base_active #bfbfbc;
+ at define-color base_insensitive #ebe8e4;
@define-color base_normal #ffffff;
- at define-color base_prelight #d8dbe0;
- at define-color base_selected #ddddea;
+ at define-color base_prelight #b0c0d0;
+ at define-color base_selected #699dc9;
- at define-color text_active #000000;
- at define-color text_insensitive #000000;
- at define-color text_normal #000000;
+ at define-color text_active #1f1f1f;
+ at define-color text_insensitive #1f1f1f;
+ at define-color text_normal #1f1f1f;
@define-color text_prelight #000000;
- at define-color text_selected #000000;
+ at define-color text_selected #ffffff;
* {
engine: xfce;
@@ -33,22 +33,24 @@
-GtkButton-default-outside-border: 0;
-GtkButton-child-displacement-x : 0;
-GtkButton-child-displacement-y : 1;
- -GtkButton-default-spacing : 5;
- -GtkWidget-focus-line-width : 1;
- -GtkWidget-focus-padding : 2;
+ -GtkButton-default-spacing : 8;
-GtkCheckButton-indicator-size : 12;
- -GtkMenuBar-internal-padding : 0;
+ -GtkMenuBar-interal-padding : 4;
-GtkMenuBar-shadow-type : out;
+ -GtkHandleBox-shadow-type : out;
+ -GtkMenuItem-selected-shadow-type: etched-in;
/*GtkPaned::handle_full_size : 1*/
- -GtkPaned-handle-size : 7;
- -GtkRange-slider-width : 12;
- -GtkRange-stepper-size : 12;
+ -GtkPaned-handle-size : 7;
+ -GtkRange-slider-width : 16;
+ -GtkRange-stepper-size : 16;
-GtkRange-stepper-spacing : 0;
-GtkRange-trough-border : 0;
-GtkScrollbar-min-slider-length : 20;
- -GtkToolBar-shadow-type : out;
+ -GtkToolbar-shadow-type : out;
+ -GtkWidget-focus-line-width : 1;
+ -GtkWidget-focus-padding : 3;
-GtkWidget-interior-focus : 5;
- -GtkWidget-internal-padding : 2;
+ -GtkWidget-internal-padding : 5;
border-width: 2 2;
@@ -136,7 +138,7 @@ GtkCalendar {
color: @text_normal;
}
-.button, .header {
+.header {
color: @fg_normal;
}
@@ -246,20 +248,36 @@ GtkCalendar:selected {
}
.progressbar {
- background-color: @bg_prelight;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 1.1)), to(shade(@bg_prelight, 1.0)));
border-color: darker(@bg_prelight);
+
+ border-width: 1 1;
+}
+
+.progressbar.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_prelight, 1.1)), to(shade(@bg_prelight, 1.0)));
+ border-color: darker(@bg_prelight);
+
+ border-width: 1 1;
}
.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-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.0)), to(shade(@bg_normal, 1.1)));
}
.trough.vertical {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 2.0)));
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_normal, 1.0)), to(shade(@bg_normal, 1.1)));
+}
+
+.scale.trough, .scrollbar.trough {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 1.1)));
border-color: darker(@bg_active);
}
+.scale.vertical, .scrollbar.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 1.1)));
+}
+
.notebook tab {
color: @fg_active;
background-color: @bg_active;
@@ -272,68 +290,52 @@ GtkCalendar:selected {
border-color: darker(@bg_normal);
}
-.dock, .menubar, .toolbar {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.05)), to(shade(@bg_normal, 0.95)));
+.button, .slider.horizontal {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.1)), to(shade(@bg_normal, 1.0)));
+
+ -GtkWidget-focus-padding: 0;
}
-.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)));
+.button:active, .slider.horizontal:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 1.1)));
}
-.dock: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)));
+.button:insensitive, .slider.horizontal:insensitive {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 1.0)));
}
-.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)));
+.button:hover, .slider.horizontal:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 1.1)), to(shade(@bg_prelight, 1.0)));
}
-.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)));
+.button:selected, .slider.horizontal:selected {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.0)), to(shade(@bg_selected, 1.1)));
}
-.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.vertical, .slider.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_normal, 1.1)), to(shade(@bg_normal, 1.0)));
}
-.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.vertical:active, .slider.vertical:active {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 1.1)));
}
-.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)));
+.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, 1.0)));
}
-.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)));
+.button.vertical:hover, .slider.vertical:hover {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_prelight, 1.1)), to(shade(@bg_prelight, 1.0)));
}
-.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)));
+.button.vertical:selected, .slider.vertical:selected {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 1.0)), to(shade(@bg_selected, 1.1)));
}
.menuitem {
border-width: 1 2;
}
-.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, .progressbar.vertical:active {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 2.0)), to(shade(@bg_active, 1.0)));
-}
-
-.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, .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, .progressbar.vertical:selected {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 2.0)), to(shade(@bg_selected, 1.0)));
+.radio {
+ -GtkCheckButton-indicator-size: 14;
}
diff --git a/themes/dusk/Makefile.am b/themes/dusk/Makefile.am
index ca92df8..1f13d4b 100644
--- a/themes/dusk/Makefile.am
+++ b/themes/dusk/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-dusk
diff --git a/themes/b5/gtk-3.0/Makefile.am b/themes/dusk/gtk-3.0/Makefile.am
similarity index 51%
copy from themes/b5/gtk-3.0/Makefile.am
copy to themes/dusk/gtk-3.0/Makefile.am
index ee99671..7391e83 100644
--- a/themes/b5/gtk-3.0/Makefile.am
+++ b/themes/dusk/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-b5/gtk-3.0
+themedir = $(datadir)/themes/Xfce-dusk/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/dusk/gtk-3.0/gtk.css
similarity index 60%
copy from themes/cadmium/gtk-3.0/gtk.css
copy to themes/dusk/gtk-3.0/gtk.css
index d8be6b8..35ac922 100644
--- a/themes/cadmium/gtk-3.0/gtk.css
+++ b/themes/dusk/gtk-3.0/gtk.css
@@ -1,27 +1,27 @@
- at define-color fg_active #000000;
- at define-color fg_insensitive #8e8e8a;
- at define-color fg_normal #000000;
- at define-color fg_prelight #000000;
- at 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 base_active #cececa;
- at define-color base_insensitive #eeeeef;
- at define-color base_normal #ffffff;
- at define-color base_prelight #d8dbe0;
- at define-color base_selected #ddddea;
-
- 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 fg_active #dadada;
+ at define-color fg_insensitive #151515;
+ at define-color fg_normal #ffffff;
+ at define-color fg_prelight #fcfcfc;
+ at define-color fg_selected #fcfcfc;
+
+ at define-color bg_active #151515;
+ at define-color bg_insensitive #303030;
+ at define-color bg_normal #232323;
+ at define-color bg_prelight #003263;
+ at define-color bg_selected #002849;
+
+ at define-color base_active #2f519a;
+ at define-color base_insensitive #303030;
+ at define-color base_normal #121212;
+ at define-color base_prelight #002849;
+ at define-color base_selected #003263;
+
+ at define-color text_active #fcfcfc;
+ at define-color text_insensitive #fcfcfc;
+ at define-color text_normal #fcfcfc;
+ at define-color text_prelight #fcfcfc;
+ at define-color text_selected #fcfcfc;
* {
engine: xfce;
@@ -33,24 +33,33 @@
-GtkButton-default-outside-border: 0;
-GtkButton-child-displacement-x : 0;
-GtkButton-child-displacement-y : 1;
- -GtkButton-default-spacing : 5;
- -GtkWidget-focus-line-width : 1;
- -GtkWidget-focus-padding : 2;
- -GtkCheckButton-indicator-size : 12;
- -GtkMenuBar-internal-padding : 0;
+ -GtkButton-default-spacing : 4;
+ -GtkCheckButton-indicator-size : 8;
+ -GtkMenuBar-internal-paddinc : 1;
-GtkMenuBar-shadow-type : out;
+ -GtkHandleBox-shadow-type : out;
+ -GtkMenuItem-selected-shadow-type: etched-in;
/*GtkPaned::handle_full_size : 1*/
- -GtkPaned-handle-size : 7;
+ -GtkPaned-handle-size : 4;
-GtkRange-slider-width : 12;
- -GtkRange-stepper-size : 12;
+ -GtkRange-stepper-size : 10;
-GtkRange-stepper-spacing : 0;
-GtkRange-trough-border : 0;
- -GtkScrollbar-min-slider-length : 20;
- -GtkToolBar-shadow-type : out;
- -GtkWidget-interior-focus : 5;
+ -GtkScrollbar-has-backward-stepper: 1;
+ -GtkScrollbar-has-secondary-backward-stepper: 0;
+ -GtkScrollbar-min-slider-length : 10;
+ -GtkToolbar-shadow-type : out;
+ -GtkWidget-focus-line-width : 1;
+ -GtkWidget-focus-padding : 1;
+ -GtkWidget-interior-focus : 1;
-GtkWidget-internal-padding : 2;
+ -GtkEntry-cursor-color : #fcfcfc;
+ -GtkEntry-secondary-cursor-color : #fcfcfc;
+ -GtkTesxView-cursor-color : #fcfcfc;
+ -GtkTesxView-secondary-cursor-color: #fcfcfc;
+ -GtkEntry-cursor-aspect-ratio : 0.1;
- border-width: 2 2;
+ border-width: 1 1;
color: @fg_normal;
background-color: @bg_normal;
@@ -136,7 +145,7 @@ GtkCalendar {
color: @text_normal;
}
-.button, .header {
+.header {
color: @fg_normal;
}
@@ -248,15 +257,17 @@ GtkCalendar:selected {
.progressbar {
background-color: @bg_prelight;
border-color: darker(@bg_prelight);
+
+ border-width: 1 1;
}
-.trough {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 2.0)));
+.scale.trough, .scrollbar.trough {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 1.25)));
border-color: darker(@bg_active);
}
-.trough.vertical {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 2.0)));
+.trough.horizontal {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 1.25)));
border-color: darker(@bg_active);
}
@@ -272,68 +283,57 @@ GtkCalendar:selected {
border-color: darker(@bg_normal);
}
-.dock, .menubar, .toolbar {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.05)), to(shade(@bg_normal, 0.95)));
+.radio {
+ -GtkCheckButton-indicator-size: 10;
}
-.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)));
-}
-
-.dock: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)));
+.menuitem {
+ border-width: 1 2;
}
-.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)));
-}
+.button, .slider.horizontal {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.25)), to(shade(@bg_normal, 1.0)));
-.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);
+ -GtkWidget-focus-padding: 0;
}
-.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:active, .slider.horizontal:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 1.25)));
}
-.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)));
+.button:insensitive, .slider.horizontal:insensitive {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.25)), to(shade(@bg_insensitive, 1.0)));
}
-.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)));
+.button:hover, .slider.horizontal:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 1.25)), to(shade(@bg_prelight, 1.0)));
}
-.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)));
+.button:selected, .slider.horizontal:selected {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.0)), to(shade(@bg_selected, 1.25)));
}
.menuitem {
border-width: 1 2;
}
-.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 {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_normal, 1.25)), to(shade(@bg_normal, 1.0)));
}
-.slider.vertical:active, .progressbar.vertical:active {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 2.0)), to(shade(@bg_active, 1.0)));
+.slider.vertical:active {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 1.25)), to(shade(@bg_active, 1.0)));
}
-.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:insensitive {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_insensitive, 1.25)), to(shade(@bg_insensitive, 1.0)));
}
-.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:hover {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_prelight, 1.25)), to(shade(@bg_prelight, 1.0)));
}
-.slider.vertical:selected, .progressbar.vertical:selected {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 2.0)), to(shade(@bg_selected, 1.0)));
+.slider.vertical:selected {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 1.25)), to(shade(@bg_selected, 1.0)));
}
+
diff --git a/themes/kde2/Makefile.am b/themes/kde2/Makefile.am
index 688adad..62d49cd 100644
--- a/themes/kde2/Makefile.am
+++ b/themes/kde2/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-kde2
diff --git a/themes/b5/gtk-3.0/Makefile.am b/themes/kde2/gtk-3.0/Makefile.am
similarity index 51%
copy from themes/b5/gtk-3.0/Makefile.am
copy to themes/kde2/gtk-3.0/Makefile.am
index ee99671..feeaf9d 100644
--- a/themes/b5/gtk-3.0/Makefile.am
+++ b/themes/kde2/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-b5/gtk-3.0
+themedir = $(datadir)/themes/Xfce-kde2/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/smooth/gtk-3.0/gtk.css b/themes/kde2/gtk-3.0/gtk.css
similarity index 67%
copy from themes/smooth/gtk-3.0/gtk.css
copy to themes/kde2/gtk-3.0/gtk.css
index e0ac32d..abbd72a 100644
--- a/themes/smooth/gtk-3.0/gtk.css
+++ b/themes/kde2/gtk-3.0/gtk.css
@@ -1,27 +1,27 @@
- at define-color fg_active #000000;
- at define-color fg_insensitive #969696;
- at define-color fg_normal #000000;
- at define-color fg_prelight #000000;
- at define-color fg_selected #000000;
-
- at define-color bg_active #c2c2be;
- at define-color bg_insensitive #e2e2de;
- at define-color bg_normal #e2e2de;
- at define-color bg_prelight #f2f2ee;
- at define-color bg_selected #a5abba;
-
- at define-color base_active #a5abba;
- at define-color base_insensitive #ffffff;
- at define-color base_normal #ffffff;
- at define-color base_prelight #eaeaea;
- at define-color base_selected #a5abba;
-
- 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 fg_active rgb(25%, 25%, 25%);
+ at define-color fg_insensitive rgb(72%, 72%, 72%);
+ at define-color fg_normal rgb(0%, 0%, 0%);
+ at define-color fg_prelight rgb(0%, 0%, 0%);
+ at define-color fg_selected rgb(100%, 100%, 100%);
+
+ at define-color bg_active rgb(93%, 93%, 93%);
+ at define-color bg_insensitive rgb(86%, 86%, 86%);
+ at define-color bg_normal rgb(86%, 86%, 86%);
+ at define-color bg_prelight rgb(93%, 93%, 93%);
+ at define-color bg_selected rgb(4%, 47%, 54%);
+
+ at define-color base_active rgb(86%, 86%, 86%);
+ at define-color base_insensitive rgb(86%, 86%, 86%);
+ at define-color base_normal rgb(100%, 100%, 100%);
+ at define-color base_prelight rgb(93%, 93%, 93%);
+ at define-color base_selected rgb(4%, 47%, 54%);
+
+ at define-color text_active rgb(0%, 0%, 0%);
+ at define-color text_insensitive rgb(72%, 72%, 72%);
+ at define-color text_normal rgb(0%, 0%, 0%);
+ at define-color text_prelight rgb(0%, 0%, 0%);
+ at define-color text_selected rgb(100%, 100%, 100%);
* {
engine: xfce;
@@ -30,18 +30,24 @@
-GtkButton-default-border : 0;
-GtkButton-default-outside-border: 0;
- -GtkButton-default-spacing : 5;
+ -GtkButton-default-spacing : 12;
-GtkWidget-focus-line-width : 1;
-GtkWidget-focus-padding : 0;
-GtkCheckButton-indicator-size : 14;
- -GtkMenuItem-selected-shadow-type: out;
+ -GtkMenuItem-selected-shadow-type: in;
/*GtkPaned::handle_full_size : 1*/
-GtkRange-slider-width : 15;
-GtkRange-stepper-size : 15;
- -GtkRange-stepper-spacing : 0;
-GtkRange-trough-border : 0;
+ -GtkSpinButton-shadow-type : in;
+ -GtkScrollbar-has-backward-stepper: 1;
+ -GtkScrollbar-has-forward-stepper: 1;
+ -GtkScrollbar-has-secondary-backward-stepper: 1;
-GtkScrollbar-min-slider-length : 20;
- -GtkWidget-interior-focus : 1;
+ -GtkWidget-focus-padding : 2;
+ -GtkWidget-interior-focus : 2;
+
+ border-width: 2 2;
color: @fg_normal;
background-color: @bg_normal;
@@ -127,7 +133,7 @@ GtkCalendar {
color: @text_normal;
}
-.button, .header {
+.header {
color: @fg_normal;
}
@@ -260,3 +266,28 @@ GtkCalendar:selected {
border-color: darker(@bg_normal);
}
+.dock, .menubar, .toolbar {
+ border-width: 3 3;
+}
+
+.button {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.1)), to(shade(@bg_normal, 0.9)));
+
+ border-width: 3 3;
+}
+
+.button:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.9)), to(shade(@bg_active, 1.1)));
+}
+
+.button:insensitive {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.1)), to(shade(@bg_insensitive, 0.9)));
+}
+
+.button:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 1.1)), to(shade(@bg_prelight, 0.9)));
+}
+
+.button:selected {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.1)));
+}
diff --git a/themes/kolors/Makefile.am b/themes/kolors/Makefile.am
index d16e379..ce29426 100644
--- a/themes/kolors/Makefile.am
+++ b/themes/kolors/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-kolors
diff --git a/themes/smooth/gtk-3.0/Makefile.am b/themes/kolors/gtk-3.0/Makefile.am
similarity index 50%
copy from themes/smooth/gtk-3.0/Makefile.am
copy to themes/kolors/gtk-3.0/Makefile.am
index b40191e..f558f78 100644
--- a/themes/smooth/gtk-3.0/Makefile.am
+++ b/themes/kolors/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-smooth/gtk-3.0
+themedir = $(datadir)/themes/Xfce-kolors/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/kolors/gtk-3.0/gtk.css
similarity index 60%
copy from themes/cadmium/gtk-3.0/gtk.css
copy to themes/kolors/gtk-3.0/gtk.css
index d8be6b8..2f46e49 100644
--- a/themes/cadmium/gtk-3.0/gtk.css
+++ b/themes/kolors/gtk-3.0/gtk.css
@@ -1,27 +1,27 @@
- at define-color fg_active #000000;
- at define-color fg_insensitive #8e8e8a;
- at define-color fg_normal #000000;
- at define-color fg_prelight #000000;
- at 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 base_active #cececa;
- at define-color base_insensitive #eeeeef;
- at define-color base_normal #ffffff;
- at define-color base_prelight #d8dbe0;
- at define-color base_selected #ddddea;
-
- 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 fg_active #1f1f1f;
+ at define-color fg_insensitive #BFBCB2;
+ at define-color fg_normal #1f1f1f;
+ at define-color fg_prelight #1f1f1f;
+ at define-color fg_selected #1f1f1f;
+
+ at define-color bg_active #E4E0D5;
+ at define-color bg_insensitive #E4E0D5;
+ at define-color bg_normal #eeeee6;
+ at define-color bg_prelight #ffdd76;
+ at define-color bg_selected #ffdd76;
+
+ at define-color base_active #fef4d6;
+ at define-color base_insensitive #fdfdfd;
+ at define-color base_normal #fdfdfd;
+ at define-color base_prelight #ffdd76;
+ at define-color base_selected #ffdd76;
+
+ at define-color text_active #1f1f1f;
+ at define-color text_insensitive #e9e9e9;
+ at define-color text_normal #1f1f1f;
+ at define-color text_prelight #1f1f1f;
+ at define-color text_selected #1f1f1f;
* {
engine: xfce;
@@ -31,26 +31,27 @@
-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-line-width : 1;
- -GtkWidget-focus-padding : 2;
- -GtkCheckButton-indicator-size : 12;
- -GtkMenuBar-internal-padding : 0;
+ -GtkButton-default-spacing : 11;
+ -GtkWidget-focus-padding : 0;
+ -GtkCheckButton-indicator-size : 14;
-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 : 11;
+ -GtkRange-stepper-size : 13;
-GtkRange-stepper-spacing : 0;
-GtkRange-trough-border : 0;
-GtkScrollbar-min-slider-length : 20;
+ -GtkScrollbar-has-backward-stepper: 1;
+ -GtkScrollbar-has-secondary-backward-stepper: 1;
+ -GtkStatusBar-shadow-type : in;
-GtkToolBar-shadow-type : out;
- -GtkWidget-interior-focus : 5;
- -GtkWidget-internal-padding : 2;
+ /*-GtkWidget-focus-line-pattern : "\0";*/
+ -GtkWidget-focus-line-width : 1;
+ -GtkWidget-interior-focus : 1;
+ -GtkWidget-internal-padding : 0;
- border-width: 2 2;
+ border-width: 1 1;
color: @fg_normal;
background-color: @bg_normal;
@@ -136,7 +137,7 @@ GtkCalendar {
color: @text_normal;
}
-.button, .header {
+.header {
color: @fg_normal;
}
@@ -170,10 +171,18 @@ 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 : 10;
}
.check:active, .radio:active {
@@ -246,20 +255,36 @@ GtkCalendar:selected {
}
.progressbar {
- background-color: @bg_prelight;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 1.1)), to(shade(@bg_prelight, 0.9)));
border-color: darker(@bg_prelight);
+
+ border-width: 1 1;
+}
+
+.progressbar.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_prelight, 1.1)), to(shade(@bg_prelight, 0.9)));
+ border-color: darker(@bg_prelight);
+
+ border-width: 1 1;
}
.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-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_active, 1.0)), to(shade(@bg_active, 2.0)));
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_normal, 0.9)), to(shade(@bg_normal, 1.1)));
+}
+
+.scale.trough, .scrollbar.trough {
+ 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.vertical, .scrollbar.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 0.9)), to(shade(@bg_active, 1.1)));
+}
+
.notebook tab {
color: @fg_active;
background-color: @bg_active;
@@ -273,67 +298,49 @@ GtkCalendar:selected {
}
.dock, .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)));
-}
-
-.dock: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)));
+ border-width: 1 2;
}
-.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)));
-}
+.button, .slider.horizontal {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.1)), to(shade(@bg_normal, 0.9)));
-.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)));
+ border-width: 1 1;
}
-.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:active, .slider.horizontal:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.9)), to(shade(@bg_active, 1.1)));
}
-.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: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)));
}
-.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)));
+.button:hover, .slider.horizontal:hover {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 1.1)), to(shade(@bg_prelight, 0.9)));
}
-.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)));
+.button: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)));
}
-.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)));
-}
-
-.menuitem {
- border-width: 1 2;
-}
+.button.vertical, .slider.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_normal, 1.1)), to(shade(@bg_normal, 0.9)));
-.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);
+ border-width: 1 1;
}
-.slider.vertical:active, .progressbar.vertical:active {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 2.0)), to(shade(@bg_active, 1.0)));
+.button.vertical:active, .slider.vertical:active {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 0.9)), to(shade(@bg_active, 1.1)));
}
-.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)));
+.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)));
}
-.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)));
+.button.vertical:hover, .slider.vertical:hover {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_prelight, 1.1)), to(shade(@bg_prelight, 0.9)));
}
-.slider.vertical:selected, .progressbar.vertical:selected {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 2.0)), to(shade(@bg_selected, 1.0)));
+.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)));
}
diff --git a/themes/winter/Makefile.am b/themes/winter/Makefile.am
index bbdaa7f..a33498e 100644
--- a/themes/winter/Makefile.am
+++ b/themes/winter/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-winter
diff --git a/themes/smooth/gtk-3.0/Makefile.am b/themes/winter/gtk-3.0/Makefile.am
similarity index 50%
copy from themes/smooth/gtk-3.0/Makefile.am
copy to themes/winter/gtk-3.0/Makefile.am
index b40191e..f541a99 100644
--- a/themes/smooth/gtk-3.0/Makefile.am
+++ b/themes/winter/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-smooth/gtk-3.0
+themedir = $(datadir)/themes/Xfce-winter/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/winter/gtk-3.0/gtk.css
similarity index 60%
copy from themes/cadmium/gtk-3.0/gtk.css
copy to themes/winter/gtk-3.0/gtk.css
index d8be6b8..74763ff 100644
--- a/themes/cadmium/gtk-3.0/gtk.css
+++ b/themes/winter/gtk-3.0/gtk.css
@@ -1,54 +1,54 @@
@define-color fg_active #000000;
- at define-color fg_insensitive #8e8e8a;
+ at define-color fg_insensitive #808080;
@define-color fg_normal #000000;
@define-color fg_prelight #000000;
- at define-color fg_selected #000000;
+ at define-color fg_selected #224466;
- 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 #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 base_active #cececa;
- at define-color base_insensitive #eeeeef;
- at define-color base_normal #ffffff;
- at define-color base_prelight #d8dbe0;
- at define-color base_selected #ddddea;
+ 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;
@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 #000000;
+ at define-color text_selected #224466;
* {
engine: xfce;
-xfce-smooth-edge: true;
- -xfce-grip-style: disabled;
+ -xfce-grip-style: slide;
-GtkButton-default-border : 0;
-GtkButton-default-outside-border: 0;
- -GtkButton-child-displacement-x : 0;
- -GtkButton-child-displacement-y : 1;
- -GtkButton-default-spacing : 5;
+ -GtkButton-default-spacing : 10;
-GtkWidget-focus-line-width : 1;
- -GtkWidget-focus-padding : 2;
- -GtkCheckButton-indicator-size : 12;
- -GtkMenuBar-internal-padding : 0;
+ -GtkWidget-focus-padding : 0;
+ -GtkCheckButton-indicator-size : 14;
-GtkMenuBar-shadow-type : out;
+ -GtkMenuItem-selected-shadow-type: out;
/*GtkPaned::handle_full_size : 1*/
- -GtkPaned-handle-size : 7;
- -GtkRange-slider-width : 12;
- -GtkRange-stepper-size : 12;
+ -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 : out;
+ -GtkToolbar-shadow-type : none;
+ -GtkWidget-focus-line-width : 1;
+ -GtkWidget-focus-padding : 2;
-GtkWidget-interior-focus : 5;
- -GtkWidget-internal-padding : 2;
+ -GtkWidget-internal-padding : 0;
border-width: 2 2;
@@ -89,9 +89,9 @@
}
.view:active, .entry:active {
- color: @text_active;
+ color: #224466;
background-color: @base_active;
- border-color: darker(@bg_normal);
+ border-color: darker(#A4B8CB);
}
.view:insensitive, .entry:insensitive {
@@ -101,9 +101,9 @@
}
.view:hover, .entry:hover {
- color: @text_prelight;
+ color: #224466;
background-color: @base_prelight;
- border-color: darker(@bg_normal);
+ border-color: darker(#B3C8DD);
}
.view:selected, .entry:selected {
@@ -136,7 +136,7 @@ GtkCalendar {
color: @text_normal;
}
-.button, .header {
+.header {
color: @fg_normal;
}
@@ -246,20 +246,36 @@ GtkCalendar:selected {
}
.progressbar {
- background-color: @bg_prelight;
+ 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);
+
+ border-width: 1 1;
}
.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-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_active, 1.0)), to(shade(@bg_active, 2.0)));
+ 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)));
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 tab {
color: @fg_active;
background-color: @bg_active;
@@ -273,67 +289,90 @@ GtkCalendar:selected {
}
.dock, .menubar, .toolbar {
- background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 1.05)), to(shade(@bg_normal, 0.95)));
+ border-width: 1 2;
}
.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)));
+ color: #224466;
+ background-color: #A4B8CB;
+ border-color: darker(#A4B8CB);
}
-.dock: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 {
+ color: #224466;
+ background-color: #B3C8DD;
+ border-color: darker(#B3C8DD);
}
-.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)));
+.menuitem {
+ 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;
}
-.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)));
+.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;
}
-.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: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: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: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: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)));
+.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: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)));
+.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: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 {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
}
-.menuitem {
- border-width: 1 2;
+.slider:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 1.8)), to(shade(@bg_active, 0.8)));
+}
+
+.slider:insensitive {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.8)), to(shade(@bg_insensitive, 1.8)));
+}
+
+.slider: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;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.8)), to(shade(@bg_selected, 0.8)));
}
-.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);
+.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)));
}
-.slider.vertical:active, .progressbar.vertical:active {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 2.0)), to(shade(@bg_active, 1.0)));
+.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)));
}
-.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)));
+.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)));
}
-.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)));
+.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)));
}
-.slider.vertical:selected, .progressbar.vertical:selected {
- background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 2.0)), to(shade(@bg_selected, 1.0)));
+.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)));
}
More information about the Xfce4-commits
mailing list