[Xfce4-commits] <gtk-xfce-engine:peter/gtk3> Converting more themes to Gtk 3
Peter de Ridder
noreply at xfce.org
Tue Oct 18 21:34:02 CEST 2011
Updating branch refs/heads/peter/gtk3
to e40aac426d54806bd1965a7409e6d6abadd62ef0 (commit)
from c770fd81eb3b659abfedc5d61e6c3200c894989c (commit)
commit e40aac426d54806bd1965a7409e6d6abadd62ef0
Author: Peter de Ridder <peter at xfce.org>
Date: Tue Oct 18 21:31:43 2011 +0200
Converting more themes to Gtk 3
Xfce-cadmium, Xfce-curve
configure.in.in | 2 +
themes/cadmium/Makefile.am | 3 +-
themes/{light => cadmium}/gtk-3.0/Makefile.am | 2 +-
themes/cadmium/gtk-3.0/gtk.css | 339 +++++++++++++++++++++++++
themes/curve/Makefile.am | 3 +-
themes/{light => curve}/gtk-3.0/Makefile.am | 2 +-
themes/{smooth => curve}/gtk-3.0/gtk.css | 94 ++++++--
7 files changed, 422 insertions(+), 23 deletions(-)
diff --git a/configure.in.in b/configure.in.in
index 3b02473..2417cf5 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -113,8 +113,10 @@ themes/xfce-4.6/gtk-2.0/Makefile
themes/basic/gtk-2.0/Makefile
themes/basic/Makefile
themes/cadmium/gtk-2.0/Makefile
+themes/cadmium/gtk-3.0/Makefile
themes/cadmium/Makefile
themes/curve/gtk-2.0/Makefile
+themes/curve/gtk-3.0/Makefile
themes/curve/Makefile
themes/dawn/gtk-2.0/Makefile
themes/dawn/Makefile
diff --git a/themes/cadmium/Makefile.am b/themes/cadmium/Makefile.am
index 8b23789..2ffbe0a 100644
--- a/themes/cadmium/Makefile.am
+++ b/themes/cadmium/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-cadmium
diff --git a/themes/light/gtk-3.0/Makefile.am b/themes/cadmium/gtk-3.0/Makefile.am
similarity index 50%
copy from themes/light/gtk-3.0/Makefile.am
copy to themes/cadmium/gtk-3.0/Makefile.am
index 60f0b49..42e966d 100644
--- a/themes/light/gtk-3.0/Makefile.am
+++ b/themes/cadmium/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-light/gtk-3.0
+themedir = $(datadir)/themes/Xfce-cadmium/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css
new file mode 100644
index 0000000..d8be6b8
--- /dev/null
+++ b/themes/cadmium/gtk-3.0/gtk.css
@@ -0,0 +1,339 @@
+
+ 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;
+
+* {
+ engine: xfce;
+
+ -xfce-smooth-edge: true;
+ -xfce-grip-style: disabled;
+
+ -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;
+ -GtkMenuBar-shadow-type : out;
+ /*GtkPaned::handle_full_size : 1*/
+ -GtkPaned-handle-size : 7;
+ -GtkRange-slider-width : 12;
+ -GtkRange-stepper-size : 12;
+ -GtkRange-stepper-spacing : 0;
+ -GtkRange-trough-border : 0;
+ -GtkScrollbar-min-slider-length : 20;
+ -GtkToolBar-shadow-type : out;
+ -GtkWidget-interior-focus : 5;
+ -GtkWidget-internal-padding : 2;
+
+ border-width: 2 2;
+
+ color: @fg_normal;
+ background-color: @bg_normal;
+ border-color: darker(@bg_normal);
+}
+
+*:active {
+ color: @fg_active;
+ background-color: @bg_active;
+ border-color: darker(@bg_active);
+}
+
+*:insensitive {
+ color: @fg_insensitive;
+ background-color: @bg_insensitive;
+ border-color: darker(@bg_insensitive);
+ text-shadow: 1 1 white
+}
+
+*:hover {
+ color: @fg_prelight;
+ background-color: @bg_prelight;
+ border-color: darker(@bg_prelight);
+}
+
+*:selected {
+ color: @fg_selected;
+ background-color: @bg_selected;
+ border-color: darker(@bg_selected);
+}
+
+.view, .entry {
+ color: @text_normal;
+ background-color: @base_normal;
+ border-color: darker(@bg_normal);
+}
+
+.view:active, .entry:active {
+ color: @text_active;
+ background-color: @base_active;
+ border-color: darker(@bg_normal);
+}
+
+.view:insensitive, .entry:insensitive {
+ color: @text_insensitive;
+ background-color: @base_insensitive;
+ border-color: darker(@bg_normal);
+}
+
+.view:hover, .entry:hover {
+ color: @text_prelight;
+ background-color: @base_prelight;
+ border-color: darker(@bg_normal);
+}
+
+.view:selected, .entry:selected {
+ color: @text_selected;
+ background-color: @base_selected;
+ border-color: darker(@bg_normal);
+}
+
+.view row:nth-child(odd) {
+ background-color: shade(@base_normal, 0.93);
+}
+
+.view row:nth-child(odd):active {
+ background-color: shade(@base_active, 0.93);
+}
+
+.view row:nth-child(odd):insensitive {
+ background-color: shade(@base_insensitive, 0.93);
+}
+
+.view row:nth-child(odd):hover {
+ background-color: shade(@base_prelight, 0.93);
+}
+
+.view row:nth-child(odd):selected {
+ background-color: shade(@base_selected, 0.93);
+}
+
+GtkCalendar {
+ color: @text_normal;
+}
+
+.button, .header {
+ color: @fg_normal;
+}
+
+GtkCalendar:active {
+ color: @text_active;
+}
+
+GtkCalendar:insensitive {
+ color: @text_insensitive;
+}
+
+GtkCalendar:hover {
+ color: @text_prelight;
+}
+
+GtkCalendar:selected {
+ color: @text_selected;
+}
+
+.highlight {
+ color: @text_active;
+ background-color: @base_active;
+}
+
+GtkCalendar:inconsistent {
+ color: mix(lighter(@bg_normal), darker(@bg_normal), 0.5);
+}
+
+GtkCalendar:selected {
+ color: @text_active;
+ background-color: @base_active;
+}
+
+.check, .radio {
+ color: @text_normal;
+ background-color: @base_normal;
+ border-color: @fg_normal;
+}
+
+.check:active, .radio:active {
+ color: @text_normal;
+ background-color: @base_normal;
+ border-color: @fg_normal;
+}
+
+.check:insensitive, .radio:insensitive {
+ color: @text_insensitive;
+ background-color: @base_insensitive;
+ border-color: @fg_insensitive;
+}
+
+.check:hover, .radio:hover {
+ color: @text_prelight;
+ background-color: @base_prelight;
+ border-color: @fg_prelight;
+}
+
+.check:selected, .radio:selected {
+ color: @text_active;
+ background-color: @base_active;
+ border-color: @fg_active;
+}
+
+.cell {
+ color: @text_normal;
+}
+
+.cell:active {
+ color: @text_active;
+}
+
+.cell:insensitive {
+ color: @text_insensitive;
+}
+
+.cell:hover {
+ color: @text_prelight;
+}
+
+.cell:selected {
+ color: @text_selected;
+}
+
+.spinbutton.button {
+ color: @fg_normal;
+ background-color: @bg_normal;
+}
+
+.spinbutton.button:active {
+ color: @fg_active;
+ background-color: @bg_active;
+}
+
+.spinbutton.button:insensitive {
+ color: @fg_insensitive;
+ background-color: @bg_insensitive;
+}
+
+.spinbutton.button:hover {
+ color: @fg_prelight;
+ background-color: @bg_prelight;
+}
+
+.spinbutton.button:selected {
+ color: @fg_selected;
+ background-color: @bg_selected;
+}
+
+.progressbar {
+ background-color: @bg_prelight;
+ border-color: darker(@bg_prelight);
+}
+
+.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);
+}
+
+.trough.vertical {
+ background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_active, 1.0)), to(shade(@bg_active, 2.0)));
+ border-color: darker(@bg_active);
+}
+
+.notebook tab {
+ color: @fg_active;
+ background-color: @bg_active;
+ border-color: darker(@bg_active);
+}
+
+.notebook tab:active {
+ color: @fg_normal;
+ background-color: @bg_normal;
+ 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)));
+}
+
+.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)));
+}
+
+.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, .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, .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, .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, .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, .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;
+}
+
+.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)));
+}
diff --git a/themes/curve/Makefile.am b/themes/curve/Makefile.am
index 50dea53..8dd05df 100644
--- a/themes/curve/Makefile.am
+++ b/themes/curve/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-curve
diff --git a/themes/light/gtk-3.0/Makefile.am b/themes/curve/gtk-3.0/Makefile.am
similarity index 51%
copy from themes/light/gtk-3.0/Makefile.am
copy to themes/curve/gtk-3.0/Makefile.am
index 60f0b49..4ee6cde 100644
--- a/themes/light/gtk-3.0/Makefile.am
+++ b/themes/curve/gtk-3.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(datadir)/themes/Xfce-light/gtk-3.0
+themedir = $(datadir)/themes/Xfce-curve/gtk-3.0
theme_DATA = gtk.css
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/smooth/gtk-3.0/gtk.css b/themes/curve/gtk-3.0/gtk.css
similarity index 66%
copy from themes/smooth/gtk-3.0/gtk.css
copy to themes/curve/gtk-3.0/gtk.css
index e0ac32d..39e95b1 100644
--- a/themes/smooth/gtk-3.0/gtk.css
+++ b/themes/curve/gtk-3.0/gtk.css
@@ -1,27 +1,27 @@
@define-color fg_active #000000;
- at define-color fg_insensitive #969696;
+ at define-color fg_insensitive #000000;
@define-color fg_normal #000000;
- at define-color fg_prelight #000000;
- at define-color fg_selected #000000;
+ at define-color fg_prelight #ffffff;
+ at define-color fg_selected #7f7f7f;
- 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 bg_active #cccccc;
+ at define-color bg_insensitive #d8d8d8;
+ at define-color bg_normal #e5e5e5;
+ at define-color bg_prelight #f5f5f5;
+ at define-color bg_selected #4464ac;
- at define-color base_active #a5abba;
- at define-color base_insensitive #ffffff;
+ at define-color base_active #99a6bf;
+ at define-color base_insensitive #d8d8d8;
@define-color base_normal #ffffff;
- at define-color base_prelight #eaeaea;
- at define-color base_selected #a5abba;
+ at define-color base_prelight #e5e5e5;
+ at define-color base_selected #4464ac;
- at define-color text_active #000000;
+ at define-color text_active #ffffff;
@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 #ffffff;
* {
engine: xfce;
@@ -30,10 +30,11 @@
-GtkButton-default-border : 0;
-GtkButton-default-outside-border: 0;
- -GtkButton-default-spacing : 5;
+ -GtkButton-default-spacing : 2;
-GtkWidget-focus-line-width : 1;
-GtkWidget-focus-padding : 0;
-GtkCheckButton-indicator-size : 14;
+ -GtkMenuBar-shadow-type : out;
-GtkMenuItem-selected-shadow-type: out;
/*GtkPaned::handle_full_size : 1*/
-GtkRange-slider-width : 15;
@@ -41,7 +42,14 @@
-GtkRange-stepper-spacing : 0;
-GtkRange-trough-border : 0;
-GtkScrollbar-min-slider-length : 20;
- -GtkWidget-interior-focus : 1;
+ -GtkStatusBar-shadow-type : in;
+ -GtkToolbar-shadow-type : out;
+ /*GtkWidget::focus-line-pattern : "\0"*/
+ -GtkWidget-focus-line-width : 1;
+ -GtkWidget-interior-focus : 0;
+ -GtkWidget-internal-padding : 2;
+
+ border-width: 2 2;
color: @fg_normal;
background-color: @bg_normal;
@@ -237,14 +245,32 @@ GtkCalendar:selected {
}
.progressbar {
- background-color: @bg_prelight;
- border-color: darker(@bg_prelight);
+ -xfce-smooth-edge: false;
+
+ border-width: 1 1;
+
+ color: #ffffff;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4464ac, 0.8)), to(shade(#4464ac, 1.8)));
+ border-color: darker(#4464ac);
+}
+
+.trough {
+ -xfce-smooth-edge: false;
border-width: 1 1;
+
+ color: #ffffff;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
+ border-color: darker(@bg_normal);
}
-.scale.trough, .scrollbar.trough {
+.trough.scale, .trough.scrollbar {
+ -xfce-smooth-edge: true;
+
+ border-width: 2 2;
+
background-color: @bg_active;
+ background-image: none;
border-color: darker(@bg_active);
}
@@ -260,3 +286,33 @@ GtkCalendar:selected {
border-color: darker(@bg_normal);
}
+.dock:hover, .menubar:hover, .toolbar:hover {
+ color: #ffffff;
+ background-color: #4464ac;
+ border-color: darker(#4464ac);
+}
+
+.menuitem {
+ -xfce-smooth-edge: false;
+
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.8)), to(shade(@bg_normal, 1.8)));
+}
+
+.menuitem:active {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_active, 0.8)), to(shade(@bg_active, 1.8)));
+}
+
+.menuitem:insensitive {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.8)), to(shade(@bg_insensitive, 1.8)));
+}
+
+.menuitem:hover {
+ color: #ffffff;
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4464ac, 0.8)), to(shade(#4464ac, 1.0)));
+ border-color: darker(#4464ac);
+}
+
+.menuitem:selected {
+ background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.8)), to(shade(@bg_selected, 1.8)));
+}
+
More information about the Xfce4-commits
mailing list