From 86cf7c85bc1d9390e9b59336e34635f3c8de33db Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sun, 26 Apr 2015 16:07:18 +0200 Subject: ContrastHigh GTK3: add support for GtkScale + adjust color definition --- .../ContrastHigh/gtk-3.0/gtk-widgets.css | 338 +++++++++++++++++---- desktop-themes/ContrastHigh/gtk-3.0/gtk.css | 20 +- .../ContrastHigh/gtk-3.0/mate-applications.css | 34 +-- 3 files changed, 301 insertions(+), 91 deletions(-) (limited to 'desktop-themes/ContrastHigh') diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css index 2ed0e060..bac5fb62 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css @@ -49,8 +49,8 @@ GtkClutterOffscreen { } *:selected { - background-color: @theme_active_color; - color: @theme_base_color; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; } .gtkstyle-fallback { @@ -60,12 +60,12 @@ GtkClutterOffscreen { .gtkstyle-fallback:prelight { background-color: @theme_fg_color; - color: @theme_base_color; + color: @theme_selected_fg_color; } .gtkstyle-fallback:active { - background-color: @theme_active_color; - color: @theme_base_color; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; } .gtkstyle-fallback:insensitive { @@ -74,8 +74,8 @@ GtkClutterOffscreen { } .gtkstyle-fallback:selected { - background-color: @theme_active_color; - color: @theme_base_color; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; } /******** @@ -88,7 +88,7 @@ GtkCheckButton:selected:focus { } .image { - color: @theme_active_color; + color: @theme_selected_bg_color; } .image:hover { @@ -179,8 +179,8 @@ GtkColorSwatch { * Colored states * ******************/ .info { - background-color: @theme_active_color; - color: @theme_base_color; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; } .warning { @@ -319,6 +319,7 @@ GtkLevelBar.vertical { background-color: @theme_button_bg; padding: 1px 4px; color: @theme_button_fg; + text-shadow: none; } .button.image-button { @@ -345,13 +346,15 @@ GtkLevelBar.vertical { } .button.flat.hover { + text-shadow: none; border-radius: 3px; } .button:active, .button:checked { + text-shadow: none; background-color: @theme_button_active_bg; - color: @theme_base_color; + color: @theme_selected_fg_color; border-color: @theme_button_fg; } @@ -376,13 +379,15 @@ GtkLevelBar.vertical { } .button:hover { + text-shadow: none; background-color: @theme_fg_color; border-color: @theme_fg_color; - color: @theme_base_color; + color: @theme_selected_fg_color; } .button:hover:active, .button:hover:checked { + text-shadow: none; background-color: @theme_fg_color; border-color: @theme_fg_color; } @@ -411,14 +416,14 @@ GtkComboBox *:insensitive { } .entry:selected { - background-color: @theme_active_color; - color: @theme_base_color; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; } /* needed for webkit/GtkStyle compatibility */ .entry:active { - background-color: @theme_active_color; - color: @theme_base_color; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; } .entry:focus { @@ -461,8 +466,8 @@ GtkComboBox .button { .combobox-entry .button:active, .combobox-entry .button:checked { - background-color: @theme_active_color; - color: @theme_base_color; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; } .combobox-entry .button:insensitive { @@ -525,7 +530,7 @@ GtkComboBox .button { ***************/ .spinbutton .button { padding: 2px 6px; - color: @theme_active_color; + color: @theme_selected_bg_color; border-width: 1px; border-radius: 0; @@ -536,9 +541,9 @@ GtkComboBox .button { } .spinbutton .button:hover { - background-color: @theme_active_color; + background-color: @theme_selected_bg_color; color: @theme_insensitive_bg; - border-color: transparent @theme_active_color; + border-color: transparent @theme_selected_bg_color; } .spinbutton .button:insensitive { @@ -595,8 +600,8 @@ GtkComboBox .button { } .menuitem:hover { - color: @theme_base_color; - background-color: @theme_active_color; + color: @theme_selected_fg_color; + background-color: @theme_selected_bg_color; } .menu .menuitem { @@ -688,7 +693,7 @@ GtkComboBox .button { border-color: @theme_button_insensitive_active_bg; background-color: @theme_button_insensitive_active_bg; - color: @theme_base_color; + color: @theme_selected_fg_color; } /******************* @@ -714,14 +719,14 @@ GtkComboBox .button { } .inline-toolbar .button:hover { - color: @theme_base_color; + color: @theme_selected_fg_color; border-color: @theme_button_linked_border; box-shadow: none; } .inline-toolbar .button:active, .inline-toolbar .button:checked { - color: @theme_base_color; + color: @theme_selected_fg_color; border-color: @theme_button_linked_border; } @@ -1129,7 +1134,7 @@ GtkScale.slider { background-color: @theme_button_bg; border-radius: 15px; - border-color: @theme_active_color; + border-color: @theme_selected_bg_color; border-style: solid; border-width: 1px; } @@ -1230,7 +1235,6 @@ GtkSwitch.trough:active:insensitive { .notebook :hover { -gtk-image-effect: highlight; - color: @theme_fg_color; } .notebook.frame.top { @@ -1330,8 +1334,8 @@ GtkSwitch.trough:active:insensitive { .notebook tab.top:hover { background-image: linear-gradient(to bottom, - alpha(@theme_active_color, 0.2), - alpha(@theme_active_color, 0.5)); + alpha(@theme_selected_bg_color, 0.2), + alpha(@theme_selected_bg_color, 0.5)); border-radius: 0px; border-width: 0px 1px 0px 1px; border-style: solid; @@ -1352,8 +1356,8 @@ GtkSwitch.trough:active:insensitive { .notebook tab.bottom:hover { background-image: linear-gradient(to top, - alpha(@theme_active_color, 0.0), - alpha(@theme_active_color, 0.3)); + alpha(@theme_selected_bg_color, 0.0), + alpha(@theme_selected_bg_color, 0.3)); border-radius: 0px; border-width: 0px 1px 0px 1px; border-style: solid; @@ -1379,8 +1383,8 @@ GtkSwitch.trough:active:insensitive { .notebook tab.left:hover { background-image: linear-gradient(to right, - alpha(@theme_active_color, 0.0), - alpha(@theme_active_color, 0.3)); + alpha(@theme_selected_bg_color, 0.0), + alpha(@theme_selected_bg_color, 0.3)); border-width: 1px 0px 1px 0px; border-style: solid; border-color: @borders; @@ -1398,8 +1402,8 @@ GtkSwitch.trough:active:insensitive { .notebook tab.right:hover { background-image: linear-gradient(to left, - alpha(@theme_active_color, 0.0), - alpha(@theme_active_color, 0.3)); + alpha(@theme_selected_bg_color, 0.0), + alpha(@theme_selected_bg_color, 0.3)); border-width: 1px 0px 1px 0px; border-style: solid; border-color: @borders; @@ -1407,8 +1411,8 @@ GtkSwitch.trough:active:insensitive { .notebook tab.reorderable-page:hover { background-image: linear-gradient(to bottom, - alpha(@theme_active_color, 0.0), - alpha(@theme_active_color, 0.3)); + alpha(@theme_selected_bg_color, 0.0), + alpha(@theme_selected_bg_color, 0.3)); border-radius: 0; box-shadow: inset 1px 0 alpha(@borders, 0.6), inset -1px 0 alpha(@borders, 0.6); border-style: none; @@ -1441,12 +1445,12 @@ GtkSwitch.trough:active:insensitive { .notebook tab.prelight-page .button, .notebook .active-page .button, .notebook tab.active-page .button { - color: mix(@theme_fg_color, @theme_active_color, 0.6); + color: mix(@theme_fg_color, @theme_selected_bg_color, 0.6); icon-shadow: 0 1px @button_text_shadow; } .notebook tab .button:hover { - color: @theme_fg_color; + color: @theme_selected_fg_color; border-color: transparent; border-image: none; background-image: none; @@ -1472,7 +1476,7 @@ GtkSwitch.trough:active:insensitive { } .notebook.arrow:hover { - color: @theme_active_color; + color: @theme_selected_bg_color; } .notebook.arrow:active { @@ -1673,7 +1677,7 @@ column-header.button { column-header .button:hover { background-color: @theme_fg_color; - color: @theme_base_color; + color: @theme_selected_fg_color; border-color: @theme_fg_color; } @@ -1689,7 +1693,7 @@ column-header:first-child .button { border-width: 1px; border-style: solid; border-color: @theme_check_radio_border; - color: @theme_active_color; + color: @theme_selected_bg_color; background-color: @theme_check_radio_bg; } @@ -1723,7 +1727,7 @@ GtkCheckButton:insensitive { .menuitem.check:checked, .menuitem.radio:inconsistent, .menuitem.check:inconsistent { - color: @theme_active_color; + color: @theme_selected_bg_color; } .menuitem.radio:active:hover, @@ -1732,7 +1736,7 @@ GtkCheckButton:insensitive { .menuitem.check:checked:hover, .menuitem.radio:inconsistent:hover, .menuitem.check:inconsistent:hover { - color: @theme_base_color; + color: @theme_selected_fg_color; } .menuitem.radio:active:insensitive, @@ -1749,11 +1753,214 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { outline-offset: 0; } +/************ + * GtkScale * + ************/ +.scale, +.scale.scale-has-marks-above.scale-has-marks-below, +.scale.vertical.scale-has-marks-above.scale-has-marks-below { + -GtkScale-slider-length: 20; + -GtkRange-slider-width: 20; + -GtkRange-trough-border: 2; + outline-offset: -9px; + outline-radius: 4px; + margin: 10px; +} + +.scale.fine-tune, +.scale.scale-has-marks-above.scale-has-marks-below.fine-tune, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune { + margin: 8px; + outline-offset: -7px; + outline-radius: 6px; +} + +.scale.fine-tune.trough, +.scale.scale-has-marks-above.scale-has-marks-below.fine-tune.trough, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.fine-tune.trough { + border-radius: 4px; +} + +.scale.slider, +.scale.scale-has-marks-above.scale-has-marks-below.slider, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.slider { + /* FIXME: better gradient on the slider and hover state */ + border-width: 2px; + border-style: solid; + background-color: @theme_button_bg; + padding: 1px 4px; + color: @theme_button_fg; + border-radius: 50%; + border-color: darker(@theme_border_color); + box-shadow: inset 0 1px white, + inset 0 -2px @bg_color, + inset 0 -1px mix(@bg_color,@theme_border_color, 0.5); +} + +.scale.slider:hover, +.scale.scale-has-marks-above.scale-has-marks-below.slider:hover, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:hover { + border-width: 2px; + border-style: solid; + background-color: @theme_button_bg; + padding: 1px 4px; + color: @theme_button_fg; + border-color: darker(@theme_border_color); + border-radius: 50%; /* needed for double marks scales */ + box-shadow: inset 0 1px white, + inset 0 -2px white, + inset 0 -1px mix(@bg_color,@theme_border_color, 0.5); +} + +.scale.slider:insensitive, +.scale.scale-has-marks-above.scale-has-marks-below.slider:insensitive, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:insensitive { + border-style: solid; /* needed for double marks scales or they'll get overridden */ + border-radius: 50%; + background-image: linear-gradient(to bottom, @theme_insensitive_bg); + box-shadow: none; +} + +.scale.slider:backdrop, +.scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop { + border-style: solid; /* needed for double marks scales or they'll get overridden */ + border-radius: 50%; + border-color: darker(@backdrop_borders_color); + background-image: linear-gradient(to bottom, @backdrop_bg_color); + box-shadow: none; +} + +/* FIXME button backdrop-insensitive is missing +.scale.slider:backdrop:insensitive, +.scale.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:backdrop:insensitive { + @include button(backdrop-insensitive); +} +*/ + +.scale.slider:active, +.scale.scale-has-marks-above.scale-has-marks-below.slider:active, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.slider:active { + border: 1px solid darker(@selected_borders_color); +} + +.scale.trough, +.scale.scale-has-marks-above.scale-has-marks-below.trough, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough { + border-width: 1px; + border-style: solid; + border-radius: 3px; + border-color: @theme_border_color; + background-color: shade(@theme_button_bg, 0.8); + box-shadow: inset 1px 1px transparentize(black, 0.9); +} + +.scale.trough.vertical, +.scale.scale-has-marks-above.scale-has-marks-below.trough.vertical, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.vertical { + border-width: 1px; + border-style: solid; + border-radius: 3px; + border-color: @theme_border_color; + background-color: shade(@theme_button_bg, 0.8); + box-shadow: inset 1px 1px transparentize(black, 0.9); +} + +.scale.trough.highlight, +.scale.scale-has-marks-above.scale-has-marks-below.trough.highlight, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight { + border-color: @selected_borders_color; + background-color: @theme_highlight_color; + box-shadow: none; +} + +.scale.trough.highlight.vertical, +.scale.trough.vertical.highlight, +.scale.scale-has-marks-above.scale-has-marks-below.trough.highlight.vertical, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight.vertical, +.scale.scale-has-marks-above.scale-has-marks-below.trough.vertical.highlight, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.vertical.highlight { + border-color: @selected_borders_color; + background-color: @theme_highlight_color; + box-shadow: none; +} + +.scale.trough.highlight:backdrop, +.scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop { + border-color: @selected_bg_color; + background-color: @selected_bg_color; + box-shadow: none; +} + +.scale.trough:insensitive, +.scale.trough.vertical:insensitive, +.scale.scale-has-marks-above.scale-has-marks-below.trough:insensitive, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:insensitive, +.scale.trough .highlight:insensitive, +.scale.trough.vertical .highlight:insensitive, +.scale.scale-has-marks-above.scale-has-marks-below.trough .highlight:insensitive, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough .highlight:insensitive { + border-color: @theme_insensitive_border; + background-color: @theme_insensitive_bg; + box-shadow: none; +} + +.scale.trough:backdrop, +.scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop { + border-color: @backdrop_borders_color; + background-color: mix(@backdrop_bg_color,@borders_color, 1.0); + box-shadow: none; +} + +.scale.trough:backdrop:insensitive, +.scale.trough .highlight:backdrop:insensitive, +.scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive, +.scale.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop:insensitive, +.scale.vertical.scale-has-marks-above.scale-has-marks-below.trough .highlight:backdrop:insensitive { + border-color: @backdrop_insensitive_color; + background-color: @backdrop_bg_color; +} + +.scale.scale-has-marks-above { + margin: 14px 10px 10px; +} + +.scale.scale-has-marks-above.fine-tune { + margin: 12px 8px 8px; +} +.scale.scale-has-marks-below { + margin: 10px 10px 14px; +} + +.scale.scale-has-marks-below.fine-tune { + margin: 8px 8px 12px; +} + +.scale.vertical.scale-has-marks-above { + margin: 10px 10px 10px 14px; +} + +.scale.vertical.scale-has-marks-above.fine-tune { + margin: 8px 8px 8px 12px; +} + +.scale.vertical.scale-has-marks-below { + margin: 10px 14px 10px 10px; +} + +.scale.vertical.scale-has-marks-below.fine-tune { + margin: 8px 12px 8px 8px; +} + /********* * Views * *********/ .expander row:selected:focus { - color: @theme_base_color; + color: @theme_selected_fg_color; } GtkViewport { @@ -1767,13 +1974,13 @@ GtkViewport { } .view:selected { - background-color: @theme_active_color; - color: @theme_base_color; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; } .view:selected:focus { background-color: @theme_fg_color; - color: @theme_base_color; + color: @theme_selected_fg_color; } GtkIconView, @@ -1817,8 +2024,8 @@ GtkIconView.view.cell { .list-row.button:hover, .list-row.button:backdrop:hover, .list-row.button:selected:hover { - background-color: @theme_active_color; - color: @theme_base_color; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; border-radius: 4px; } @@ -1848,8 +2055,8 @@ GtkIconView.view.cell { * OSD * *******/ .osd { - color: @theme_base_color; - background-color: @theme_active_color; + color: @theme_selected_fg_color; + background-color: @theme_selected_bg_color; } .osd.toolbar { @@ -1876,7 +2083,7 @@ GtkIconView.view.cell { } .osd .button:hover { - color: @theme_base_color; + color: @theme_selected_fg_color; } .osd .button:active, @@ -1929,10 +2136,9 @@ GtkCalendar.button:insensitive { background-color: transparent; } -.highlight, GtkCalendar.highlight { - background-color: @theme_active_color; - color: @theme_base_color; + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; border-radius: 0; padding: 0; border-width: 0; @@ -1979,7 +2185,7 @@ GtkCalendar.highlight { border-width: 1px; border-style: solid; border-radius: 6px; - background-color: shade(@theme_active_color, 0.8); + background-color: shade(@theme_selected_bg_color, 0.8); background-image: linear-gradient(to bottom, shade(@theme_base_color, 1.0), shade(@theme_base_color, 0.85)); @@ -2025,7 +2231,7 @@ GtkCalendar.highlight { background-color: alpha(shade(#3E403D, 0.85), 0.75); border: 1px solid black; box-shadow: none; - color: @theme_base_color; + color: @theme_selected_fg_color; } .popover.osd .toolbar { background-image: none; @@ -2042,7 +2248,7 @@ GtkCalendar.highlight { box-shadow: none; } .popover.osd .button:insensitive { - color: alpha(@theme_base_color, 0.4); + color: alpha(@theme_selected_fg_color, 0.4); } .popover .list { @@ -2077,9 +2283,9 @@ GtkModelButton.button:checked:hover, GtkModelButton.button:active:hover, GtkModelButton.button:hover, GtkModelButton.button:selected { - color: @theme_base_color; + color: @theme_selected_fg_color; background-image: none; - background-color: @theme_active_color; + background-color: @theme_selected_bg_color; text-shadow: none; border-width: 0; border-color: transparent; @@ -2134,7 +2340,7 @@ GtkPopover .separator { .titlebar .titlebutton:active, .titlebar .titlebutton:checked { background-color: @theme_button_active_bg; - color: @theme_base_color; + color: @theme_selected_fg_color; } .window-frame { @@ -2196,7 +2402,7 @@ TerminalScreen { } .nautilus-cluebar-label { - color: @theme_base_color; + color: @theme_selected_fg_color; font: bold; } @@ -2221,12 +2427,12 @@ NautilusWindow .pane-separator { } .nautilus-desktop.nautilus-canvas-item { - color: @theme_base_color; + color: @theme_selected_fg_color; text-shadow: 1px 1px black; } .nautilus-desktop.nautilus-canvas-item:selected { - color: @theme_base_color; + color: @theme_selected_fg_color; } .nautilus-desktop.nautilus-canvas-item:backdrop { diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk.css index 41f90f9a..09a4cf9b 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/gtk.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk.css @@ -1,8 +1,11 @@ @define-color theme_base_color #fff; @define-color theme_bg_color @theme_base_color; @define-color theme_fg_color #000; -@define-color theme_active_color #555753; -@define-color theme_border_color @theme_active_color; +@define-color theme_selected_bg_color #555753; +@define-color theme_selected_fg_color @theme_base_color; + +@define-color theme_border_color @theme_selected_bg_color; +@define-color borders_edge #fff; @define-color theme_highlight_color #3465a4; @define-color theme_highlight_alt #204a87; @@ -16,6 +19,7 @@ @define-color theme_insensitive_border #babdb6; @define-color theme_slider_bg #6f706d; +@define-color scale_progress_fill @theme_selected_bg_color; @define-color theme_button_bg #eeeeec; @define-color theme_button_fg #2e3436; @@ -27,27 +31,27 @@ @define-color theme_button_insensitive_active_bg #cccdcc; @define-color theme_button_insensitive_active_fg @theme_base_color; @define-color theme_button_insensitive_active_border @theme_button_insensitive_active_bg; -@define-color theme_button_linked_border @theme_active_color; +@define-color theme_button_linked_border @theme_selected_bg_color; @define-color theme_button_linked_insensitive_bg @theme_button_insensitive_bg; @define-color theme_button_linked_insensitive_fg @theme_button_insensitive_fg; @define-color theme_entry_bg @theme_base_color; @define-color theme_notebook_bg @theme_base_color; -@define-color theme_notebook_border @theme_active_color; +@define-color theme_notebook_border @theme_selected_bg_color; -@define-color theme_scale_trough_bg @theme_active_color; +@define-color theme_scale_trough_bg @theme_selected_bg_color; @define-color theme_scale_trough_insensitive_bg @theme_button_insensitive_active_bg; -@define-color theme_switch_slider_bg @theme_active_color; -@define-color theme_switch_slider_border @theme_active_color; +@define-color theme_switch_slider_bg @theme_selected_bg_color; +@define-color theme_switch_slider_border @theme_selected_bg_color; @define-color theme_switch_slider_active_bg @theme_base_color; @define-color theme_switch_slider_insensitive_bg @theme_trough_insensitive_fg; @define-color theme_switch_slider_insensitive_border @theme_trough_insensitive_fg; @define-color theme_switch_slider_active_insensitive_bg @theme_base_color; @define-color theme_trough_bg @theme_button_bg; -@define-color theme_trough_fg @theme_active_color; +@define-color theme_trough_fg @theme_selected_bg_color; @define-color theme_trough_insensitive_bg #fafaf9; @define-color theme_trough_insensitive_fg @theme_button_insensitive_active_bg; @define-color theme_trough_insensitive_border @theme_button_insensitive_active_bg; diff --git a/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css index a77aaca1..5af3891d 100644 --- a/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css +++ b/desktop-themes/ContrastHigh/gtk-3.0/mate-applications.css @@ -3,7 +3,7 @@ ************/ .caja-cluebar-label { - color: @theme_base_color; + color: @theme_selected_fg_color; font: bold; } @@ -28,12 +28,12 @@ CajaWindow .pane-separator { } .caja-desktop.caja-canvas-item { - color: @theme_base_color; + color: @theme_selected_fg_color; text-shadow: 1px 1px black; } .caja-desktop.caja-canvas-item:selected { - color: @theme_base_color; + color: @theme_selected_fg_color; } .caja-desktop.caja-canvas-item:backdrop { @@ -90,8 +90,8 @@ PanelMenuBar.menubar .menu .menuitem { .mate-panel-menu-bar .menuitem:hover, MatePanelApplet > GtkMenuBar.menubar .menuitem:hover { - color: @theme_base_color; - background-color: @theme_active_color; + color: @theme_selected_fg_color; + background-color: @theme_selected_bg_color; } .mate-panel-menu-bar .menuitem *:hover, @@ -117,8 +117,8 @@ MatePanelApplet > GtkMenuBar.menubar .menu .menuitem { .mate-panel-menu-bar .menu .menuitem:hover, MatePanelApplet > GtkMenuBar.menubar .menu .menuitem:hover { - color: @theme_base_color; - background-color: @theme_active_color; + color: @theme_selected_fg_color; + background-color: @theme_selected_bg_color; } /* desktop-applet, clockapplet, drivemount, character-map, @@ -140,7 +140,7 @@ MatePanelApplet .button:active:hover, MatePanelApplet .button:active { border-image: none; background-image: none; - background-color: @theme_active_color; + background-color: @theme_selected_bg_color; border-width: 0; border-radius: 0; } @@ -150,20 +150,20 @@ MatePanelApplet .button:hover { background-image: none; background-color: @theme_fg_color; border-color: @theme_fg_color; - color: @theme_base_color; + color: @theme_selected_fg_color; border-width: 0; border-radius: 0; } MatePanelApplet *:hover { - color: @theme_base_color; + color: @theme_selected_fg_color; } MatePanelApplet *:checked, MatePanelApplet *:hover:checked, MatePanelApplet *:active, MatePanelApplet *:hover:active { - color: @theme_base_color; + color: @theme_selected_fg_color; text-shadow: none; } @@ -185,7 +185,7 @@ WnckTasklist .button:active:hover, WnckTasklist .button:active { border-image: none; background-image: none; - background-color: @theme_active_color; + background-color: @theme_selected_bg_color; border-width: 0; border-radius: 0; } @@ -195,7 +195,7 @@ WnckTasklist .button:hover { background-image: none; background-color: @theme_fg_color; border-color: @theme_fg_color; - color: @theme_base_color; + color: @theme_selected_fg_color; border-width: 0; border-radius: 0; } @@ -216,8 +216,8 @@ WnckPager { /* prelight of WnckPager */ WnckPager:hover { background-image: linear-gradient(to bottom, - shade (@theme_active_color, 2.86), - shade (@theme_active_color, 1.0)); + shade (@theme_selected_bg_color, 2.86), + shade (@theme_selected_bg_color, 1.0)); background-color: transparent; } @@ -254,7 +254,7 @@ TerminalWindow .entry { /* pluma line numbers */ PlumaView { background-color: @theme_slider_bg; - color: @theme_base_color; + color: @theme_selected_fg_color; } PlumaWindow GtkStatusbar .frame, @@ -285,7 +285,7 @@ ShellWindow .button.flat { ShellWindow GtkScrolledWindow .button.flat:hover { background-color: @theme_fg_color; border-color: @theme_fg_color; - color: @theme_base_color; + color: @theme_selected_fg_color; border-radius: 12px; } -- cgit v1.2.1