Updating branch refs/heads/master to c770fd81eb3b659abfedc5d61e6c3200c894989c (commit) from 5bec77f3d932c49e09700ff0293c25dd1d932874 (commit)
commit c770fd81eb3b659abfedc5d61e6c3200c894989c Author: Peter de Ridder <pe...@xfce.org> Date: Tue Oct 18 21:29:28 2011 +0200 Improved compatibility between Gtk 2 and Gtk 3 theme Xfce-b5, Xfce-light, Xfce-saltlake, Xfce-smooth, Xfce-stellar themes/b5/gtk-3.0/gtk.css | 116 +++++++++++++++++++++++++++++++------ themes/light/gtk-3.0/gtk.css | 120 +++++++++++++++++++++++++++++++++------ themes/saltlake/gtk-3.0/gtk.css | 117 +++++++++++++++++++++++++++++++------- themes/smooth/gtk-3.0/gtk.css | 119 ++++++++++++++++++++++++++++++++------- themes/stellar/gtk-3.0/gtk.css | 116 +++++++++++++++++++++++++++++++------ 5 files changed, 494 insertions(+), 94 deletions(-) diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css index 80a3060..363f506 100644 --- a/themes/b5/gtk-3.0/gtk.css +++ b/themes/b5/gtk-3.0/gtk.css @@ -47,61 +47,120 @@ color: @fg_normal; background-color: @bg_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } *:active { color: @fg_active; background-color: @bg_active; - border-color: shade(@bg_active, 0.7); + border-color: darker(@bg_active); } *:insensitive { color: @fg_insensitive; background-color: @bg_insensitive; - border-color: shade(@bg_insensitive, 0.7); + border-color: darker(@bg_insensitive); + text-shadow: 1 1 white } *:hover { color: @fg_prelight; background-color: @bg_prelight; - border-color: shade(@bg_prelight, 0.7); + border-color: darker(@bg_prelight); } *:selected { color: @fg_selected; background-color: @bg_selected; - border-color: shade(@bg_selected, 0.7); + border-color: darker(@bg_selected); } .view, .entry { color: @text_normal; background-color: @base_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:active, .entry:active { color: @text_active; background-color: @base_active; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:insensitive, .entry:insensitive { color: @text_insensitive; background-color: @base_insensitive; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:hover, .entry:hover { color: @text_prelight; background-color: @base_prelight; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:selected, .entry:selected { color: @text_selected; background-color: @base_selected; - border-color: shade(@bg_normal, 0.7); + 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 { @@ -154,31 +213,51 @@ color: @text_selected; } -/* -.spinbutton { +.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 { +.scale.trough, .scrollbar.trough { background-color: @bg_active; + border-color: darker(@bg_active); } -.notebook { +.notebook tab { color: @fg_active; background-color: @bg_active; - border-color: shade(@bg_active, 0.7); + border-color: darker(@bg_active); } -.notebook:active { +.notebook tab:active { color: @fg_normal; background-color: @bg_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .slider { @@ -189,5 +268,6 @@ .slider:active { background-color: #f0ebef; + border-color: darker(#f0ebef); } diff --git a/themes/light/gtk-3.0/gtk.css b/themes/light/gtk-3.0/gtk.css index 8cdd2be..b97a076 100644 --- a/themes/light/gtk-3.0/gtk.css +++ b/themes/light/gtk-3.0/gtk.css @@ -47,61 +47,120 @@ color: @fg_normal; background-color: @bg_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } *:active { color: @fg_active; background-color: @bg_active; - border-color: shade(@bg_active, 0.7); + border-color: darker(@bg_active); } *:insensitive { color: @fg_insensitive; background-color: @bg_insensitive; - border-color: shade(@bg_insensitive, 0.7); + border-color: darker(@bg_insensitive); + text-shadow: 1 1 white } *:hover { color: @fg_prelight; background-color: @bg_prelight; - border-color: shade(@bg_prelight, 0.7); + border-color: darker(@bg_prelight); } *:selected { color: @fg_selected; background-color: @bg_selected; - border-color: shade(@bg_selected, 0.7); + border-color: darker(@bg_selected); } .view, .entry { color: @text_normal; background-color: @base_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:active, .entry:active { color: @text_active; background-color: @base_active; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:insensitive, .entry:insensitive { color: @text_insensitive; background-color: @base_insensitive; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:hover, .entry:hover { color: @text_prelight; background-color: @base_prelight; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:selected, .entry:selected { color: @text_selected; background-color: @base_selected; - border-color: shade(@bg_normal, 0.7); + 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; +} + +.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 { @@ -154,48 +213,73 @@ color: @text_selected; } -/* -.spinbutton { +.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); border-width: 1 1; } -.trough { +.scale.trough, .scrollbar.trough { background-color: @bg_active; + border-color: darker(@bg_active); } -.notebook { +.notebook tab { color: @fg_active; background-color: #d4d4ce; - border-color: shade(@bg_active, 0.7); + border-color: darker(#d4d4ce); } -.notebook:active { +.notebook tab:active { color: @fg_normal; background-color: #f8f8ef; - border-color: shade(@bg_normal, 0.7); + border-color: darker(#f8f8ef); } .button { + color: @fg_normal; background-color: #f8f8ef; + border-color: darker(#f8f8ef); } .button:active { background-color: #cfcfc4; + border-color: darker(#cfcfc4); } .button:insensitive { background-color: #f8f8ef; + border-color: darker(#f8f8ef); } .button:hover { background-color: #f5f5dd; + border-color: darker(#f5f5dd); } diff --git a/themes/saltlake/gtk-3.0/gtk.css b/themes/saltlake/gtk-3.0/gtk.css index 46f40c5..1131bc2 100644 --- a/themes/saltlake/gtk-3.0/gtk.css +++ b/themes/saltlake/gtk-3.0/gtk.css @@ -48,61 +48,120 @@ color: @fg_normal; background-color: @bg_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } *:active { color: @fg_active; background-color: @bg_active; - border-color: shade(@bg_active, 0.7); + border-color: darker(@bg_active); } *:insensitive { color: @fg_insensitive; background-color: @bg_insensitive; - border-color: shade(@bg_insensitive, 0.7); + border-color: darker(@bg_insensitive); + text-shadow: 1 1 white } *:hover { color: @fg_prelight; background-color: @bg_prelight; - border-color: shade(@bg_prelight, 0.7); + border-color: darker(@bg_prelight); } *:selected { color: @fg_selected; background-color: @bg_selected; - border-color: shade(@bg_selected, 0.7); + border-color: darker(@bg_selected); } .view, .entry { color: @text_normal; background-color: @base_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:active, .entry:active { color: @text_active; background-color: @base_active; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:insensitive, .entry:insensitive { color: @text_insensitive; background-color: @base_insensitive; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:hover, .entry:hover { color: @text_prelight; background-color: @base_prelight; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:selected, .entry:selected { color: @text_selected; background-color: @base_selected; - border-color: shade(@bg_normal, 0.7); + 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 { @@ -155,33 +214,51 @@ color: @text_selected; } -/* -.spinbutton { +.spinbutton.button { color: @fg_normal; background-color: @bg_normal; } -*/ -.progressbar { +.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; +} - border-width: 1 1; +.spinbutton.button:selected { + color: @fg_selected; + background-color: @bg_selected; +} + +.progressbar { + background-color: @bg_prelight; + border-color: darker(@bg_prelight); } -.trough { +.scale.trough, .scrollbar.trough { background-color: @bg_active; + border-color: darker(@bg_active); } -.notebook { +.notebook tab { color: @fg_active; background-color: @bg_active; - border-color: shade(@bg_active, 0.7); + border-color: darker(@bg_active); } -.notebook:active { +.notebook tab:active { color: @fg_normal; background-color: @bg_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .menuitem { diff --git a/themes/smooth/gtk-3.0/gtk.css b/themes/smooth/gtk-3.0/gtk.css index 9321849..e0ac32d 100644 --- a/themes/smooth/gtk-3.0/gtk.css +++ b/themes/smooth/gtk-3.0/gtk.css @@ -6,8 +6,8 @@ @define-color fg_selected #000000; @define-color bg_active #c2c2be; -@define-color bg_insensitive #c2c2be; -@define-color bg_normal #c2c2be; +@define-color bg_insensitive #e2e2de; +@define-color bg_normal #e2e2de; @define-color bg_prelight #f2f2ee; @define-color bg_selected #a5abba; @@ -45,61 +45,120 @@ color: @fg_normal; background-color: @bg_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } *:active { color: @fg_active; background-color: @bg_active; - border-color: shade(@bg_active, 0.7); + border-color: darker(@bg_active); } *:insensitive { color: @fg_insensitive; background-color: @bg_insensitive; - border-color: shade(@bg_insensitive, 0.7); + border-color: darker(@bg_insensitive); + text-shadow: 1 1 white } *:hover { color: @fg_prelight; background-color: @bg_prelight; - border-color: shade(@bg_prelight, 0.7); + border-color: darker(@bg_prelight); } *:selected { color: @fg_selected; background-color: @bg_selected; - border-color: shade(@bg_selected, 0.7); + border-color: darker(@bg_selected); } .view, .entry { color: @text_normal; background-color: @base_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:active, .entry:active { color: @text_active; background-color: @base_active; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:insensitive, .entry:insensitive { color: @text_insensitive; background-color: @base_insensitive; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:hover, .entry:hover { color: @text_prelight; background-color: @base_prelight; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:selected, .entry:selected { color: @text_selected; background-color: @base_selected; - border-color: shade(@bg_normal, 0.7); + 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 { @@ -152,32 +211,52 @@ color: @text_selected; } -/* -.spinbutton { +.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); border-width: 1 1; } -.trough { +.scale.trough, .scrollbar.trough { background-color: @bg_active; + border-color: darker(@bg_active); } -.notebook { +.notebook tab { color: @fg_active; background-color: @bg_active; - border-color: shade(@bg_active, 0.7); + border-color: darker(@bg_active); } -.notebook:active { +.notebook tab:active { color: @fg_normal; background-color: @bg_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } diff --git a/themes/stellar/gtk-3.0/gtk.css b/themes/stellar/gtk-3.0/gtk.css index a893bd4..60a2731 100644 --- a/themes/stellar/gtk-3.0/gtk.css +++ b/themes/stellar/gtk-3.0/gtk.css @@ -51,61 +51,120 @@ color: @fg_normal; background-color: @bg_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } *:active { color: @fg_active; background-color: @bg_active; - border-color: shade(@bg_active, 0.7); + border-color: darker(@bg_active); } *:insensitive { color: @fg_insensitive; background-color: @bg_insensitive; - border-color: shade(@bg_insensitive, 0.7); + border-color: darker(@bg_insensitive); + text-shadow: 1 1 white } *:hover { color: @fg_prelight; background-color: @bg_prelight; - border-color: shade(@bg_prelight, 0.7); + border-color: darker(@bg_prelight); } *:selected { color: @fg_selected; background-color: @bg_selected; - border-color: shade(@bg_selected, 0.7); + border-color: darker(@bg_selected); } .view, .entry { color: @text_normal; background-color: @base_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:active, .entry:active { color: @text_active; background-color: @base_active; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:insensitive, .entry:insensitive { color: @text_insensitive; background-color: @base_insensitive; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:hover, .entry:hover { color: @text_prelight; background-color: @base_prelight; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .view:selected, .entry:selected { color: @text_selected; background-color: @base_selected; - border-color: shade(@bg_normal, 0.7); + 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 { @@ -158,35 +217,56 @@ color: @text_selected; } -/* -.spinbutton { +.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 { +.scale.trough, .scrollbar.trough { background-color: @bg_active; + border-color: darker(@bg_active); } -.notebook { +.notebook tab { color: @fg_active; background-color: @bg_active; - border-color: shade(@bg_active, 0.7); + border-color: darker(@bg_active); } -.notebook:active { +.notebook tab:active { color: @fg_normal; background-color: @bg_normal; - border-color: shade(@bg_normal, 0.7); + border-color: darker(@bg_normal); } .menu:hover { color: #FFFFFF; background-color: #9BA0B0; + border-color: darker(#9BA0B0); } _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits