From 299f91c132cf75bd1e7fd103e2234173e6a78041 Mon Sep 17 00:00:00 2001 From: Andrey Cherepanov Date: Thu, 5 May 2016 18:22:42 +0300 Subject: [PATCH 1/3] Base adapt theme for Gtk 3.20 (include base Firefox support) --- gtk-3.0/applications.css | 122 +- gtk-3.0/gtk-widgets-img.css | 736 +++++------- gtk-3.0/gtk-widgets.css | 2216 +++++++++++++++++++++++------------ gtk-3.0/gtk.css | 4 +- 4 files changed, 1833 insertions(+), 1245 deletions(-) diff --git a/gtk-3.0/applications.css b/gtk-3.0/applications.css index f4e4d433..78b43ea1 100644 --- a/gtk-3.0/applications.css +++ b/gtk-3.0/applications.css @@ -2,90 +2,20 @@ * Nautilus * ************/ -/* .nautilus-desktop.nautilus-canvas-item { - color: @theme_base_color; - text-shadow: 1 1 alpha (@theme_fg_color, 0.8); + color: @theme_base_color; + text-shadow: 1px 1px alpha (@theme_fg_color, 0.8); } .nautilus-desktop.nautilus-canvas-item:active, -.nautilus-desktop.nautilus-canvas-item:prelight, +.nautilus-desktop.nautilus-canvas-item:hover, .nautilus-desktop.nautilus-canvas-item:selected { - text-shadow: none; + text-shadow: none; } -*/ .nautilus-desktop .entry { - background-image: none; - border-image: none; -} - -NautilusToolbar .linked.raised GtkToggleButton.button:first-child, -NautilusToolbar .linked.raised GtkToggleButton.button:first-child:active:hover { - border-right-width: 1px; -} - -/********* - * gedit * - *********/ - -GeditMenuStackSwitcher.button.flat { - border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; - border-radius: 3px; - border-width: 1px 1px 2px 1px; - border-style: solid; - border-color: transparent; -} - -.gedit-side-panel-paned, -.gedit-bottom-panel-paned, -.gedit-bottom-panel-stack-switcher .notebook GtkBox.vertical { - border-style: solid; - border-color: @toolbar_border_top_color; -} - -.gedit-side-panel-paned { - border-width: 0px 1px 0px 0px; -} - -.gedit-bottom-panel-paned { - border-width: 1px 0px 0px 0px; -} - -.gedit-bottom-panel-stack-switcher .notebook GtkBox.vertical { - border-width: 1px; -} - -.gedit-menu-stack-switcher { - padding: 15px 15px 2px 15px; -} - -GeditMultiNotebook .notebook { - border-width: 0px 0px 1px 1px; -} - -GeditViewFrame .gedit-search-slider { - padding: 4px; - border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; -} - -.gedit-search-entry-occurrences-tag { - color: @theme_text_color; - background-color: @theme_bg_color; - margin: 2px 0px 2px 2px; - padding: 2px; -} - -GeditStatusbar .frame.flat { - border: none; -} - -/********** - * evince * - **********/ - -EvPageActionWidget .linked .entry:first-child { - border-right-width: 0px; + background-image: none; + border-image: none; } /******************* @@ -101,7 +31,7 @@ EvPageActionWidget .linked .entry:first-child { background-color: @theme_base_color; } -GtkIconView.documents-main-view.check { +iconview.documents-main-view.check { background-repeat: no-repeat; background-position: center; background-color: @theme_base_color; @@ -204,23 +134,23 @@ TerminalScreen { UnityPanelWidget, .unity-panel { - background-image: none; - background-color: @theme_bg_color; - color: @theme_fg_color; - border-width: 0; -} - -.unity-panel.menubar.menuitem:hover { - background-color: @menu_bg_color; - border-style: solid; - border-width: 1px 1px 0px; - border-color: @menubar_menuitem_hover_border_color; - border-radius: 3px 3px 0 0; - background-image: -gtk-gradient (linear, - left top, - left bottom, - from (@menubar_menuitem_hover_gradient_a), - color-stop (0.50, @menubar_menuitem_hover_gradient_b), - color-stop (0.50, @menubar_menuitem_hover_gradient_c), - to (@menubar_menuitem_hover_gradient_d)); + background-image: none; + background-color: @theme_bg_color; + color: @theme_fg_color; + border-width: 0; +} + +.unity-panel menubar menuitem:hover { + background-color: @menu_bg_color; + border-style: solid; + border-width: 1px 1px 0px; + border-color: @menubar_menuitem_hover_border_color; + border-radius: 3px 3px 0 0; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@menubar_menuitem_hover_gradient_a), + color-stop (0.50, @menubar_menuitem_hover_gradient_b), + color-stop (0.50, @menubar_menuitem_hover_gradient_c), + to (@menubar_menuitem_hover_gradient_d)); } diff --git a/gtk-3.0/gtk-widgets-img.css b/gtk-3.0/gtk-widgets-img.css index 2e10f50b..ee5ccb05 100644 --- a/gtk-3.0/gtk-widgets-img.css +++ b/gtk-3.0/gtk-widgets-img.css @@ -6,7 +6,7 @@ * GtkSwitch * *************/ -GtkSwitch.slider { +switch slider { background-image: linear-gradient(to bottom, alpha (@switch_slider_gradient_a, 0.5), alpha (@switch_slider_gradient_b, 0.5) 50%, @@ -17,7 +17,7 @@ GtkSwitch.slider { background-position: center center; } -GtkSwitch.slider:insensitive { +switch:disabled slider { background-image: linear-gradient(to bottom, alpha (@switch_slider_insensitive_gradient_a, 0.8), alpha (@switch_slider_insensitive_gradient_b, 0.8) 50%, @@ -26,24 +26,20 @@ GtkSwitch.slider:insensitive { url("img/slider-horz-grip.png"); } -/*************** - * Resize grip * - ***************/ - .grip { - background-image: url("img/resize-grip.png"); + background-image: url("img/resize-grip.png"); } /************* * Scrollbar * *************/ -.scrollbar.slider { +scrollbar slider { background-repeat: no-repeat; background-position: center center; } -.scrollbar.slider.vertical { +scrollbar.vertical slider { background-image: linear-gradient(to right, alpha (@scrollbar_slider_inner_border_color, 0.5), alpha (@scrollbar_slider_gradient_a, 0.5) 1px, @@ -54,7 +50,7 @@ GtkSwitch.slider:insensitive { url("img/slider-vert-grip.png"); } -.scrollbar.slider.horizontal { +scrollbar.horizontal slider { background-image: linear-gradient(to bottom, alpha (@scrollbar_slider_inner_border_color, 0.5), alpha (@scrollbar_slider_gradient_a, 0.5) 1px, @@ -65,7 +61,7 @@ GtkSwitch.slider:insensitive { url("img/slider-horz-grip.png"); } -.scrollbar.slider.vertical:hover { +scrollbar.vertical slider:hover { background-image: linear-gradient(to right, alpha (@scrollbar_slider_inner_border_color, 0.5), alpha (@scrollbar_slider_hover_gradient_a, 0.5) 1px, @@ -76,7 +72,7 @@ GtkSwitch.slider:insensitive { url("img/slider-vert-grip.png"); } -.scrollbar.slider.horizontal:hover { +scrollbar.horizontal slider:hover { background-image: linear-gradient(to bottom, alpha (@scrollbar_slider_inner_border_color, 0.5), alpha (@scrollbar_slider_hover_gradient_a, 0.5) 1px, @@ -91,129 +87,129 @@ GtkSwitch.slider:insensitive { * Check and Radio items * *************************/ -.check, -.check row:selected, -.check row:selected:focus { +check, +check row:selected, +check row:selected:focus { -gtk-icon-source: url("img/checkbox-unchecked.png"); } -.check:hover, -.check row:selected:hover, -.check row:selected:focus:hover { +check:hover, +check row:selected:hover, +check row:selected:focus:hover { -gtk-icon-source: url("img/checkbox-unchecked-hover.png"); } -.check:insensitive, -.check row:selected:insensitive, -.check row:selected:focus:insensitive { +check:disabled, +check row:selected:disabled, +check row:selected:focus:disabled { -gtk-icon-source: url("img/checkbox-unchecked-insensitive.png"); } -.check:checked, -.check row:selected:checked, -.check row:selected:focus:checked, -.check:active, -.check row:selected:active, -.check row:selected:focus:active { +check:checked, +check row:selected:checked, +check row:selected:focus:checked, +check:active, +check row:selected:active, +check row:selected:focus:active { -gtk-icon-source: url("img/checkbox-checked.png"); } -.check:checked:hover, -.check row:selected:checked:hover, -.check row:selected:focus:checked:hover, -.check:active:hover, -.check row:selected:active:hover, -.check row:selected:focus:active:hover { +check:checked:hover, +check row:selected:checked:hover, +check row:selected:focus:checked:hover, +check:active:hover, +check row:selected:active:hover, +check row:selected:focus:active:hover { -gtk-icon-source: url("img/checkbox-checked-hover.png"); } -.check:checked:insensitive, -.check row:selected:checked:insensitive, -.check row:selected:focus:checked:insensitive, -.check:active:insensitive, -.check row:selected:active:insensitive, -.check row:selected:focus:active:insensitive { +check:checked:disabled, +check row:selected:checked:disabled, +check row:selected:focus:checked:disabled, +check:active:disabled, +check row:selected:active:disabled, +check row:selected:focus:active:disabled { -gtk-icon-source: url("img/checkbox-checked-insensitive.png"); } -.check:inconsistent, -.check row:selected:inconsistent, -.check row:selected:focus:inconsistent { +check:indeterminate, +check row:selected:indeterminate, +check row:selected:focus:indeterminate { -gtk-icon-source: url("img/checkbox-mixed.png"); } -.check:inconsistent:hover, -.check row:selected:inconsistent:hover, -.check row:selected:focus:inconsistent:hover { +check:indeterminate:hover, +check row:selected:indeterminate:hover, +check row:selected:focus:indeterminate:hover { -gtk-icon-source: url("img/checkbox-mixed-hover.png"); } -.check:inconsistent:insensitive, -.check row:selected:inconsistent:insensitive, -.check row:selected:focus:inconsistent:insensitive { +check:indeterminate:disabled, +check row:selected:indeterminate:disabled, +check row:selected:focus:indeterminate:disabled { -gtk-icon-source: url("img/checkbox-mixed-insensitive.png"); } -.radio, -.radio row:selected, -.radio row:selected:focus { +radio, +radio row:selected, +radio row:selected:focus { -gtk-icon-source: url("img/radio-unchecked.png"); } -.radio:hover, -.radio row:selected:hover, -.radio row:selected:focus:hover { +radio:hover, +radio row:selected:hover, +radio row:selected:focus:hover { -gtk-icon-source: url("img/radio-unchecked-hover.png"); } -.radio:insensitive, -.radio row:selected:insensitive, -.radio row:selected:focus:insensitive { +radio:disabled, +radio row:selected:disabled, +radio row:selected:focus:disabled { -gtk-icon-source: url("img/radio-unchecked-insensitive.png"); } -.radio:checked, -.radio row:selected:checked, -.radio row:selected:focus:checked, -.radio:active, -.radio row:selected:active, -.radio row:selected:focus:active { +radio:checked, +radio row:selected:checked, +radio row:selected:focus:checked, +radio:active, +radio row:selected:active, +radio row:selected:focus:active { -gtk-icon-source: url("img/radio-checked.png"); } -.radio:checked:hover, -.radio row:selected:checked:hover, -.radio row:selected:focus:checked:hover, -.radio:active:hover, -.radio row:selected:active:hover, -.radio row:selected:focus:active:hover { +radio:checked:hover, +radio row:selected:checked:hover, +radio row:selected:focus:checked:hover, +radio:active:hover, +radio row:selected:active:hover, +radio row:selected:focus:active:hover { -gtk-icon-source: url("img/radio-checked-hover.png"); } -.radio:checked:insensitive, -.radio row:selected:checked:insensitive, -.radio row:selected:focus:checked:insensitive, -.radio:active:insensitive, -.radio row:selected:active:insensitive, -.radio row:selected:focus:active:insensitive { +radio:checked:disabled, +radio row:selected:checked:disabled, +radio row:selected:focus:checked:disabled, +radio:active:disabled, +radio row:selected:active:disabled, +radio row:selected:focus:active:disabled { -gtk-icon-source: url("img/radio-checked-insensitive.png"); } -.radio:inconsistent, -.radio row:selected:inconsistent, -.radio row:selected:focus:inconsistent { +radio:indeterminate, +radio row:selected:indeterminate, +radio row:selected:focus:indeterminate { -gtk-icon-source: url("img/radio-mixed.png"); } -.radio:inconsistent:hover, -.radio row:selected:inconsistent:hover, -.radio row:selected:focus:inconsistent:hover { +radio:indeterminate:hover, +radio row:selected:indeterminate:hover, +radio row:selected:focus:indeterminate:hover { -gtk-icon-source: url("img/radio-mixed-hover.png"); } -.radio:inconsistent:insensitive, -.radio row:selected:inconsistent:insensitive, -.radio row:selected:focus:inconsistent:insensitive { +radio:indeterminate:disabled, +radio row:selected:indeterminate:disabled, +radio row:selected:focus:indeterminate:disabled { -gtk-icon-source: url("img/radio-mixed-insensitive.png"); } @@ -221,78 +217,80 @@ GtkSwitch.slider:insensitive { * GtkScale's slider * *********************/ -GtkScale.slider, -GtkScale.slider.horizontal { +scale slider, +scale.horizontal slider { background-image: url("img/scale-slider-horz.png"); } -GtkScale.slider:hover, -GtkScale.slider.horizontal:hover { +scale slider:hover, +scale.horizontal slider:hover { background-image: url("img/scale-slider-horz-hover.png"); } -GtkScale.slider:insensitive, -GtkScale.slider.horizontal:insensitive { +scale:disabled slider, +scale slider:disabled, +scale.horizontal slider:disabled { background-image: url("img/scale-slider-horz-insensitive.png"); } -GtkScale.slider.vertical { +scale.vertical slider { background-image: url("img/scale-slider-vert.png"); } -GtkScale.slider.vertical:hover { +scale.vertical slider:hover { background-image: url("img/scale-slider-vert-hover.png"); } -GtkScale.slider.vertical:insensitive { +scale.vertical:disabled slider, +scale.vertical slider:disabled { background-image: url("img/scale-slider-vert-insensitive.png"); } -GtkScale.scale-has-marks-above.slider.horizontal { +scale.horizontal.scale-has-marks-above slider { background-image: url("img/scale-slider-horz.png"); } -GtkScale.scale-has-marks-above.slider.horizontal:hover { +scale.horizontal.scale-has-marks-above slider:hover { background-image: url("img/scale-slider-horz-hover.png"); } -GtkScale.scale-has-marks-above.slider.horizontal:insensitive { +scale.horizontal.scale-has-marks-above slider:disabled { background-image: url("img/scale-slider-horz-insensitive.png"); } -GtkScale.scale-has-marks-above.slider.vertical { +scale.vertical.scale-has-marks-above slider { background-image: url("img/scale-slider-vert.png"); } -GtkScale.scale-has-marks-above.slider.vertical:hover { +scale.vertical.scale-has-marks-above slider:hover { background-image: url("img/scale-slider-vert-hover.png"); } -GtkScale.scale-has-marks-above.slider.vertical:insensitive { +scale.vertical.scale-has-marks-above slider:disabled { background-image: url("img/scale-slider-vert-insensitive.png"); } -GtkScale.scale-has-marks-below.slider.horizontal { +scale.horizontal.scale-has-marks-below slider { background-image: url("img/scale-slider-horz.png"); } -GtkScale.scale-has-marks-below.slider.horizontal:hover { +scale.horizontal.scale-has-marks-below slider:hover { background-image: url("img/scale-slider-horz-hover.png"); } -GtkScale.scale-has-marks-below.slider.horizontal:insensitive { +scale.horizontal.scale-has-marks-below slider:disabled { background-image: url("img/scale-slider-horz-insensitive.png"); } -GtkScale.scale-has-marks-below.slider.vertical { +scale.vertical.scale-has-marks-below slider { background-image: url("img/scale-slider-vert.png"); } -GtkScale.scale-has-marks-below.slider.vertical:hover { +scale.vertical.scale-has-marks-below slider:hover { background-image: url("img/scale-slider-vert-hover.png"); } -GtkScale.scale-has-marks-below.slider.vertical:insensitive { +scale.vertical.scale-has-marks-below slider:disabled { background-image: url("img/scale-slider-vert-insensitive.png"); } @@ -300,72 +298,72 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive { * Menus * *********/ -.menu .menuitem.check { +menu menuitem check { -gtk-icon-source: url("img/menuitem-checkbox.png"); } -.menu .menuitem.check:hover { +menu menuitem check:hover { -gtk-icon-source: url("img/menuitem-checkbox-hover.png"); } -.menu .menuitem.check:insensitive { +menu menuitem check:disabled { -gtk-icon-source: url("img/menuitem-checkbox-insensitive.png"); } -.menu .menuitem.check:checked, -.menu .menuitem.check:active { +menu menuitem check:checked, +menu menuitem check:active { -gtk-icon-source: url("img/menuitem-checkbox-checked.png"); } -.menu .menuitem.check:checked:hover, -.menu .menuitem.check:active:hover { +menu menuitem check:checked:hover, +menu menuitem check:active:hover { -gtk-icon-source: url("img/menuitem-checkbox-checked-hover.png"); } -.menu .menuitem.check:checked:insensitive, -.menu .menuitem.check:active:insensitive { +menu menuitem check:checked:disabled, +menu menuitem check:active:disabled { -gtk-icon-source: url("img/menuitem-checkbox-checked-insensitive.png"); } -.menu .menuitem.check:inconsistent, -.menu .menuitem.radio:inconsistent { +menu menuitem check:indeterminate, +menu menuitem radio:indeterminate { -gtk-icon-source: url("img/menuitem-checkbox-mixed.png"); } -.menu .menuitem.check:inconsistent:hover, -.menu .menuitem.radio:inconsistent:hover { +menu menuitem check:indeterminate:hover, +menu menuitem radio:indeterminate:hover { -gtk-icon-source: url("img/menuitem-checkbox-mixed-hover.png"); } -.menu .menuitem.check:inconsistent:insensitive, -.menu .menuitem.radio:inconsistent:insensitive { +menu menuitem check:indeterminate:disabled, +menu menuitem radio:indeterminate:disabled { -gtk-icon-source: url("img/menuitem-checkbox-mixed-insensitive.png"); } -.menu .menuitem.radio { +menu menuitem radio { -gtk-icon-source: url("img/menuitem-radio.png"); } -.menu .menuitem.radio:hover { +menu menuitem radio:hover { -gtk-icon-source: url("img/menuitem-radio-hover.png"); } -.menu .menuitem.radio:insensitive { +menu menuitem radio:disabled { -gtk-icon-source: url("img/menuitem-radio-insensitive.png"); } -.menu .menuitem.radio:checked, -.menu .menuitem.radio:active { +menu menuitem radio:checked, +menu menuitem radio:active { -gtk-icon-source: url("img/menuitem-radio-checked.png"); } -.menu .menuitem.radio:checked:hover, -.menu .menuitem.radio:active:hover { +menu menuitem radio:checked:hover, +menu menuitem radio:active:hover { -gtk-icon-source: url("img/menuitem-radio-checked-hover.png"); } -.menu .menuitem.radio:checked:insensitive, -.menu .menuitem.radio:active:insensitive { +menu menuitem radio:checked:disabled, +menu menuitem radio:active:disabled { -gtk-icon-source: url("img/menuitem-radio-checked-insensitive.png"); } @@ -373,11 +371,15 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive { * Panes * *********/ -.pane-separator { +paned.horizontal > separator { + background-repeat: no-repeat; + background-position: center center; background-image: url("img/pane-separator-grip-horz.png"); } -.pane-separator.vertical { +paned.vertical > separator { + background-repeat: no-repeat; + background-position: center center; background-image: url("img/pane-separator-grip-vert.png"); } @@ -386,38 +388,48 @@ GtkScale.scale-has-marks-below.slider.vertical:insensitive { ***********/ /* generic element borders */ -.entry, -.combobox-entry .entry, -.combobox-entry .button, -.button:active, -.trough, -.trough.highlight, -GtkSwitch.trough, +entry, +combobox entry, +combobox entry button, +button:active, +trough, +trough highlight, +switch, /* generic button borders */ -.button, -.button.flat:active, -.button.flat:hover, +button, +button.flat:active, +button.flat:hover, .menu-button:active, -.titlebar .titlebutton:hover, -.primary-toolbar .button:checked, -.primary-toolbar .button.raised, -.primary-toolbar .raised .button, -.primary-toolbar GtkComboBox .button, +.titlebar button.titlebutton:hover, +toolbar.primary-toolbar button:checked, +toolbar.primary-toolbar button.raised, +toolbar.primary-toolbar .linked button.raised, +toolbar.primary-toolbar .linked button.raised:hover, +toolbar.primary-toolbar .linked button.raised:focus, +toolbar.primary-toolbar .linked button.raised:focus:hover, +toolbar.primary-toolbar .linked button.raised:focus:hover:active, +toolbar.primary-toolbar .raised.linked button, +toolbar.primary-toolbar .raised.linked button:hover, +toolbar.primary-toolbar .raised.linked button:focus, +toolbar.primary-toolbar .raised.linked button:focus:hover, +toolbar.primary-toolbar .raised.linked button:focus:hover:active, +toolbar.primary-toolbar .raised.raised button:disabled, +toolbar.primary-toolbar combobox button, /* primary toolbar - generic element borders */ -.primary-toolbar .entry, -.primary-toolbar .combobox-entry .entry, -.primary-toolbar .combobox-entry .button, -.primary-toolbar .button:active, -.primary-toolbar .button.raised:active, -.primary-toolbar .raised .button:active, -.primary-toolbar .button.raised:insensitive, -.primary-toolbar .raised .button:insensitive, -.primary-toolbar GtkSwitch.trough, -.primary-toolbar GtkSwitch.trough:insensitive, -.primary-toolbar GtkComboBox .button:active, -.primary-toolbar GtkComboBox .button:insensitive, +toolbar.primary-toolbar entry, +toolbar.primary-toolbar combobox entry, +toolbar.primary-toolbar combobox button, +toolbar.primary-toolbar button:active, +toolbar.primary-toolbar button.raised:active, +toolbar.primary-toolbar .raised button:active, +toolbar.primary-toolbar button.raised:disabled, +toolbar.primary-toolbar .raised button:disabled, +toolbar.primary-toolbar switch, +toolbar.primary-toolbar switch:disabled, +toolbar.primary-toolbar combobox button:active, +toolbar.primary-toolbar combobox button:disabled, /* primary toolbar - hover button borders */ -.primary-toolbar .button:hover { +toolbar.primary-toolbar button:hover { border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; border-radius: 3px; border-width: 1px 1px 2px 1px; @@ -425,131 +437,131 @@ GtkSwitch.trough, border-color: transparent; } -.primary-toolbar .entry, -.primary-toolbar .combobox-entry .entry { +toolbar.primary-toolbar entry, +toolbar.primary-toolbar combobox entry { border-width: 1px 2px 2px; } -.primary-toolbar .entry:focus, -.primary-toolbar .combobox-entry .entry:focus { +toolbar.primary-toolbar entry:focus, +toolbar.primary-toolbar combobox entry:focus { border-width: 1px 2px 2px; } /* Linked single button */ -.linked .entry:only-child, -.linked .button:only-child, -.linked .button:active:only-child, -.linked .button:active:hover:only-child, -.linked .button:focus:only-child, -.linked .button:focus:active:only-child, -.linked .button:insensitive:only-child, +.linked entry:only-child, +.linked button:only-child, +.linked button:active:only-child, +.linked button:active:hover:only-child, +.linked button:focus:only-child, +.linked button:focus:active:only-child, +.linked button:disabled:only-child, /* Middle button (vertical) */ -.linked.vertical .entry, -.linked.vertical .button, -.linked.vertical .button:active, -.linked.vertical .button:active:hover, -.linked.vertical .button:focus, -.linked.vertical .button:focus:active, -.linked.vertical .button:insensitive, +.linked.vertical entry, +.linked.vertical button, +.linked.vertical button:active, +.linked.vertical button:active:hover, +.linked.vertical button:focus, +.linked.vertical button:focus:active, +.linked.vertical button:disabled, /* Top button (vertical) */ -.linked.vertical .entry:first-child, -.linked.vertical .button:first-child, -.linked.vertical .button:active:first-child, -.linked.vertical .button:active:hover:first-child, -.linked.vertical .button:focus:first-child, -.linked.vertical .button:focus:active:first-child, -.linked.vertical .button:insensitive:first-child, +.linked.vertical entry:first-child, +.linked.vertical button:first-child, +.linked.vertical button:active:first-child, +.linked.vertical button:active:hover:first-child, +.linked.vertical button:focus:first-child, +.linked.vertical button:focus:active:first-child, +.linked.vertical button:disabled:first-child, /* Bottom button (vertical) */ -.linked.vertical .entry:last-child, -.linked.vertical .button:last-child, -.linked.vertical .button:active:last-child, -.linked.vertical .button:active:hover:last-child, -.linked.vertical .button:focus:last-child, -.linked.vertical .button:focus:active:last-child, -.linked.vertical .button:insensitive:last-child, +.linked.vertical entry:last-child, +.linked.vertical button:last-child, +.linked.vertical button:active:last-child, +.linked.vertical button:active:hover:last-child, +.linked.vertical button:focus:last-child, +.linked.vertical button:focus:active:last-child, +.linked.vertical button:disabled:last-child, /* Linked single button (vertical) */ -.linked.vertical .entry:only-child, -.linked.vertical .button:only-child, -.linked.vertical .button:active:only-child, -.linked.vertical .button:active:hover:only-child, -.linked.vertical .button:focus:only-child, -.linked.vertical .button:focus:active:only-child, -.linked.vertical .button:insensitive:only-child, +.linked.vertical entry:only-child, +.linked.vertical button:only-child, +.linked.vertical button:active:only-child, +.linked.vertical button:active:hover:only-child, +.linked.vertical button:focus:only-child, +.linked.vertical button:focus:active:only-child, +.linked.vertical button:disabled:only-child, /* Linked buttons on primary toolbars */ /* Middle button */ -.primary-toolbar .button.raised.linked, -.primary-toolbar .button.raised.linked:active, -.primary-toolbar .button.raised.linked:focus, -.primary-toolbar .button.raised.linked:focus:active, -.primary-toolbar .button.raised.linked:insensitive, -.primary-toolbar .raised.linked .button, -.primary-toolbar .raised.linked .button:active, -.primary-toolbar .raised.linked .button:focus, -.primary-toolbar .raised.linked .button:focus:active, -.primary-toolbar .raised.linked .button:insensitive, -.inline-toolbar.toolbar .button, -.inline-toolbar.toolbar .button:active, -.inline-toolbar.toolbar .button:focus, -.inline-toolbar.toolbar .button:focus:active, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton .button, -.inline-toolbar.toolbar GtkToolButton .button:active, -.inline-toolbar.toolbar GtkToolButton .button:focus, -.inline-toolbar.toolbar GtkToolButton .button:focus:active, -.inline-toolbar.toolbar GtkToolButton .button:insensitive, +toolbar.primary-toolbar button.raised.linked, +toolbar.primary-toolbar button.raised.linked:active, +toolbar.primary-toolbar button.raised.linked:focus, +toolbar.primary-toolbar button.raised.linked:focus:active, +toolbar.primary-toolbar button.raised.linked:disabled, +toolbar.primary-toolbar .raised.linked button, +toolbar.primary-toolbar .raised.linked button:active, +toolbar.primary-toolbar .raised.linked button:focus, +toolbar.primary-toolbar .raised.linked button:focus:active, +toolbar.primary-toolbar .raised.linked button:disabled, +toolbar.inline-toolbar button, +toolbar.inline-toolbar button:active, +toolbar.inline-toolbar button:focus, +toolbar.inline-toolbar button:focus:active, +toolbar.inline-toolbar button:disabled, +toolbar.inline-toolbar toolbutton button, +toolbar.inline-toolbar toolbutton button:active, +toolbar.inline-toolbar toolbutton button:focus, +toolbar.inline-toolbar toolbutton button:focus:active, +toolbar.inline-toolbar toolbutton button:disabled, /* Leftmost button */ -.primary-toolbar .button.raised.linked:first-child, -.primary-toolbar .button.raised.linked:active:first-child, -.primary-toolbar .button.raised.linked:focus:first-child, -.primary-toolbar .button.raised.linked:focus:active:first-child, -.primary-toolbar .button.raised.linked:insensitive:first-child, -.primary-toolbar .raised.linked .button:first-child, -.primary-toolbar .raised.linked .button:active:first-child, -.primary-toolbar .raised.linked .button:focus:first-child, -.primary-toolbar .raised.linked .button:focus:active:first-child, -.primary-toolbar .raised.linked .button:insensitive:first-child, -.inline-toolbar.toolbar .button:first-child, -.inline-toolbar.toolbar .button:active:first-child, -.inline-toolbar.toolbar .button:focus:first-child, -.inline-toolbar.toolbar .button:focus:active:first-child, -.inline-toolbar.toolbar .button:insensitive:first-child, -.inline-toolbar.toolbar GtkToolButton:first-child .button, -.inline-toolbar.toolbar GtkToolButton:first-child .button:active, -.inline-toolbar.toolbar GtkToolButton:first-child .button:focus, -.inline-toolbar.toolbar GtkToolButton:first-child .button:focus:active, -.inline-toolbar.toolbar GtkToolButton:first-child .button:insensitive, +toolbar.primary-toolbar button.raised.linked:first-child, +toolbar.primary-toolbar button.raised.linked:active:first-child, +toolbar.primary-toolbar button.raised.linked:focus:first-child, +toolbar.primary-toolbar button.raised.linked:focus:active:first-child, +toolbar.primary-toolbar button.raised.linked:disabled:first-child, +toolbar.primary-toolbar .raised.linked button:first-child, +toolbar.primary-toolbar .raised.linked button:active:first-child, +toolbar.primary-toolbar .raised.linked button:focus:first-child, +toolbar.primary-toolbar .raised.linked button:focus:active:first-child, +toolbar.primary-toolbar .raised.linked button:disabled:first-child, +toolbar.inline-toolbar button:first-child, +toolbar.inline-toolbar button:active:first-child, +toolbar.inline-toolbar button:focus:first-child, +toolbar.inline-toolbar button:focus:active:first-child, +toolbar.inline-toolbar button:disabled:first-child, +toolbar.inline-toolbar toolbutton button :first-child, +toolbar.inline-toolbar toolbutton button :first-child:active, +toolbar.inline-toolbar toolbutton button :first-child:focus, +toolbar.inline-toolbar toolbutton button :first-child:focus:active, +toolbar.inline-toolbar toolbutton button :first-child:disabled, /* Rightmost button */ -.primary-toolbar .button.raised.linked:last-child, -.primary-toolbar .button.raised.linked:active:last-child, -.primary-toolbar .button.raised.linked:focus:last-child, -.primary-toolbar .button.raised.linked:focus:active:last-child, -.primary-toolbar .button.raised.linked:insensitive:last-child, -.primary-toolbar .raised.linked .button:last-child, -.primary-toolbar .raised.linked .button:active:last-child, -.primary-toolbar .raised.linked .button:focus:last-child, -.primary-toolbar .raised.linked .button:focus:active:last-child, -.primary-toolbar .raised.linked .button:insensitive:last-child, -.inline-toolbar.toolbar .button:last-child, -.inline-toolbar.toolbar .button:active:last-child, -.inline-toolbar.toolbar .button:focus:last-child, -.inline-toolbar.toolbar .button:focus:active:last-child, -.inline-toolbar.toolbar .button:insensitive:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child .button, -.inline-toolbar.toolbar GtkToolButton:last-child .button:active, -.inline-toolbar.toolbar GtkToolButton:last-child .button:focus, -.inline-toolbar.toolbar GtkToolButton:last-child .button:focus:active, -.inline-toolbar.toolbar GtkToolButton:last-child .button:insensitive, +toolbar.primary-toolbar button.raised.linked:last-child, +toolbar.primary-toolbar button.raised.linked:active:last-child, +toolbar.primary-toolbar button.raised.linked:focus:last-child, +toolbar.primary-toolbar button.raised.linked:focus:active:last-child, +toolbar.primary-toolbar button.raised.linked:disabled:last-child, +toolbar.primary-toolbar .raised.linked button:last-child, +toolbar.primary-toolbar .raised.linked button:active:last-child, +toolbar.primary-toolbar .raised.linked button:focus:last-child, +toolbar.primary-toolbar .raised.linked button:focus:active:last-child, +toolbar.primary-toolbar .raised.linked button:disabled:last-child, +toolbar.inline-toolbar button:last-child, +toolbar.inline-toolbar button:active:last-child, +toolbar.inline-toolbar button:focus:last-child, +toolbar.inline-toolbar button:focus:active:last-child, +toolbar.inline-toolbar button:disabled:last-child, +toolbar.inline-toolbar toolbutton button :last-child, +toolbar.inline-toolbar toolbutton button :last-child:active, +toolbar.inline-toolbar toolbutton button :last-child:focus, +toolbar.inline-toolbar toolbutton button :last-child:focus:active, +toolbar.inline-toolbar toolbutton button :last-child:disabled, /* Single button */ -.inline-toolbar.toolbar .button:only-child, -.inline-toolbar.toolbar .button:active:only-child, -.inline-toolbar.toolbar .button:focus:only-child, -.inline-toolbar.toolbar .button:focus:active:only-child, -.inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child .button, -.inline-toolbar.toolbar GtkToolButton:only-child .button:active, -.inline-toolbar.toolbar GtkToolButton:only-child .button:focus, -.inline-toolbar.toolbar GtkToolButton:only-child .button:focus:active, -.inline-toolbar.toolbar GtkToolButton:only-child .button:insensitive { +toolbar.inline-toolbar button:only-child, +toolbar.inline-toolbar button:active:only-child, +toolbar.inline-toolbar button:focus:only-child, +toolbar.inline-toolbar button:focus:active:only-child, +toolbar.inline-toolbar button:disabled:only-child, +toolbar.inline-toolbar toolbutton button :only-child, +toolbar.inline-toolbar toolbutton button :only-child:active, +toolbar.inline-toolbar toolbutton button :only-child:focus, +toolbar.inline-toolbar toolbutton button :only-child:focus:active, +toolbar.inline-toolbar toolbutton button :only-child:disabled { border-image: url("img/border-inline-button.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; border-radius: 3px; border-width: 1px 1px 2px 1px; @@ -558,12 +570,12 @@ GtkSwitch.trough, } /* generic insensitive element borders */ -GtkSwitch.trough:insensitive, -.combobox-entry .entry:insensitive, -.combobox-entry .button:insensitive, -.entry:insensitive, -.button:insensitive, -.trough row { +switch:disabled, +combobox entry:disabled, +combobox button:disabled, +entry:disabled, +button:disabled, +trough row { border-image: url("img/border-insensitive.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; border-radius: 3px; border-width: 1px 1px 2px 1px; @@ -571,39 +583,39 @@ GtkSwitch.trough:insensitive, border-color: transparent; } -.menuitem.button.flat, -.button.flat, -.button.flat:insensitive, -GtkListBoxRow.button.list-row, -GtkListBoxRow.button.list-row:hover { +menuitem button.flat, +button.flat, +button.flat:disabled, +list row button, +list row button:hover { border-image: none; background-image: none; } /* focused element borders */ -.entry:focus, -.combobox-entry .entry:focus, -.button.flat:focus:active, -.button:focus:active, -.button.default:active, +entry:focus, +combobox entry:focus, +button.flat:focus:active, +button:focus:active, +button.default:active, /* focused button borders */ -.button.flat:focus, -.button.default, -.primary-toolbar .entry:focus, -.primary-toolbar .button:active:focus, -.primary-toolbar .button:focus:hover, -.primary-toolbar .combobox-entry .entry:focus, -.primary-toolbar .combobox-entry .button:focus, -.primary-toolbar .button.raised:focus:active, -.primary-toolbar .raised .button:focus:active, -.primary-toolbar .button.raised.default:active, -.primary-toolbar .raised .button.default:active, -.primary-toolbar GtkComboBox .button:active:focus, -.primary-toolbar .button.raised:focus, -.primary-toolbar .button.raised.default, -.primary-toolbar .raised .button:focus, -.primary-toolbar .raised .button.default, -.primary-toolbar GtkComboBox .button:focus { +button.flat:focus, +button.default, +toolbar.primary-toolbar entry:focus, +toolbar.primary-toolbar button:active:focus, +toolbar.primary-toolbar button:focus:hover, +toolbar.primary-toolbar combobox entry:focus, +toolbar.primary-toolbar combobox button:focus, +toolbar.primary-toolbar button.raised:focus:active, +toolbar.primary-toolbar .raised button:focus:active, +toolbar.primary-toolbar button.raised.default:active, +toolbar.primary-toolbar .raised button.default:active, +toolbar.primary-toolbar combobox button:active:focus, +toolbar.primary-toolbar button.raised:focus, +toolbar.primary-toolbar button.raised.default, +toolbar.primary-toolbar .raised button:focus, +toolbar.primary-toolbar .raised button.default, +toolbar.primary-toolbar combobox button:focus { border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; border-radius: 3px; border-width: 1px 1px 2px 1px; @@ -612,7 +624,7 @@ GtkListBoxRow.button.list-row:hover { } /* focused primary toolbar button borders */ -.primary-toolbar .button:focus { +toolbar.primary-toolbar button:focus { border-image: url("img/border-focused-ptb.svg") 3 3 4 3 / 3px 3px 4px 3px repeat; border-radius: 3px; border-width: 1px 1px 2px 1px; @@ -621,7 +633,7 @@ GtkListBoxRow.button.list-row:hover { } /* focused switch trough borders */ -GtkSwitch.trough:active { +switch:active { border-image: url("img/border-focused-switch.svg") 3 3 4 3 / 3px 3px 4px 3px stretch; border-radius: 3px; border-width: 1px 1px 2px 1px; @@ -629,121 +641,3 @@ GtkSwitch.trough:active { border-color: transparent; } -/* column-headers borders */ -column-header.button, -column-header .button, -column-header.button:focus, -column-header .button:focus, -column-header.button:active, -column-header .button:active, -column-header.button:active:hover, -column-header .button:active:hover -column-header.button:active:focus, -column-header .button:active:focus { - border-image: none; - border-width: 1px; - border-radius: 0; - border-style: solid; - border-color: @column_header_border_top_color @column_header_border_right_color - @column_header_border_bottom_color @column_header_border_left_color; - -} - -column-header.button:last-child, -column-header:last-child .button, -column-header.button:last-child:focus, -column-header:last-child .button:focus, -column-header.button:last-child:active, -column-header:last-child .button:active, -column-header.button:last-child:active:hover, -column-header:last-child .button:active:hover, -column-header.button:last-child:active:focus, -column-header:last-child .button:active:focus { - border-right: none; -} - -/* Leftmost button */ -.linked .entry:first-child, -.linked > GtkComboBox:first-child > .button:last-child, -.linked > GtkComboBox:first-child > .button:active:last-child, -.linked > GtkComboBox:first-child > .button:active:hover:last-child, -.linked > GtkComboBox:first-child > .button:focus:last-child, -.linked > GtkComboBox:first-child > .button:focus:active:last-child, -.linked > GtkComboBox:first-child > .button:insensitive:last-child, -.linked .button:first-child, -.linked .button:active:first-child, -.linked .button:active:hover:first-child, -.linked .button:focus:first-child, -.linked .button:focus:active:first-child, -.linked .button:insensitive:first-child { - border-image: none; - border-radius: 3px 0 0 3px; - border-color: @border_color; - border-width: 1px; - padding: 1px 2px; -} - -/* Middle button */ -.linked .entry, -.linked > GtkComboBox > .button:last-child, -.linked > GtkComboBox > .button:active:last-child, -.linked > GtkComboBox > .button:active:hover:last-child, -.linked > GtkComboBox > .button:focus:last-child, -.linked > GtkComboBox > .button:focus:active:last-child, -.linked > GtkComboBox > .button:insensitive:last-child, -.linked .button, -.linked .button:active, -.linked .button:active:hover, -.linked .button:focus, -.linked .button:focus:active, -.linked .button:insensitive { - border-image: none; - border-radius: 0; - border-color: @border_color; - border-width: 1px 0; - padding: 1px 2px; -} - -/* Rightmost button */ -.linked .entry:last-child, -.linked > GtkComboBox:last-child > .button, -.linked > GtkComboBox:last-child > .button:last-child, -.linked .button:last-child, -.linked .button:active:last-child, -.linked .button:active:hover:last-child, -.linked .button:focus:last-child, -.linked .button:focus:active:last-child, -.linked .button:insensitive:last-child { - border-image: none; - border-radius: 0 3px 3px 0; - border-color: @border_color; - border-width: 1px; - padding: 1px 2px; -} - -/* Dialog Action Area */ - -/* Leftmost button */ -.dialog-action-area.linked .button:first-child, -.dialog-action-area.linked .button:active:first-child, -.dialog-action-area.linked .button:active:hover:first-child, -.dialog-action-area.linked .button:focus:first-child, -.dialog-action-area.linked .button:focus:active:first-child, -.dialog-action-area.linked .button:insensitive:first-child, -/* Middle button */ -.dialog-action-area.linked .button, -.dialog-action-area.linked .button:active, -.dialog-action-area.linked .button:active:hover, -.dialog-action-area.linked .button:focus, -.dialog-action-area.linked .button:focus:active, -.dialog-action-area.linked .button:insensitive, -/* Rightmost button */ -.dialog-action-area.linked .button:last-child, -.dialog-action-area.linked .button:active:last-child, -.dialog-action-area.linked .button:active:hover:last-child, -.dialog-action-area.linked .button:focus:last-child, -.dialog-action-area.linked .button:focus:active:last-child, -.dialog-action-area.linked .button:insensitive:last-child { - border-radius: 3px; - border-width: 1px; -} diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 1069703a..fff64a5e 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -1,5 +1,5 @@ * { - engine: none; + /*engine: none;*/ padding: 0; background-clip: padding-box; @@ -8,34 +8,36 @@ -GtkTextView-error-underline-color: @error_color; - -GtkPaned-handle-size: 5; + /*-GtkPaned-handle-size: 5;*/ - -GtkCheckButton-indicator-size: 16; - -GtkCheckMenuItem-indicator-size: 10; + /*-GtkCheckButton-indicator-size: 16; + -GtkCheckMenuItem-indicator-size: 10;*/ -GtkScrolledWindow-scrollbar-spacing: 3; - -GtkScrolledWindow-scrollbars-within-bevel: 0; + /*-GtkScrolledWindow-scrollbars-within-bevel: 0;*/ -GtkToolItemGroup-expander-size: 11; - -GtkExpander-expander-size: 14; + /*-GtkExpander-expander-size: 14;*/ - -GtkMenu-horizontal-padding: 0; - -GtkMenu-vertical-padding: 0; + /*-GtkMenu-horizontal-padding: 0; + -GtkMenu-vertical-padding: 0;*/ - -GtkWidget-link-color: @link_color; - -GtkWidget-visited-link-color: @visited_link_color; + /*-GtkWidget-link-color: @link_color; + -GtkWidget-visited-link-color: @visited_link_color;*/ -GtkIMHtml-hyperlink-color: @link_color; -GtkHTML-link-color: @link_color; -WnckTasklist-fade-overlay-rect: 0; - -GtkWidget-focus-padding: 2; - -GtkWidget-focus-line-width: 1; + /*-GtkWidget-focus-padding: 2; + -GtkWidget-focus-line-width: 1;*/ outline-color: @focus_border_color; outline-style: dashed; outline-offset: -2px; outline-width: 1px; - outline-radius: 2px; + + -gtk-outline-radius: 2px; + -gtk-icon-style: regular; /* disable symbolic icons */ -GtkWindow-resize-grip-width: 11; -GtkWindow-resize-grip-height: 11; @@ -45,8 +47,9 @@ * Base States * ***************/ -GtkWindow { +window { color: @theme_fg_color; + margin: 0px; } .background { @@ -60,28 +63,31 @@ GtkWindow { color: @theme_selected_fg_color; } -*:insensitive { +*:disabled { background-color: @insensitive_bg_color; color: @insensitive_fg_color; text-shadow: 1px 1px @insensitive_text_shadow_color; - border-color: @insensitive_border_color; + /*border-color: @insensitive_border_color;*/ } -GtkImage, -GtkImage:insensitive, -GtkLabel, -GtkLabel:insensitive, -GtkBox, -GtkBox:insensitive, +image, +image:disabled, +label, +label:disabled, +box, +box:disabled, GtkGrid, -GtkGrid:insensitive { +GtkGrid:disabled { background-color: transparent; } /************ * Tooltips * ************/ -.tooltip { +tooltip, +tooltip.background, +.tooltip, +.tooltip.background { padding: 4px; border-style: solid; border-width: 1px; @@ -91,8 +97,9 @@ GtkGrid:insensitive { color: @theme_tooltip_fg_color; } +tooltip *, .tooltip * { - background-color: transparent; + text-shadow: none; } /***************** @@ -104,17 +111,17 @@ GtkGrid:insensitive { -gtk-icon-transform: rotate(1turn); } } -.spinner { +spinner { background-image: none; background-color: blue; opacity: 0; -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); } -.spinner:active { +spinner:active { opacity: 1; animation: spin 1s linear infinite; } -.spinner:active:insensitive { +spinner:active:disabled { opacity: 0.5; } @@ -163,8 +170,9 @@ GtkGrid:insensitive { -GtkButton-inner-border: 0; } -.view.rubberband, -.rubberband { +.rubberband, +view rubberband, +rubberband { background-color: alpha (@theme_selected_bg_color, 0.35); border-color: @theme_selected_bg_color; border-style: solid; @@ -172,10 +180,18 @@ GtkGrid:insensitive { border-radius: 2px; } -GtkStatusbar { - padding: 5px; +statusbar { + margin: -7px -10px -6px -10px; +} + +statusbar label, +statusbar frame { color: @theme_fg_color; - -GtkStatusbar-shadow-type: none; + border-width: 0px; +} + +statusbar frame { + border-width: 0; } .dnd { @@ -185,49 +201,33 @@ GtkStatusbar { border-radius: 0; } -GtkTreeView.view.separator, -GtkTreeView.separator, -.separator, -.separator:hover { - color: shade(@border_color, 1.30); -} - -.pane-separator, -.pane-separator:hover, -.pane-separator:selected { - color: @theme_bg_color; - background-color: @theme_bg_color; - background-repeat: no-repeat; - background-position: center; -} - /**************** * Text Entries * ****************/ -.entry { +entry { border-style: solid; padding: 4px; color: @entry_text_color; background-color: @theme_base_color; } -.entry.progressbar { +entry progressbar { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } -.entry:selected { +entry selection { color: @theme_selected_fg_color; background-color: @theme_selected_bg_color; } -.entry:insensitive { +entry:disabled { color: @insensitive_fg_color; } /* Entry background */ -.entry { +entry { background-color: @entry_bg_color; background-image: linear-gradient(to bottom, @entry_inner_border_color 1px, @@ -235,12 +235,12 @@ GtkTreeView.separator, } /* Focused entry background */ -.entry:focus { +entry:focus { background-image: none; } /* Insensitive entry background */ -.entry:insensitive { +entry:disabled { background-image: linear-gradient(to bottom, @entry_insensitive_inner_border_color 2px, @entry_insensitive_bg_color 3px); @@ -250,15 +250,15 @@ GtkTreeView.separator, * Symbolic images * *******************/ -.image { +image { color: @internal_element_color; } -.image:hover { +image:hover { color: @internal_element_hover_color; } -.image:selected { +image:selected { color: @theme_selected_fg_color; } @@ -266,8 +266,8 @@ GtkTreeView.separator, * Color Chooser * *****************/ -GtkColorSwatch, -GtkColorSwatch:selected { +colorswatch, +colorswatch:selected { border-width: 1px; border-style: solid; border-radius: 3px; @@ -276,13 +276,13 @@ GtkColorSwatch:selected { background-clip: border-box; } -GtkColorSwatch:hover, -GtkColorSwatch:selected:hover { +colorswatch:hover, +colorswatch:selected:hover { border-color: @color_swatch_hover_border_color; } -GtkColorChooserWidget #add-color-button:hover, -GtkColorChooserWidget #add-color-button:selected:hover { +colorchooser #add-color-button:hover, +colorchooser #add-color-button:selected:hover { } .color-active-badge, @@ -304,8 +304,8 @@ GtkColorChooserWidget #add-color-button:selected:hover { color: @color_active_badge_dark_color; } -GtkColorEditor GtkColorSwatch.color-light:hover, -GtkColorEditor GtkColorSwatch.color-dark:hover { +GtkColorEditor colorswatch.color-light:hover, +GtkColorEditor colorswatch.color-dark:hover { background-image: none; } @@ -313,16 +313,35 @@ GtkColorEditor GtkColorSwatch.color-dark:hover { * Progress bar * ****************/ -GtkProgressBar { +progressbar { + border-radius: 3px; padding: 0 0 1px 0; } +progressbar.horizontal trough, +progressbar.horizontal progress { + min-height: 16px; + border-radius: 3px; +} + +progressbar.vertical trough, +progressbar.vertical progress { + min-width: 16px; + border-radius: 3px; +} + +progressbar.vertical trough { + background-image: linear-gradient(to right, + @trough_gradient_a, + @trough_gradient_b 4px); +} + /* progress component */ -.progressbar, -.progressbar row, -.progressbar row:hover, -.progressbar row:selected, -.progressbar row:selected:focus { +progressbar.horizontal progress, +row progressbar progress, +row:hover progressbar progress, +row:selected progressbar progress, +row:selected:focus progressbar progress { background-color: @progressbar_bg_color; background-image: linear-gradient(to bottom, alpha (@progressbar_gradient_a, 0.7), @@ -338,14 +357,16 @@ GtkProgressBar { border-width: 1px; border-style: solid; border-color: @progressbar_border_color; + min-height: 16px; + margin: 0 -1px 0 -1px; } -.progressbar row:selected, -.progressbar row:selected:focus { +row:selected progressbar progress, +row:selected:focus progressbar progress { border-color: shade(@progressbar_border_color, 0.85); } -.progressbar.vertical { +progressbar.vertical progress { background-image: linear-gradient(to right, alpha (@progressbar_gradient_a, 0.7), alpha (@progressbar_gradient_b, 0.7) 50%, @@ -356,97 +377,141 @@ GtkProgressBar { alpha (@progressbar_pattern_color, 0.0) 12px, alpha (@progressbar_pattern_color, 0.5) 12px, alpha (@progressbar_pattern_color, 0.5) 24px); + border-radius: 3px; + border-width: 1px; + border-style: solid; + border-color: @progressbar_border_color; + min-width: 16px; + margin: -1px 0 -1px 0; } /* for progressbars in cell renderers */ -.trough row { +row trough { padding: 0; } - -.trough row:selected, -.trough row:selected:focus { +/* +row:selected progressbar trough, +row:selected:focus progressbar trough { background-image: -gtk-gradient (linear, left top, left bottom, from (mix (@trough_gradient_a, @theme_selected_bg_color, 0.25)), to (mix (@trough_gradient_b, @theme_selected_bg_color, 0.25))); -} +}*/ /************ * GtkScale * ************/ -GtkScale { +scale.vertical { + min-width: 10px; + padding: 3px 5px; +} + +scale.horizontal { + min-height: 10px; + padding: 5px 2px; +} + +/*scale { -GtkScale-slider-length: 21; -GtkRange-slider-width: 13; -GtkRange-trough-border: 4; +}*/ + +scale.horizontal slider, +scale.horizontal slider:hover, +scale.horizontal slider:disabled { + border-radius: 0; + border-style: none; + background-color: transparent; + min-width: 21px; + min-height: 13px; + margin: -5px 0 -5px 0; } -GtkScale.slider, -GtkScale.slider:hover, -GtkScale.slider:insensitive { +scale.vertical slider, +scale.vertical slider:hover, +scale.vertical slider:disabled { border-radius: 0; border-style: none; background-color: transparent; + min-width: 13px; + min-height: 21px; + margin: 0 -5px 0 -5px; } -GtkScale.trough, -GtkScale.trough.highlight, -GtkScale.trough.vertical, -GtkScale.trough:insensitive { +scale.horizontal trough, +scale.vertical trough, +scale trough highlight, +scale trough:disabled { + min-width: 3px; + min-height: 3px; border-image: none; border-style: solid; border-width: 1px; border-radius: 1px; - background-image: none; } -GtkScale.trough { +scale.horizontal trough { + margin: 5px 0 5px 0; +} + +scale trough { margin: 8px 0; border-color: @scale_trough_border_color; background-color: @scale_trough_bg_color; + background-image: none; } -GtkScale.trough.vertical { +scale.vertical trough { margin: 0 8px; + background-image: none; } -GtkScale.trough.highlight { +scale trough highlight { border-color: @scale_trough_highlight_border_color; background-color: @scale_trough_highlight_bg_color; + margin: -1px; } -GtkScale.trough:insensitive { +scale trough:disabled { border-color: @scale_trough_insensitive_border_color; background-color: @scale_trough_insensitive_highlight_bg_color; } -GtkScale.trough.highlight:insensitive { +scale trough highlight:disabled { border-color: @scale_trough_highlight_insensitive_border_color; background-color: @scale_trough_highlight_insensitive_bg_color; } -GtkScale.progressbar { - background-color: @scale_progressbar_bg_color; +scale marks indicator { + color: @scale_mark_color; } -GtkScale.mark { - color: @scale_mark_color; +scale:focus { +} + +scale:focus trough { } /********** * Frames * **********/ + frame > border, .frame { - border-width: 1px; - border-color: @border_color; - border-style: solid; - border-radius: 3px; - background-color: @theme_bg_color; + box-shadow: none; + margin: 0; padding: 0; + border-radius: 3px; + border: 1px solid @border_color; } -GtkScrolledWindow.frame { +frame > label { + padding: 0px 4px 0px 4px; +} + +scrolledwindow frame { border-style: solid; border-color: @border_color; border-width: 1px; @@ -454,152 +519,256 @@ GtkScrolledWindow.frame { padding: 0; } -GtkScrolledWindow GtkViewport { +scrolledwindow viewport { background-color: @theme_bg_color; } /* avoid double borders when a viewport is * packed into a GtkScrolledWindow */ -GtkScrolledWindow GtkViewport.frame { +scrolledwindow viewport.frame { border-style: none; } /*********** * Buttons * ***********/ - -.button, -.button.menuitem.menubar, -.combobox-entry .button, -.inline-toolbar.toolbar .button, -.primary-toolbar.toolbar.horizontal .button, -.primary-toolbar.toolbar.horizontal .button:active, -.toolbar.horizontal .button, -.toolbar.horizontal .button:active, -.titlebar .linked.raised .button, -.titlebar .linked.raised .button:active { +button { + min-height: 16px; +} + +button, +button.menuitem.menubar, +toolbar.inline-toolbar button, +toolbar.primary-toolbar button, +toolbar.primary-toolbar button:active, +toolbar.horizontal button, +toolbar.horizontal button:active, +.titlebar .linked.raised button, +.titlebar .linked.raised button:active { padding: 5px 8px 6px; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@button_gradient_a), + color-stop (0.50, @button_gradient_b), + color-stop (0.50, @button_gradient_c), + to (@button_gradient_d)); + background-color: transparent; } -GtkComboBox GtkToggleButton.button, -GtkComboBoxText GtkToggleButton.button, -.toolbar.horizontal GtkComboBox GtkToggleButton.button, -.toolbar.horizontal GtkComboBoxText GtkToggleButton.button { - padding: 2px; +toolbar button, +toolbar.primary-toolbar button, +toolbar.horizontal button:hover, +toolbar.horizontal button:active { + padding: 4px 6px; } -.path-bar .button, -.path-bar .button GtkImage, -.path-bar .button GtkLabel { +.path-bar button, +.linked.path-bar > button, +.path-bar button image, +.path-bar button label { padding: 2px; } -.path-bar .button { +.path-bar button { border-width: 1px 0px 1px 1px; } -.path-bar .button:hover:active { - border-left-width: 1px; -} - -.path-bar .button:first-child, -.path-bar .button:first-child:hover:active { +.path-bar button:first-child, +.path-bar button:first-child:hover:active { border-right-width: 0px; } -.path-bar .button:only-child, -.path-bar .button:only-child:hover:active { +.path-bar button:only-child, +.path-bar button:only-child:hover:active { border-radius: 3px; border-right-width: 1px; } -.linked.raised .button:first-child, -.linked.raised .button:first-child:hover:active { +.linked.raised button:first-child, +.linked.raised button:first-child:hover:active { border-right-width: 0px; } -.button { - -GtkButton-image-spacing: 4; +button { + -GtkButton-image-spacing: 4px; -GtkButton-interior-focus: true; -GtkButton-default-border: 0; - -GtkButton-inner-border: 3; + -GtkButton-inner-border: 3px; color: @theme_text_color; border-style: solid; border-color: transparent; } -/* We want anything inside the buttons to use their background */ -.button * { - background-color: transparent; -} - /* We may want a background for focused buttons, but in the meantime let's remove it too */ GtkMenuToolButton *, -.primary-toolbar .button, -.primary-toolbar .button:insensitive { +toolbar.horizontal button, +toolbar.horizontal button.combo, +toolbar.primary-toolbar button, +toolbar.inline-toolbar button, +toolbar.primary-toolbar button:disabled { background-image: none; background-color: transparent; } -.primary-toolbar .button { +toolbar.primary-toolbar button { border-image: none; border-style: solid; border-width: 1px 1px 2px 1px; border-color: transparent; } -.primary-toolbar .button *:active, -.inline-toolbar .button *:active, -.button *:active, -.button *:active:focus, -.button *:focus { +toolbar.primary-toolbar button:checked, +toolbar.inline-toolbar button:checked, +button:active, +button:active:focus, +button:focus, +button:hover { + background-color: @theme_selected_bg_color; color: @button_active_text_color; + border-color: @theme_selected_bg_color; } -.button *:insensitive, -.button *:active:insensitive { +button:disabled, +button:active:disabled { color: @insensitive_fg_color; } -.button .separator { - color: shade(@internal_element_color, 1.30); +/* Focused primary toolbar button background */ +button:focus, +toolbar.primary-toolbar button:focus { + background-image: linear-gradient(to bottom, + @pt_button_focus_gradient_a, + @pt_button_focus_gradient_b 50%, + @pt_button_focus_gradient_c 50%, + @pt_button_focus_gradient_d); +} + +/* Focused + prelit primary toolbar button background */ +toolbar.primary-toolbar button:focus:hover { + background-image: linear-gradient(to bottom, + @pt_button_focus_hover_gradient_a, + @pt_button_focus_hover_gradient_b 50%, + @pt_button_focus_hover_gradient_c 50%, + @pt_button_focus_hover_gradient_d); } /***************** * GtkSpinButton * *****************/ -.spinbutton .button, -.spinbutton .button:focus { +spinbutton, +spinbutton:focus { color: @internal_element_color; - padding: 2px 6px; - border-width: 0 0 0 1px; - border-radius: 0; + padding: 0px; + border-width: 1px; + border-radius: 3px; border-style: solid; border-color: @spinbutton_border_color; border-image: none; } -.spinbutton .button { - background-color: transparent; +spinbutton.horizontal > entry, +spinbutton.horizontal > entry:focus { + padding: 0px 10px 0px 3px; + box-shadow: none; + border-radius: 3px 0px 0px 3px; + border-style: none; + border-image: none; } -.spinbutton .button:insensitive { - color: @internal_element_insensitive_color; +spinbutton > button, +spinbutton > button:focus, +spinbutton > button:focus:active { + background-color: transparent; + color: @internal_element_color; + padding: 6px; + border-radius: 0; + border-width: 0 0 0 1px; + border-style: solid; + border-color: @spinbutton_border_color; + border-image: none; } -.spinbutton .button:active, -.spinbutton .button:active:focus, -.spinbutton .button:hover { - color: @internal_element_hover_color; +spinbutton > button:disabled { + color: @internal_element_insensitive_color; + border-color: @insensitive_border_color; + border-image: none; + border-radius: 0; } -.spinbutton .button:first-child { - border-radius: 2px 0 0 2px; +spinbutton > button:checked, +spinbutton > button:focus:checked, +spinbutton > button:hover { + color: @internal_element_hover_color; } -.spinbutton .button:last-child { - border-radius: 0 2px 2px 0; +spinbutton.horizontal > button { + border-width: 0 0 0 1px; +} + +spinbutton.horizontal > button:last-child { + border-radius: 0 3px 3px 0; +} + +/*vertical */ +spinbutton.vertical > entry, +spinbutton.vertical > entry:focus { + border-image: none; + border-color: @spinbutton_border_color; + border-radius: 0px; + border-width: 1px 0px 1px 0px; + padding: 6px 2px; +} + +spinbutton.vertical > button, +spinbutton.vertical > button:focus, +spinbutton.vertical > button:focus:active, +spinbutton.vertical > button:last-child, +spinbutton.vertical > button:focus:last-child, +spinbutton.vertical > button:focus:active:last-child { + padding: 6px 2px; + border-width: 0px; +} + +spinbutton.vertical > button, +spinbutton.vertical > button:focus, +spinbutton.vertical > button:focus:active { + border-radius: 3px 3px 0px 0px; +} + +spinbutton.vertical > button:last-child, +spinbutton.vertical > button:focus:last-child, +spinbutton.vertical > button:focus:active:last-child { + border-radius: 0px 0px 3px 3px; +} + +/* linked */ +.linked.vertical > spinbutton.horizontal { + padding: 0px; + border-radius: 0px ; + border-width: 0px 1px 1px 1px; +} + +.linked.vertical > spinbutton.horizontal > entry, +.linked.vertical > spinbutton.horizontal > entry:focus { + padding: 0px 10px 0px 3px; + border-radius: 0px ; + border-style: none; + border-image: none; + box-shadow: none; +} + +.linked.vertical > spinbutton.horizontal > button, +.linked.vertical > spinbutton.horizontal > button:focus, +.linked.vertical > spinbutton.horizontal > button:hover, +.linked.vertical > spinbutton.horizontal > button:focus:active, +.linked.vertical > spinbutton.horizontal > button:focus:hover { + border-radius: 0px; + border-width: 0 0 0 1px; + border-image: none; + border-color: @spinbutton_border_color; + padding: 6px; } /********************* @@ -607,18 +776,11 @@ GtkMenuToolButton *, *********************/ /* Button background */ -.button, -.spinbutton .button, -.toolbar .button.raised, -.toolbar .raised .button, -.toolbar .button.raised:focus, -.toolbar .raised .button:focus, -.toolbar GtkComboBox .button, -.toolbar GtkComboBox .button:focus, -.combobox-entry .button, -.primary-toolbar .combobox-entry .button, +button, +spinbutton button, +combobox button.combo, .titlebar .titlebutton:hover, -GtkColorChooserWidget #add-color-button { +colorchooser #add-color-button { background-image: -gtk-gradient (linear, left top, left bottom, @@ -630,27 +792,29 @@ GtkColorChooserWidget #add-color-button { } /* Pushed button background */ -.button:checked, -.button:checked:hover, -.button:active, -.button:active:hover, -.menuitem.button:hover, -.spinbutton .button:active, -.spinbutton .button:active:hover, -.toolbar .button:active, -.toolbar .button:active:hover, -.toolbar .button.raised:active, -.toolbar .raised .button:active, -.toolbar .button.raised:active:hover, -.toolbar .raised .button:active:hover, -.primary-toolbar .combobox-entry .button:active, -.combobox-entry .button:active, -.primary-toolbar .button:active, -.primary-toolbar .button:active:hover, -.primary-toolbar .button:focus:active, -.primary-toolbar .button:focus:active:hover, -.inline-toolbar .button:active, -.inline-toolbar .button:active:hover { +button:checked, +button:checked:hover, +button:hover:active, +menuitem button:hover, +spinbutton button:active, +spinbutton button:active:hover, +combobox button.combo:checked, +toolbar button:checked, +toolbar button:checked:hover, +toolbar button:hover:active, +toolbar button.raised:checked, +toolbar .raised button:checked, +toolbar button.raised:hover:active, +toolbar button.raised:checked:hover, +toolbar .raised button:hover:active, +toolbar .raised button:checked:hover, +toolbar.primary-toolbar combobox button.combo:checked, +toolbar.primary-toolbar button:checked, +toolbar.primary-toolbar button:hover:active, +toolbar.primary-toolbar button:focus:active, +toolbar.primary-toolbar button:focus:hover:active, +toolbar.inline-toolbar button:checked, +toolbar.inline-toolbar button:hover:active { background-image: linear-gradient(to bottom, @button_active_gradient_a, @button_active_gradient_b 3px, @@ -661,65 +825,34 @@ GtkColorChooserWidget #add-color-button { background-color: transparent; } -GtkListBoxRow.button.list-row:hover { - background-image: linear-gradient(to bottom, - shade(@button_active_gradient_a, 1.20), - shade(@button_active_gradient_b, 1.20) 3px, - shade(@button_active_gradient_c, 1.20) 4px, - shade(@button_active_gradient_d, 1.20) 50%, - shade(@button_active_gradient_e, 1.20) 50%, - shade(@button_active_gradient_f, 1.20)); - background-color: transparent; -} - -GtkListBoxRow.button.list-row { - color: @theme_text_color; - background-color: @theme_base_color; - border-radius: 0px; - border: none; -} - -GtkListBoxRow.button.list-row:selected { - color: @theme_selected_fg_color; - border-style: solid; - border-width: 1px; - border-color: @menubar_menuitem_hover_border_color; - background-image: -gtk-gradient (linear, - left top, - left bottom, - from (@menubar_menuitem_hover_gradient_a), - color-stop (0.50, @menubar_menuitem_hover_gradient_b), - color-stop (0.50, @menubar_menuitem_hover_gradient_c), - to (@menubar_menuitem_hover_gradient_d)); -} - -.trough, -.trough.highlight, -.trough row, -.trough row:hover { +trough, +trough.highlight, +trough row, +trough row:hover { background-image: linear-gradient(to bottom, @trough_gradient_a, @trough_gradient_b 4px); } /* Flipped pushed button background for vertical progressbar through and the like */ -.trough.vertical { +trough.vertical { background-image: linear-gradient(to right, @trough_gradient_a, @trough_gradient_b 4px); } /* Prelit button background */ -.button:hover, -.spinbutton .button:hover, -.toolbar .button:hover, -.toolbar .button.raised:hover, -.toolbar .raised .button:hover, -.toolbar GtkComboBox .button:hover, -.primary-toolbar .button:hover, -.combobox-entry .button:hover, -.primary-toolbar .combobox-entry .button:hover, -GtkColorChooserWidget #add-color-button:hover { +button:active, +button:hover, +spinbutton button:hover, +combobox button.combo:hover, +toolbar button:hover, +toolbar button.raised:hover, +toolbar .raised button:hover, +toolbar combobox button.combo:hover, +toolbar.primary-toolbar button:hover, +toolbar.primary-toolbar combobox button.combo:hover, +colorchooser #add-color-button:hover { background-color: transparent; background-image: linear-gradient(to bottom, @button_hover_gradient_a 50%, @@ -728,9 +861,9 @@ GtkColorChooserWidget #add-color-button:hover { } /* Insensitive button background */ -.button:insensitive, -.toolbar GtkComboBox .button:insensitive, -.combobox-entry .button:insensitive { +button:disabled, +combobox button.combo:disabled, +toolbar combobox button.combo:disabled { background-image: linear-gradient(to bottom, @button_insensitive_inner_border_color 1px, @button_insensitive_gradient_a 2px, @@ -741,9 +874,9 @@ GtkColorChooserWidget #add-color-button:hover { } /* Pushed + Insensitive button background */ -.button:active:insensitive, -.toolbar .button:active:insensitive, -.toolbar GtkComboBox .button:active:insensitive { +button:checked:disabled, +toolbar button:checked:disabled, +toolbar combobox button.combo:checked:disabled { background-image: linear-gradient(to bottom, @button_active_insensitive_gradient_a, @button_active_insensitive_gradient_b 3px, @@ -755,7 +888,7 @@ GtkColorChooserWidget #add-color-button:hover { } /* Focused primary toolbar button background */ -.primary-toolbar .button:focus { +toolbar.primary-toolbar button:focus { background-image: linear-gradient(to bottom, @pt_button_focus_gradient_a, @pt_button_focus_gradient_b 50%, @@ -764,7 +897,7 @@ GtkColorChooserWidget #add-color-button:hover { } /* Focused + prelit primary toolbar button background */ -.primary-toolbar .button:focus:hover { +toolbar.primary-toolbar button:focus:hover { background-image: linear-gradient(to bottom, @pt_button_focus_hover_gradient_a, @pt_button_focus_hover_gradient_b 50%, @@ -772,40 +905,60 @@ GtkColorChooserWidget #add-color-button:hover { @pt_button_focus_hover_gradient_d); } +button separator { + border-left: solid 1px @theme_fg_color; + padding-left: 2px; + padding-right: 2px; +} + /***************** * Notebooks and * * tabs * *****************/ -.notebook { +notebook { padding: 0; background-clip: border-box; background-color: @notebook_bg_color; - -GtkNotebook-tab-overlap: 2; + /*border-radius: 3px 3px 0px 0px;*/ + /*-GtkNotebook-tab-overlap: 2; -GtkNotebook-tab-curvature: 3; - -GtkNotebook-initial-gap: 0; -} - -.notebook.header.frame { - border-width: 0; + -GtkNotebook-initial-gap: 0;*/ } -.notebook GtkViewport { - background-color: @theme_bg_color; +notebook viewport { + background-color: @theme_base_color; } -.notebook tab { +notebook tab { padding: 3px; - border-radius: 3px; - border-color: @border_color; border-style: solid; border-width: 1px; - background-color: transparent; + border-color: @menu_border_color; +} + +notebook header.top { + box-shadow: inset 0px -1px 0 0 @border_color; +} + +notebook header.bottom { + box-shadow: inset 0px 1px 0 0 @border_color; } -.notebook tab.top { - padding: 4px 2px 0 2px; - border-width: 1px 1px 0px; +notebook header.left { + box-shadow: inset -1px 0px 0 0 @border_color; +} + +notebook header.right { + box-shadow: inset 1px 0px 0 0 @border_color; +} + +notebook header.top tab { + padding: 4px 6px 3px 6px; + border-width: 1px; + border-radius: 3px 3px 0px 0px; + margin-top: 3px; + margin-left: -1px; background-image: linear-gradient(to bottom, @notebook_tab_inner_border_color 1px, @notebook_tab_gradient_a 2px, @@ -814,9 +967,12 @@ GtkColorChooserWidget #add-color-button:hover { @notebook_tab_gradient_d); } -.notebook tab.right { - padding: 2px 4px 2px 0; - border-width: 1px 1px 1px 0; +notebook header.right tab { + padding: 6px 6px 6px 6px; + border-width: 1px; + border-radius: 0px 3px 3px 0px; + margin-right: 3px; + margin-top: -1px; background-image: linear-gradient(to left, @notebook_tab_inner_border_color 1px, @notebook_tab_gradient_a 2px, @@ -825,9 +981,12 @@ GtkColorChooserWidget #add-color-button:hover { @notebook_tab_gradient_d); } -.notebook tab.bottom { - padding: 0 2px 4px; - border-width: 0px 1px 1px; +notebook header.bottom tab { + padding: 3px 6px 4px 6px; + border-width: 1px; + border-radius: 0px 0px 3px 3px; + margin-bottom: 3px; + margin-left: -1px; background-image: linear-gradient(to top, @notebook_tab_inner_border_color 1px, @notebook_tab_gradient_a 2px, @@ -836,9 +995,12 @@ GtkColorChooserWidget #add-color-button:hover { @notebook_tab_gradient_d); } -.notebook tab.left { - padding: 2px 0 2px 4px; - border-width: 1px 0 1px 1px; +notebook header.left tab { + padding: 6px 6px 6px 6px; + border-width: 1px; + border-radius: 3px 0px 0px 3px; + margin-left: 3px; + margin-top: -1px; background-image: linear-gradient(to right, @notebook_tab_inner_border_color 1px, @notebook_tab_gradient_a 2px, @@ -847,8 +1009,10 @@ GtkColorChooserWidget #add-color-button:hover { @notebook_tab_gradient_d); } -.notebook tab.top:active { +notebook header.top tab:checked { padding-top: 7px; + margin-top: 0px; + border-bottom: 0px; border-top-color: @notebook_active_tab_border; background-image: linear-gradient(to bottom, @notebook_active_tab_strip_gradient_a, @@ -858,8 +1022,10 @@ GtkColorChooserWidget #add-color-button:hover { @notebook_active_tab_gradient_b); } -.notebook tab.right:active { +notebook header.right tab:checked { padding-right: 7px; + margin-right: 0px; + border-left: 0px; border-right-color: @notebook_active_tab_border; background-image: linear-gradient(to left, @notebook_active_tab_strip_gradient_a, @@ -869,8 +1035,10 @@ GtkColorChooserWidget #add-color-button:hover { @notebook_active_tab_gradient_b); } -.notebook tab.bottom:active { - padding-bottom: 7px; +notebook header.bottom tab:checked { + padding-bottom: 6px; + margin-bottom: 0px; + border-top: 0px; border-bottom-color: @notebook_active_tab_border; background-image: linear-gradient(to top, @notebook_active_tab_strip_gradient_a, @@ -880,8 +1048,10 @@ GtkColorChooserWidget #add-color-button:hover { @notebook_active_tab_gradient_b); } -.notebook tab.left:active { - padding-left: 7px; +notebook header.left tab:checked { + padding-left: 8px; + margin-left: 0px; + border-right: 0px; border-left-color: @notebook_active_tab_border; background-image: linear-gradient(to right, @notebook_active_tab_strip_gradient_a, @@ -891,21 +1061,32 @@ GtkColorChooserWidget #add-color-button:hover { @notebook_active_tab_gradient_b); } -.notebook tab * { - background-color: transparent; +notebook header tab:focus { + padding: 2px; } /* close button styling */ -.notebook tab .button, -.notebook tab .button:active, -.notebook tab .button:hover { +notebook button.flat.small-button { + border-image: none; + border-radius: 3px; + border-style: solid; + border-color: transparent; + border-width: 1px; + background-image: none; + background-color: transparent; + padding: 0; +} + +notebook header.* tab button, +notebook header.* tab button:active, +notebook header.* tab button:hover { border-image: none; - border-style: none; background-image: none; background-color: transparent; + border-color: alpha(black, 0.1); } -.notebook tab .button GtkImage { +notebook button image { border-radius: 3px; color: mix(@theme_fg_color, @theme_base_color, 0.6); border-style: solid; @@ -914,13 +1095,13 @@ GtkColorChooserWidget #add-color-button:hover { padding: 0; } -.notebook tab .button GtkImage:hover { +notebook button image:hover { color: @theme_fg_color; border-color: alpha(black, 0.1); } -.notebook tab .button GtkImage:active, -.notebook tab .button GtkImage:active:hover { +notebook button image:active, +notebook button image:active:hover { background-color: alpha(black, 0.08); color: @theme_base_color; border-color: alpha(black, 0.27) @@ -929,104 +1110,277 @@ GtkColorChooserWidget #add-color-button:hover { alpha(black, 0.13); } +notebook header.top tabs arrow.up, +notebook header.bottom tabs arrow.up { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); + color: @theme_fg_color; +} + +notebook header.top tabs arrow.down, +notebook header.bottom tabs arrow.down { + -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); + color: @theme_fg_color; +} + +notebook header.left tabs arrow.up, +notebook header.right tabs arrow.up { + -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); + color: @theme_fg_color; +} + +notebook header.left tabs arrow.down, +notebook header.right tabs arrow.down { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); + color: @theme_fg_color; +} + +notebook header tabs arrow { + color: @theme_fg_color; +} + +notebook header tabs arrow:hover, +notebook header tabs arrow:active { + color: @theme_selected_bg_color; +} + +notebook header tabs arrow:disabled { + color: rgba(141, 144, 145, 0.3); +} + +notebook header tabs arrow:backdrop { + color: rgba(84, 89, 90, 0.4); +} + +notebook header tabs arrow:backdrop:disabled { + color: #c7c7c7; +} + /************** * ComboBoxes * **************/ -GtkComboBox { +combobox { padding: 0; - -GtkComboBox-arrow-scaling: 0.5; - -GtkComboBox-shadow-type: none; + /*-GtkComboBox-arrow-scaling: 0.5;*/ + /*-GtkComboBox-shadow-type: none;*/ +} +combobox arrow { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); + color: @theme_fg_color; + min-height: 16px; + min-width: 16px; +} +combobox entry.combo, +combobox button.combo { + padding: 5px 5px 5px 5px; + border-image-width: 3px 0 4px 3px; + border-radius: 3px 0 0 3px; + border-right-width: 0; } -GtkComboBox *:insensitive { +combobox entry.combo:disabled, +combobox button.combo:disabled { color: @insensitive_fg_color; } -GtkComboBox .separator { - /* always disable separators */ - -GtkWidget-wide-separators: true; - -GtkWidget-horizontal-separator: 0; - -GtkWidget-vertical-separator: 0; +combobox separator { + /*-GtkWidget-wide-separators: true;*/ + -GtkWidget-horizontal-separator: 1; + -GtkWidget-vertical-separator: 1; +} + +combobox > .linked > entry.combo, +combobox > .linked > button.combo, +combobox > .linked > button.combo:focus, +combobox > .linked > button.combo:hover, +combobox > .linked > button.combo:checked, +combobox > .linked > button.combo:focus:hover, +combobox > .linked > button.combo:disabled { + border-image-width: 3px 3px 4px 3px; + border-radius: 0px; + border-width: 1px 0px 1px 0px; } -.combobox-entry .entry:first-child, -.combobox-entry .button:first-child { +combobox > .linked > entry.combo:first-child, +combobox > .linked > button.combo:first-child, +combobox > .linked > button.combo:focus:first-child, +combobox > .linked > button.combo:hover:first-child, +combobox > .linked > button.combo:checked:first-child, +combobox > .linked > button.combo:focus:hover:first-child, +combobox > .linked > button.combo:disabled:first-child { border-image-width: 3px 0 4px 3px; border-radius: 3px 0 0 3px; border-right-width: 0; } -.combobox-entry .entry:last-child, -.combobox-entry .button:last-child { +combobox > .linked > entry.combo:last-child, +combobox > .linked > button.combo:last-child, +combobox > .linked > button.combo:focus:last-child, +combobox > .linked > button.combo:hover:last-child, +combobox > .linked > button.combo:checked:last-child, +combobox > .linked > button.combo:focus:hover:last-child, +combobox > .linked > button.combo:disabled:last-child { border-image-width: 3px 3px 4px 0; border-radius: 0 3px 3px 0; - border-left-width: 0; + border-width: 0; } - -.combobox-entry .button:last-child { - border-image-width: 3px 3px 4px 2px; +combobox > .linked > entry.combo:only-child, +combobox > .linked > button.combo:only-child, +combobox > .linked > button.combo:focus:only-child, +combobox > .linked > button.combo:hover:only-child, +combobox > .linked > button.combo:checked:only-child, +combobox > .linked > button.combo:focus:hover:only-child, +combobox > .linked > button.combo:disabled:only-child { + border-image-width: 3px 3px 4px 3px; + border-radius: 3px; + border-width: 1px; +} +/* +toolbar.primary-toolbar combobox > .linked > entry.combo, +toolbar.primary-toolbar combobox > .linked > button.combo { + border-image-width: 4px 4px 4px 0; + border-radius: 0 3px 3px 0; + border-left-width: 0; } -.primary-toolbar .combobox-entry .entry:first-child, -.primary-toolbar .combobox-entry .button:first-child { +toolbar.primary-toolbar combobox > .linked > entry.combo:first-child, +toolbar.primary-toolbar combobox > .linked > button.combo:first-child { border-image-width: 4px 0 4px 4px; border-radius: 3px 0 0 3px; border-right-width: 0; } -.primary-toolbar .combobox-entry .entry:last-child, -.primary-toolbar .combobox-entry .button:last-child { +toolbar.primary-toolbar combobox > .linked > entry.combo:last-child, +toolbar.primary-toolbar combobox > .linked > button.combo:last-child { border-image-width: 4px 4px 4px 0; border-radius: 0 3px 3px 0; border-left-width: 0; } - -.combobox-entry .button *:active, -.combobox-entry .button *:active:hover { - color: @theme_text_color; -} - -GtkComboBox .button { - color: @internal_element_color; -} - -GtkComboBox .button *:hover { - color: @theme_text_color; +*/ +/* linked combobox */ + +/* Middle button */ +.linked > combobox > .linked > button.combo, +.linked > combobox > .linked > button.combo:hover, +.linked > combobox > .linked > button.combo:focus, +.linked > combobox > .linked > button.combo:focus:hover, +.linked > combobox > .linked > button.combo:checked, +.linked > combobox > .linked > button.combo:disabled { + border-image: none; + border-radius: 0; + border-color: @border_color; + border-width: 1px; + border-width: 1px; + padding: 4px 2px; +} + +/* Leftmost button */ +.linked > combobox:first-child > .linked > button.combo:first-child, +.linked > combobox:first-child > .linked > button.combo:hover:first-child, +.linked > combobox:first-child > .linked > button.combo:focus:first-child, +.linked > combobox:first-child > .linked > button.combo:focus:hover:first-child, +.linked > combobox:first-child > .linked > button.combo:checked:first-child, +.linked > combobox:first-child > .linked > button.combo:disabled:first-child { + border-radius: 3px 0 0 3px; + border-width: 1px 0px 1px 1px; +} + +/* Rightmost button */ +.linked > combobox:last-child > .linked > button.combo:last-child, +.linked > combobox:last-child > .linked > button.combo:hover:last-child, +.linked > combobox:last-child > .linked > button.combo:focus:last-child, +.linked > combobox:last-child > .linked > button.combo:focus:hover:last-child, +.linked > combobox:last-child > .linked > button.combo:checked:last-child, +.linked > combobox:last-child > .linked > button.combo:disabled:last-child { + border-radius: 0 3px 3px 0; + border-width: 1px 1px 1px 0px; +} + +/* vertical */ + +/* Middle button */ +.linked.vertical > combobox > .linked > button.combo, +.linked.vertical > combobox > .linked > button.combo:hover, +.linked.vertical > combobox > .linked > button.combo:focus, +.linked.vertical > combobox > .linked > button.combo:focus:hover, +.linked.vertical > combobox > .linked > button.combo:checked, +.linked.vertical > combobox > .linked > button.combo:disabled { + border-image: none; + border-radius: 0; + border-color: @border_color; + border-width: 0px 1px 0px 1px; + padding: 5px 5px; +} + +/* top button */ +.linked.vertical > combobox:first-child > .linked > button.combo:first-child, +.linked.vertical > combobox:first-child > .linked > button.combo:hover:first-child, +.linked.vertical > combobox:first-child > .linked > button.combo:focus:first-child, +.linked.vertical > combobox:first-child > .linked > button.combo:focus:hover:first-child, +.linked.vertical > combobox:first-child > .linked > button.combo:checked:first-child, +.linked.vertical > combobox:first-child > .linked > button.combo:disabled:first-child { + border-radius: 3px 3px 0px 0px; + border-width: 1px 1px 1px 1px; +} + +/* bottom button */ +.linked.vertical > combobox:last-child > .linked > button.combo:last-child, +.linked.vertical > combobox:last-child > .linked > button.combo:hover:last-child, +.linked.vertical > combobox:last-child > .linked > button.combo:focus:last-child, +.linked.vertical > combobox:last-child > .linked > button.combo:focus:hover:last-child, +.linked.vertical > combobox:last-child > .linked > button.combo:checked:last-child, +.linked.vertical > combobox:last-child > .linked > button.combo:disabled:last-child { + border-radius: 0px 0px 3px 3px; + border-width: 0px 1px 1px 1px; } /************** * Scrollbars * **************/ -.scrollbar { +scrollbar { background-image: none; border-style: solid; - -GtkRange-trough-border: 0; + /*-GtkRange-trough-border: 0;*/ + border-color: @scrollbar_trough_border_color; -GtkScrollbar-has-backward-stepper: true; -GtkScrollbar-has-forward-stepper: true; - -GtkRange-arrow-scaling: 0.4; + /*-GtkRange-arrow-scaling: 0.4;*/ -GtkRange-slider-width: 15; -GtkRange-stepper-size: 15px; -GtkScrollbar-min-slider-length: 30; -GtkRange-stepper-spacing: 0; -GtkRange-trough-under-steppers: 0; + box-shadow: none; + border-image: none; } -.scrollbars-junction { +scrollbar.vertical { + border-width: 0px 0px 0px 0px; + min-width: 14px; +} + +scrollbar.horizontal { + border-width: 1px 0px 0px 0px; + min-height: 14px; +} + +scrolledwindow junction { background-image: none; background-color: @scrollbars_junction_bg_color; } -.scrollbars-junction, -.scrollbar.trough { +scrollbar trough { border-color: @scrollbar_trough_border_color; border-radius: 0; border-image: none; } -.scrollbar.trough.horizontal { - border-width: 1px 0px; +scrollbar.horizontal trough { + min-height: 14px; + /*border-width: 1px 0px;*/ + border-width: 0px 1px 0px 1px; + border-image: none; background-image: -gtk-gradient (linear, left top, left bottom, @@ -1034,8 +1388,10 @@ GtkComboBox .button *:hover { color-stop (0.5, @scrollbar_trough_gradient_b)); } -.scrollbar.trough.vertical { +scrollbar.vertical trough { + min-width: 14px; border-width: 0px 1px; + border-image: none; background-image: -gtk-gradient (linear, left top, right top, @@ -1043,7 +1399,57 @@ GtkComboBox .button *:hover { color-stop (0.5, @scrollbar_trough_gradient_b)); } -.scrollbar.button { +/* Buttons */ +scrollbar button, +scrollbar .button { + border-width: 1px; + border-image: none; + border-color: @scrollbar_button_border_color; + background-image: none; + background-color: transparent; + color: @scrollbar_button_color; +} + +scrollbar.vertical button, +scrollbar.vertical .button { + min-width: 14px; + min-height: 13px; + padding: 0; +} + +scrollbar.horizontal button, +scrollbar.horizontal .button { + min-width: 13px; + min-height: 14px; + padding: 0; +} + +scrollbar.vertical button.up, +scrollbar.vertical .button.up { + border-radius: 3px 3px 0px 0px; + -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); +} + +scrollbar.vertical button.down, +scrollbar.vertical .button.down { + border-radius: 0px 0px 3px 3px; + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); +} + +scrollbar.horizontal button.up, +scrollbar.horizontal .button.up { + border-radius: 3px 0px 0px 3px; + -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); +} + +scrollbar.horizontal button.down, +scrollbar.horizontal .button.down { + border-radius: 0px 3px 3px 0px; + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); +} + +scrollbar button, +scrollbar .button { border-width: 1px; border-image: none; border-color: @scrollbar_button_border_color; @@ -1052,23 +1458,44 @@ GtkComboBox .button *:hover { color: @scrollbar_button_color; } -.scrollbar.button.top { +scrollbar button:hover, +scrollbar .button:hover { + border-image: none; + border-width: 1px; + border-radius: 0px; +} + +scrollbar button:disabled, +scrollbar .button:disabled { + color: @scrollbar_button_insensitive_color; + border-image: none; + border-width: 1px; + border-color: @scrollbar_button_insensitive_color; + border-radius: 0px; +} + +scrollbar.top button, +scrollbar.top .button { border-radius: 3px 3px 0px 0px; } -.scrollbar.button.bottom { +scrollbar.bottom button, +scrollbar.bottom .button { border-radius: 0px 0px 3px 3px; } -.scrollbar.button.left { +scrollbar.left button, +scrollbar.left .button { border-radius: 3px 0px 0px 3px; } -.scrollbar.button.right { +scrollbar.right button, +scrollbar.right .button { border-radius: 0px 3px 3px 0px; } -.scrollbar.button.horizontal { +scrollbar.horizontal button, +scrollbar.horizontal .button { background-image: -gtk-gradient (linear, left top, left bottom, @@ -1078,7 +1505,8 @@ GtkComboBox .button *:hover { to (@scrollbar_button_gradient_d)); } -.scrollbar.button.vertical { +scrollbar.vertical button, +scrollbar.vertical .button { background-image: -gtk-gradient (linear, left top, right top, @@ -1088,7 +1516,8 @@ GtkComboBox .button *:hover { to (@scrollbar_button_gradient_d)); } -.scrollbar.button.horizontal:hover { +scrollbar.horizontal button:hover, +scrollbar.horizontal .button:hover { background-image: -gtk-gradient (linear, left top, left bottom, @@ -1098,7 +1527,8 @@ GtkComboBox .button *:hover { to (@scrollbar_button_hover_gradient_d)); } -.scrollbar.button.vertical:hover { +scrollbar.vertical button:hover, +scrollbar.vertical .button:hover { background-image: -gtk-gradient (linear, left top, right top, @@ -1108,7 +1538,8 @@ GtkComboBox .button *:hover { to (@scrollbar_button_hover_gradient_d)); } -.scrollbar.button.horizontal:active { +scrollbar.horizontal button:active, +scrollbar.horizontal .button:active { background-image: -gtk-gradient (linear, left top, left bottom, @@ -1118,7 +1549,8 @@ GtkComboBox .button *:hover { to (@scrollbar_button_active_gradient_d)); } -.scrollbar.button.vertical:active { +scrollbar.vertical button:active, +scrollbar.vertical .button:active { background-image: -gtk-gradient (linear, left top, right top, @@ -1128,21 +1560,36 @@ GtkComboBox .button *:hover { to (@scrollbar_button_active_gradient_d)); } -.scrollbar.button:insensitive { +scrollbar button:disabled, +scrollbar .button:disabled { color: @scrollbar_button_insensitive_color; } -.scrollbar.slider { +scrollbar.vertical slider, +scrollbar.vertical .slider { + min-width: 14px; + min-height: 42px; + margin: 0px -1px 0px -1px; +} + +scrollbar.horizontal slider, +scrollbar.horizontal .slider { + min-width: 42px; + min-height: 14px; + margin: -1px 0px -1px 0px; +} + +scrollbar slider, +scrollbar .slider { background-color: @scrollbar_slider_bg_color; - background-image: none; border-radius: 0; border-style: solid; - border-image: none; border-color: @scrollbar_slider_border_color; border-width: 1px; } -.scrollbar.slider:hover { +scrollbar slider:hover, +scrollbar .slider:hover { background-color: @scrollbar_slider_hover_bg_color; } @@ -1151,15 +1598,15 @@ GtkComboBox .button *:hover { *********/ /* combobox menus */ -GtkTreeMenu.menu, -GtkTreeMenu.menu * { +treemenu menu { background-color: @menu_bg_color; } -GtkTreeMenu .menuitem { +treemenu menuitem { padding: 2px; } +menu, .menu { font: normal; background-color: @menu_bg_color; @@ -1170,38 +1617,38 @@ GtkTreeMenu .menuitem { border-color: @menu_border_color; } -.menu.button { +menu button, +.menu button{ background-image: none; background-color: @menu_bg_color; color: @internal_element_color; - border-image: none; border-style: none; } -.menu.button:hover { +menu button:hover, +.menu button:hover { background-image: none; background-color: @theme_base_color; color: @theme_text_color; - border-image: none; border-style: none; } -.menu.button:insensitive { +menu button:disabled, +.menu button:disabled { background-color: @theme_base_color; color: lighter(@internal_element_color); - border-image: none; border-style: none; } /* this controls the general appearance of the menubar */ +menubar, .menubar { border-style: none; - padding: 1px; + padding: 4px; -GtkWidget-window-dragging: true; - -GtkMenuBar-internal-padding: 1; background-image: -gtk-gradient (linear, left top, left bottom, @@ -1210,18 +1657,22 @@ GtkTreeMenu .menuitem { to (@menubar_gradient_c)); } -.menubar .menuitem { - border-style: none; +menubar menuitem, +.menubar menuitem { + border-style: solid; + border-width: 1px; + border-color: transparent; padding: 3px 5px; background-color: transparent; } -.menubar .menuitem:hover, -.menuitem.button.flat:hover, -.menuitem.button.flat:active { +menubar menuitem:hover, +.menubar menuitem:hover, +menuitem button.flat:hover, +menuitem button.flat:active { background-color: @menu_bg_color; border-style: solid; - border-width: 1px 1px 0px; + border-width: 1px; border-color: @menubar_menuitem_hover_border_color; border-radius: 3px 3px 0 0; color: @menubar_menuitem_hover_color; @@ -1234,48 +1685,47 @@ GtkTreeMenu .menuitem { to (@menubar_menuitem_hover_gradient_d)); } -.menuitem.button.flat:hover { +menuitem button.flat:hover { border-width: 1px; - border-radius: 3px; + border-radius: 0px; } -.menuitem.button.flat:focus { +menuitem button.flat:focus { color: @theme_text_color; } -.menubar .menuitem *:hover { +menubar menuitem:hover, +.menubar menuitem:hover { + /*border-width: 1px;*/ border-width: 1px; color: @menubar_menuitem_hover_color; } -.menu .menuitem { - -GtkMenuItem-arrow-scaling: 0.5; +menu menuitem, +.menu menuitem { + /*-GtkMenuItem-arrow-scaling: 0.5;*/ + border-width: 1px; + border-style: solid; + border-color: transparent; padding: 4px; background-color: @menu_bg_color; } -.menu .menuitem > * { - background-color: transparent; -} - -.menu .menuitem:hover { +menu menuitem:hover, +.menu menuitem:hover { border-radius: 0; -} - -GtkTreeMenu .menuitem:hover, -.menu .menuitem:active, -.menu .menuitem:hover { border-style: solid; border-width: 1px; border-color: @menubar_menuitem_hover_border_color; } -GtkTreeMenu .menuitem *:hover, -GtkComboBox .menuitem:hover *, -.menu .menuitem:active, -.menu .menuitem *:active, -.menu .menuitem:hover, -.menu .menuitem *:hover { +treemenu menuitem:hover, +combobox menuitem:hover, +menu menuitem:hover, +.menu menuitem:hover { + border-style: solid; + border-width: 1px; + border-color: @menubar_menuitem_hover_border_color; color: @theme_selected_fg_color; background-image: -gtk-gradient (linear, left top, @@ -1286,56 +1736,93 @@ GtkComboBox .menuitem:hover *, to (@menubar_menuitem_hover_gradient_d)); } -.menu .menuitem:insensitive, -.menu .menuitem *:insensitive { +menuitem:disabled, +menuitem:disabled * { color: mix (@menu_fg_color, @menu_bg_color, 0.6); + background-color: transparent; } -.menu .menuitem .accelerator:insensitive { +menuitem accelerator:disabled { color: mix (@menu_fg_color, @menu_bg_color, 0.7); } -.menuitem .accelerator { +menuitem accelerator { color: alpha (@menu_fg_color, 0.4); } -.menuitem .accelerator:hover, -.menuitem .accelerator:active { +menuitem accelerator:hover, +menuitem accelerator:active { color: alpha (@menu_fg_color, 0.3); } -.menuitem.arrow { +menuitem arrow { + min-height: 16px; + min-width: 16px; + margin-left: 10px; color: @menu_controls_color; } -.menuitem.separator { - color: @menu_separator_color; - padding: 3px 1px 3px 1px; +menu menuitem arrow:dir(ltr), +.menu menuitem arrow:dir(ltr) { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); +} - -GtkMenuItem-horizontal-padding: 0; +menu menuitem arrow:dir(rtl), +.menu menuitem arrow:dir(rtl) { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } -.menuitem.check, -.menuitem.radio, -.menuitem.check:hover, -.menuitem.radio:hover, -.menuitem.check:insensitive, -.menuitem.radio:insensitive { - background-image: none; - background-color: transparent; +menu arrow.top, +.menu arrow.top { + -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); } -.menuitem.check:active, -.menuitem.radio:active { +menu arrow.bottom, +.menu arrow.bottom { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); +} + +menu arrow:hover, +.menu arrow:hover { + border-color: @theme_selected_fg_color; + color: shade (@theme_selected_bg_color, 1.6); +} + +menu separator, +.menu separator, +menuitem separator { + color: @menu_separator_color; + margin: 3px 1px 3px 1px; + border-bottom: solid 1px @menu_separator_color; +} + +menuitem check, +menuitem radio, +menuitem check:hover, +menuitem radio:hover, +menuitem check:disabled, +menuitem radio:disabled +menu menuitem .check, +menu menuitem .radio, +menu menuitem .check:hover, +menu menuitem .radio:hover, +menu menuitem .check:checked, +menu menuitem .radio:checked, +menu menuitem .check:disabled, +menu menuitem .radio:disabled { + background-image: none; background-color: transparent; + min-height: 12px; + min-width: 12px; + padding-left: 2px; + padding-right: 2px; } /*************** * Menu Button * ***************/ -.button.menuitem.menubar:active, -.button.menuitem.menubar *:active { +menuitem button.flat:active { color: @theme_text_color; background-image: none; background-color: @menu_bg_color; @@ -1350,41 +1837,45 @@ GtkComboBox .menuitem:hover *, * Radiobuttons * ****************/ +check, .check, +radio, .radio, -.check:insensitive, -.radio:insensitive { +check:disabled, +.check:disabled, +radio:disabled, +.radio:disabled { background-color: transparent; border-style: none; } -.check row:selected:insensitive, -.check row:selected:focus:insensitive { +check row:selected:disabled, +check row:selected:focus:disabled { background-color: transparent; } -GtkCheckButton:hover, -GtkCheckButton:active:hover, -GtkCheckButton:selected, -GtkCheckButton:selected:focus { +checkbutton:hover, +checkbutton:active:hover, +checkbutton:selected, +checkbutton:selected:focus { background-color: transparent; } /************ - * Toolbars * + * Toolbars ************/ -.toolbar { +toolbar { border-style: none; border-color: darker (@theme_bg_color); padding: 4px; } -.toolbar .button { +toolbar button { padding: 1px; } -.toolbar:insensitive { +toolbar:disabled { color: alpha (@theme_fg_color, 0.6); } @@ -1392,7 +1883,7 @@ GtkCheckButton:selected:focus { * Menubar Toolbars * ********************/ -.toolbar.menubar { +toolbar menubar { border-style: none; -GtkToolbar-button-relief: normal; padding-left: 4px; @@ -1406,8 +1897,7 @@ GtkCheckButton:selected:focus { /* applications using EggEditableToolbar usually set the primary-toolbar * hint on the containing vbox, so we need to handle both these cases here. */ -.primary-toolbar .toolbar, -.primary-toolbar.toolbar { +toolbar.primary-toolbar { border-width: 1px 0 1px 0; border-radius: 0; border-style: solid; @@ -1417,16 +1907,15 @@ GtkCheckButton:selected:focus { -GtkToolbar-button-relief: normal; } -.primary-toolbar .toolbar:insensitive, -.primary-toolbar.toolbar:insensitive { +toolbar.primary-toolbar:disabled { background-image: none; - background-color: shade (@theme_bg_color, 0.97); + /*background-color: shade (@theme_bg_color, 0.97);*/ + background-color: transparent; border-color: shade (@theme_bg_color, 0.91); } /* progressbars on primary toolbar entries are special */ -.primary-toolbar .toolbar .entry.progressbar, -.primary-toolbar.toolbar .entry.progressbar { +toolbar.primary-toolbar entry progress { background-image: -gtk-gradient (linear, left top, left bottom, from (@trough_gradient_a), @@ -1443,7 +1932,7 @@ GtkCheckButton:selected:focus { * Inline toolbars * *******************/ -.inline-toolbar.toolbar { +toolbar.inline-toolbar { border-width: 1px; border-radius: 0; border-style: solid; @@ -1451,15 +1940,14 @@ GtkCheckButton:selected:focus { padding: 4px; } -.inline-toolbar.toolbar:last-child { +toolbar.inline-toolbar:last-child { border-width: 0 1px 1px 1px; border-radius: 0 0 3px 3px; } /* Primary and inline toolbars background */ -.primary-toolbar .toolbar, -.primary-toolbar.toolbar, -.inline-toolbar.toolbar { +toolbar.primary-toolbar, +toolbar.inline-toolbar { background-color: transparent; background-image: linear-gradient(to bottom, @toolbar_inner_border_color 1px, @@ -1475,13 +1963,13 @@ GtkCheckButton:selected:focus { .sidebar, .sidebar .view, -.sidebar GtkScrolledWindow { +placessidebar .view { background-color: @sidebar_bg_color; } -.sidebar .radio, -.sidebar .radio:focus, -.sidebar .radio:selected { +.sidebar radio, +.sidebar radio:focus, +.sidebar radio:selected { background-image: none; background-color: transparent; } @@ -1502,381 +1990,531 @@ GtkCheckButton:selected:focus { * GtkAssistant * ****************/ -GtkAssistant .sidebar .highlight { - color: @theme_fg_color; - font: bold; +assistant .sidebar highlight { + color: @theme_fg_color; + font: bold; } -GtkAssistant .sidebar { - padding: 12px; - border-width: 1px; - border-radius: 2px; - border-style: solid; - border-color: @gtkassistant_sidebar_border_color; - color: mix (@theme_fg_color, @theme_bg_color, 0.40); - background-color: shade (@theme_bg_color, 0.97); - /* shall we make it like sidebars in general? */ +assistant .sidebar { + padding: 12px; + border-width: 1px; + border-radius: 2px; + border-style: solid; + border-color: @gtkassistant_sidebar_border_color; + color: mix (@theme_fg_color, @theme_bg_color, 0.40); + background-color: shade (@theme_bg_color, 0.97); + /* shall we make it like sidebars in general? */ } /************* * GtkSwitch * *************/ -GtkSwitch { - color: @switch_color; +switch { + color: @switch_color; } -GtkScale.progressbar, -GtkSwitch.trough:active { - color: @switch_trough_active_color; +scale progressbar, +switch:checked { + color: @switch_trough_active_color; } -GtkSwitch.trough:active { - background-image: -gtk-gradient (linear, - left top, left bottom, - from (@switch_trough_active_gradient_a), - to (@switch_trough_active_gradient_b)); +switch:checked, +switch:backdrop:checked { + background-image: -gtk-gradient (linear, + left top, left bottom, + from (@switch_trough_active_gradient_a), + to (@switch_trough_active_gradient_b)); } -GtkSwitch.trough:insensitive { - background-image: none; - background-color: @insensitive_bg_color; - color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5); +switch:disabled, +switch:backdrop:disabled { + background-image: none; + background-color: @insensitive_bg_color; + color: mix(@insensitive_bg_color, @insensitive_fg_color, 0.5); } -GtkSwitch.slider { - background-color: @switch_slider_bg_color; - border-width: 1px; - border-radius: 2px; - border-style: solid; - border-color: @switch_slider_border_color; - padding: 0px 0px 1px 0px; +switch slider { + background-color: @switch_slider_bg_color; + border-width: 1px; + border-radius: 2px; + border-style: solid; + border-color: @switch_slider_border_color; + padding: 0px; } -GtkSwitch.slider:insensitive { - background-color: @switch_slider_insensitive_bg_color; - border-color: @insensitive_border_color; +switch:disabled slider { + border-color: @insensitive_border_color; } -GtkTreeView { - -GtkTreeView-vertical-separator: 0; - -GtkTreeView-expander-size: 13; - -GtkWidget-focus-line-width: 1; - -GtkWidget-focus-padding: 1; -} +/************************** + * GtkIconview GtkViewport* + **************************/ -GtkTreeView.dnd { - border-color: @internal_element_color; - border-radius: 2px; - border-width: 1px; - border-style: solid; +iconview, +viewport { + border-radius: 3px; + padding: 3px; + background-color: @theme_base_color; } -GtkViewport, -GtkIconView { - border-radius: 3px; - padding: 0; - background-color: @theme_base_color; +iconview.view.cell:selected, +iconview.view.cell:selected:focus { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; + border-radius: 4px; } -GtkIconView.view.cell:selected, -GtkIconView.view.cell:selected:focus { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; - border-radius: 4px; +list, +view, +.view, +view text, +.view text, +iconview text, +textview text +treeview { + background-color: @theme_base_color; + color: @theme_text_color; } -.view, -GtkTreeView { - background-color: @theme_base_color; - color: @theme_text_color; +view, +view:selected, +view:selected:focus, +.view:selected, +.view:selected:focus, +view text selection, +.view text selection, +view text selection:focus, +.view text selection:focus +treeview:selected { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} + +view:disabled, +.view:disabled, +treeview:disabled { + background-color: @insensitive_bg_color; + color: @insensitive_fg_color; +} + +/* for firefox and probably other apps */ +label:selected, +label selection, +label selection:focus, +label selection:hover { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; +} + +label:disabled:selected, +label selection:disabled { + color: @insensitive_fg_color; } -.view:selected, -GtkTreeView:selected { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; +label:backdrop:selected, +label selection:backdrop { + color: @theme_fg_color; } -.view:insensitive, -GtkTreeView:insensitive { - background-color: @insensitive_bg_color; +label:backdrop:disabled:selected, +label selection:backdrop:disabled { color: @insensitive_fg_color; } -GtkTreeView:hover { - background-image: linear-gradient(to bottom, - shade(@button_active_gradient_a, 1.20), - shade(@button_active_gradient_b, 1.20) 3px, - shade(@button_active_gradient_c, 1.20) 4px, - shade(@button_active_gradient_d, 1.20) 50%, - shade(@button_active_gradient_e, 1.20) 50%, - shade(@button_active_gradient_f, 1.20)); - background-color: transparent; +/*************** + * GtkTreeview * + ***************/ + +treeview { + -GtkTreeView-vertical-separator: 0; + -GtkTreeView-expander-size: 13; + -GtkTreeView-grid-line-width: 0; + -GtkTreeView-grid-line-pattern: ''; + -GtkTreeView-tree-line-width: 0; + -GtkTreeView-tree-line-pattern: ''; } -column-header.button, -column-header .button { - color: @internal_element_color; +treeview.dnd { + border-color: @internal_element_color; + border-radius: 2px; + border-width: 1px; + border-style: solid; } -column-header.button, -column-header .button, -column-header.button:insensitive, -column-header .button:insensitive, -column-header.button:hover, -column-header .button:hover, -column-header.button:focus:hover, -column-header .button:focus:hover { - background-color: @theme_base_color; - background-image: -gtk-gradient (linear, - left top, - left bottom, - from (@column_header_button_gradient_a), - color-stop (0.50, @column_header_button_gradient_b), - color-stop (0.50, @column_header_button_gradient_c), - to (@column_header_button_gradient_d)); - padding: 0 4px; - font-weight: normal; +/* column-headers */ +treeview header button { + min-height: 22px; + color: @internal_element_color; } -column-header.button:insensitive, -column-header .button:insensitive { - background-color: @insensitive_bg_color; +treeview header button, +treeview header button:disabled, +treeview header button:hover, +treeview header button:focus:hover { + background-color: @theme_base_color; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@column_header_button_gradient_a), + color-stop (0.50, @column_header_button_gradient_b), + color-stop (0.50, @column_header_button_gradient_c), + to (@column_header_button_gradient_d)); + padding: 0 4px; + font-weight: normal; } -column-header.button:hover, -column-header .button:hover, -column-header.button:focus:hover, -column-header .button:focus:hover, -column-header.button:active:focus:hover, -column-header .button:active:focus:hover, -column-header.button:active:focus, -column-header .button:active:focus, -column-header.button:active:hover, -column-header .button:active:hover, -column-header.button *:active, -column-header .button *:active, -column-header.button *:active:hover, -column-header .button *:active:hover { - color: @internal_element_hover_color; +treeview header button:disabled { + background-color: @insensitive_bg_color; } -column-header.button:active, -column-header .button:active, -column-header.button:active:hover, -column-header .button:active:hover, -column-header.button:active:hover:focus, -column-header .button:active:hover:focus, -column-header.button:active:focus, -column-header .button:active:focus { - background-color: @entry_bg_color; - background-image: none; +treeview header button:hover, +treeview header button:focus:hover, +treeview header button:focus:hover:active, +treeview header button:hover:active, +treeview header button:checked, +treeview header button:checked:hover { + color: @internal_element_hover_color; } -row:hover { - border-width: 0; +treeview header button:checked, +treeview header button:checked:hover, +treeview header button:checked:hover:focus { + background-color: @entry_bg_color; + background-image: none; } -row:insensitive { - border-width: 0; +treeview header button, +treeview header button:focus, +treeview header button:checked, +treeview header button:checked:hover, +treeview header button:focus:checked, +treeview header button:focus:hover:active { + border-image: none; + border-width: 1px; + border-radius: 0; + border-style: solid; + border-color: @column_header_border_top_color @column_header_border_right_color + @column_header_border_bottom_color @column_header_border_left_color; + +} + +treeview header button:last-child, +treeview header button:last-child:focus, +treeview header button:last-child:checked, +treeview header button:last-child:hover:active, +treeview header button:last-child:active:focus { + border-right: none; +} + +row, +row:focus { + min-height: 22px; } +row:hover, +row:disabled, row:selected, row:selected:focus { - border-width: 0; + border-width: 0; } +row:selected, row:selected:focus, -.cell:selected { - background-image: -gtk-gradient (linear, - left top, - left bottom, - from (@menubar_menuitem_hover_gradient_a), - color-stop (0.50, @menubar_menuitem_hover_gradient_b), - color-stop (0.50, @menubar_menuitem_hover_gradient_c), - to (@menubar_menuitem_hover_gradient_d)); +.cell:selected, +row:selected:hover, +row:selected:focus:hover, +.cell:selected:hover { + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@menubar_menuitem_hover_gradient_a), + to (@menubar_menuitem_hover_gradient_d)); +} + +row:hover, +row:hover:focus, +.cell:hover { + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (shade(@menubar_menuitem_hover_gradient_a, 1.2)), + to (shade(@menubar_menuitem_hover_gradient_d, 1.3))); } .cell { - color: @theme_text_color; - padding: 2px; - border-width: 0; + color: @theme_text_color; + padding: 2px; + border-width: 0; } .cell:selected { - color: @theme_selected_fg_color; + color: @theme_selected_fg_color; } -.expander { - border-style: solid; - border-width: 1px; - border-radius: 2px; - border-color: shade (@internal_element_color, 1.40); - color: @theme_base_color; - background-color: @theme_base_color; +/********* + * Paned * + *********/ + +paned.horizontal separator { + min-width: 7px; + background-size: 5px 5px; + margin: -1px 0 -1px 0; + border-style: none; + border-width: 0 1px 0 1px; + border-color: @border_color; + background-color: @theme_bg_color; + -gtk-icon-source: none; } -.expander:active { - border-style: solid; - border-width: 1px; - border-color: shade (@internal_element_color, 1.40); - background-color: @theme_base_color; +paned.vertical > separator { + min-height: 7px; + background-size: 5px 5px; + border-style: none; + margin: 0 -1px 0 -1px; + border-width: 1px 0 1px 0; + border-color: @border_color; + background-color: @theme_bg_color; + -gtk-icon-source: none; } -.expander:hover { - border-style: solid; - border-width: 1px; - color: @internal_element_color; - border-color: shade (@internal_element_color, 1.40); - background-color: shade (@theme_bg_color, 1.02); +paned > separator:hover, +paned > separator:selected { + background-color: @theme_bg_color; } -.expander row { - border-radius: 2px; +paned > separator:backdrop { } -.expander row:selected, -.expander row:selected:focus { - border-style: solid; - border-width: 1px; - border-color: @expander_row_selected_border_color; - color: @expander_row_selected_color; - background-color: @theme_selected_bg_color; +paned > separator.wide { + margin: 0; + padding: 0; + min-width: 5px; + min-height: 5px; + background-size: 1px 1px, 1px 1px; } -/* Calendars */ -GtkCalendar { - padding: 2px; +paned > separator.wide:backdrop { } -GtkCalendar.view { - border-radius: 3px; - border-style: solid; - border-width: 1px; - padding: 2px; +/* expander */ +expander, +expander:active, +expander:focus { + border-style: none; + color: @theme_fg_color; } -GtkCalendar.header { - border-radius: 0; - background-image: -gtk-gradient (linear, - left top, - left bottom, - from (shade (@theme_bg_color, 1.04)), - to (shade (@theme_bg_color, 0.89))); - border-width: 0; + +treeview.view.expander { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); + color: @theme_fg_color; } -GtkCalendar.button, -GtkCalendar.button:insensitive { - background-image: none; - background-color: transparent; +treeview.view.expander:dir(rtl) { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } -.highlight, -GtkCalendar.highlight { - background-color: @theme_selected_bg_color; - color: @theme_selected_fg_color; - border-radius: 0; - padding: 0; - border-width: 0; +treeview.view.expander:checked { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); + } + +treeview.view.expander:hover { + color: @theme_selected_bg_color; } -/* Use different button and entry borders on infobars */ -GtkInfoBar .entry, -GtkInfoBar .entry:focus, -GtkInfoBar .button, -GtkInfoBar .button:insensitive, -GtkInfoBar .button:active, -GtkInfoBar .button:focus, -GtkInfoBar .button:active:focus, -.info .entry, -.info .entry:focus, -.info .button, -.info .button:insensitive, -.info .button:active, -.info .button:focus, -.info .button:active:focus, -.warning .entry, -.warning .entry:focus, -.warning .button, -.warning .button:insensitive, -.warning .button:active, -.warning .button:focus, -.warning .button:active:focus, -.question .entry, -.question .entry:focus, -.question .button, -.question .button:insensitive, -.question .button:active, -.question .button:focus, -.question .button:active:focus, -.error .entry, -.error .entry:focus, -.error .button, -.error .button:insensitive, -.error .button:active, -.error .button:focus, -.error .button:active:focus { - border-image: none; - border-color: shade(@border_color, 0.9); - border-style: solid; - border-width: 1px; +treeview.view.expander:selected, +treeview.view.expander:selected:hover { + color: @theme_selected_fg_color; +} + +expander arrow { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); +} + +expander arrow:dir(rtl) { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); +} + +expander arrow:hover { + color: @internal_element_color; +} + +expander arrow:checked { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); +} + +/* why this weird padding, possible issue with gtk+-3.18 ? */ +expander arrow { + min-width: 16px; + min-height: 16px; + padding: 0px 4px 0px 0px; +} + +expander row { + border-radius: 2px; +} + +expander row:selected, +expander row:selected:focus { + border-style: solid; + border-width: 1px; + border-color: @expander_row_selected_border_color; + color: @expander_row_selected_color; + background-color: @theme_selected_bg_color; +} + +expander scrolledwindow.frame { + border-radius: 0px; + border-width: 1px 0px; +} + +expander toolbar.inline-toolbar { + border-width: 0px; + border-style: none; } -GtkInfoBar:last-child, +/* Calendars */ +calendar { + padding: 2px; + border-style:none; +} + +calendar.view { + border-radius: 3px; + border-style: solid; + border-width: 1px; + border-color: rgb(162,158,155); + padding: 2px; +} + +calendar.header { + border-radius: 0; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (shade (@theme_bg_color, 1.04)), + to (shade (@theme_bg_color, 0.89))); + border-width: 0; +} + +calendar button, +calendar button:disabled { + background-image: none; + background-color: transparent; +} + +highlight, +calendar.highlight { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; + border-radius: 0; + padding: 0; + border-width: 0; +} + +/* Use different button and entry borders on infobars */ +infobar entry, +infobar entry:focus, +infobar button, +infobar button:disabled, +infobar button:checked, +infobar button:focus, +infobar button:focus:checked, +.info, +.warning, +.question, +.error, +entry.info, +entry.info:focus, +.info button, +.info button:disabled, +.info button:checked, +.info button:focus, +.info button:focus:checked, +entry.warning, +entry.warning:focus, +.warning button, +.warning button:disabled, +.warning button:checked, +.warning button:focus, +.warning button:focus:checked, +entry.question, +entry.question:focus, +.question button, +.question button:disabled, +.question button:checked, +.question button:focus, +.question button:focus:checked, +entry.error, +entry.error:focus, +.error button, +.error button:disabled, +.error button:checked, +.error button:focus, +.error button:focus:checked { + border-image: none; + border-color: shade(@border_color, 0.9); + border-style: solid; + border-width: 1px; +} + +infobar:last-child, .info:last-child, .warning:last-child, .question:last-child, .error:last-child { - /* only apply a border on the last infobar if - * there's more than one packed in */ - border-bottom-width: 1px; - border-style: solid; + /* only apply a border on the last infobar if + * there's more than one packed in */ + border-bottom-width: 1px; + border-style: solid; } +.info, .info > * { - background-color: @info_bg_color; - color: @info_fg_color; - border-color: darker(@info_bg_color); + background-color: @info_bg_color; + color: @info_fg_color; + border-color: darker(@info_bg_color); } +.warning, .warning > * { - background-color: @warning_bg_color; - color: @warning_fg_color; - border-color: darker(@warning_bg_color); + background-color: @warning_bg_color; + color: @warning_fg_color; + border-color: darker(@warning_bg_color); } +.question, .question > * { - background-color: @question_bg_color; - color: @question_fg_color; - border-color: darker(@question_bg_color); + background-color: @question_bg_color; + color: @question_fg_color; + border-color: darker(@question_bg_color); } +.error, .error > * { - background-color: @error_bg_color; - color: @error_fg_color; - border-color: darker(@error_bg_color); + background-color: @error_bg_color; + color: @error_fg_color; + border-color: darker(@error_bg_color); +} + +.info button:hover, +.warning button:hover, +.question button:hover, +.error button:hover { + padding-bottom: 5px; } .view.dim-label, .dim-label, .dim-label:hover, .dim-label:focus { - color: mix (@theme_fg_color, @theme_bg_color, 0.50); + color: mix (@theme_fg_color, @theme_bg_color, 0.50); } .dim-label:selected, .dim-label:selected:focus { - color: mix (@theme_selected_fg_color, @theme_base_color, 0.50); -} - -/*************** - * Resize grip * - ***************/ - -.grip { - background-color: transparent; + color: mix (@theme_selected_fg_color, @theme_base_color, 0.50); } /************ @@ -1914,23 +2552,34 @@ GtkInfoBar:last-child, /* padding: 5px 5px 6px 5px;*/ /*}*/ -.titlebar .titlebutton { +.titlebar button.titlebutton { background: none; border-image: none; } -.window-frame { - border-width: 1px; - border-radius: 7px 7px 0 0; - border-style: solid; - margin: 10px; +decoration { + box-shadow: none; +} + +window decoration { + border: solid 2px @insensitive_border_color; +} + +tooltip.csd decoration { + border-radius: 5px; + box-shadow: 0 1px 5px @wm_shadow; +} + +messagedialog.csd decoration { + border-radius: 7px; + box-shadow: 0 1px 5px @wm_shadow; } /************** * Action bar * **************/ -.action-bar { +actionbar { border: none; padding: 7px 7px 3px 7px; } @@ -1939,15 +2588,31 @@ GtkInfoBar:last-child, * Header bar * **************/ -GtkHeaderBar .header-bar { +headerbar { padding: 5px 4px 4px 4px; } +headerbar.titlebar > stackswitcher.linked.stack-switcher > button, +headerbar.titlebar > stackswitcher.linked.stack-switcher > button:checked:hover { + padding: 6px 12px; + border-width: 1px 1px 1px 0px; +} + +headerbar.titlebar > stackswitcher.linked.stack-switcher > button:first-child, +headerbar.titlebar > stackswitcher.linked.stack-switcher > button:checked:hover:first-child { + border-width: 1px; +} + +headerbar.titlebar > stackswitcher.linked.stack-switcher > button:last-child, +headerbar.titlebar > stackswitcher.linked.stack-switcher > button:checked:hover:last-child { + border-width: 1px 1px 1px 0px; +} + /************ * Popovers * ************/ -GtkPopover { +popover { border: 1px solid; border-radius: 0px; border-color: @border_color; @@ -1955,7 +2620,106 @@ GtkPopover { background-clip: border-box; } -GtkPopover > .toolbar, -GtkPopover.osd > .toolbar .button { +popover > list, +popover > .view, +popover > toolbar popover.osd > toolbar, +popover > .inline-toolbar popover.osd > toolbar, +popover > searchbar popover.osd > toolbar, +popover > .location-bar popover.osd > toolbar, +popover > toolbar popover.osd > .inline-toolbar, +popover > .inline-toolbar .popover.osd > .inline-toolbar, +popover > searchbar popover.osd > .inline-toolbar, +popover > .location-bar popover.osd > .inline-toolbar, +popover > toolbar popover.osd > searchbar, +popover > .inline-toolbar popover.osd > searchbar, +popover > searchbar popover.osd > searchbar, +popover > .location-bar popover.osd > searchbar +popover > .inline-toolbar popover.osd > .location-bar, +popover > searchbar popover.osd > .location-bar, +popover > .location-bar popover.osd > .location-bar { background-color: transparent; } + +/*********** + * Sidebar * + ***********/ + +.sidebar, +.sidebar .view, +placessidebar .view { + background-color: @theme_bg_color; +} + +.sidebar .frame { + border-style: none; +} + +/****************** + * Dialog Windows * + ******************/ + +dialog filechooser placessidebar.sidebar.frame viewport.frame list, +dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row { + background-color: @theme_base_color; +} + +dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer image.sidebar-icon { + padding: 4px 8px 4px 6px; +} + +dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer label.sidebar-label { + padding: 4px 0px 4px 1px; +} + +dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer button.image-button.sidebar-button { + background-color: transparent; + background-image: none; + border-image:none; + box-shadow: none; + border-width: 0px; + padding: 4px 12px 4px 0px; +} + +dialog filechooser placessidebar > viewport.frame { + border-style: none; +} + +dialog filechooser #pathbarbox { + border-style: none; + background-color: transparent; +} + +/* ie. mate-keyboard-properties option window */ +dialog scrolledwindow.frame, +dialog scrolledwindow { + border-color: @border_color; + border-style: solid; + border-width: 1px; + border-radius: 2px; +} + +/* credits in GtkAbout windows */ +dialog .dialog-vbox scrolledwindow.frame > viewport.view.frame { + background-color: shade (@theme_bg_color, 1.04); +} + +dialog scrolledwindow.frame viewport .vertical expander .vertical { + background-color: @theme_base_color; + border-radius: 3px; + border-color: @border_color; + border-style: solid; + border-width: 1px; +} + +/* print dialog */ +printdialog.background > box.view.vertical.dialog-vbox { + background-color: shade (@theme_bg_color, 1.0); +} + +/****************** + * GtkAboutDialog * + ******************/ + +dialog.background dialog-vbox.vertical .vertical { + background: transparent; +} \ No newline at end of file diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index 9f18c61e..cf65b625 100644 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -189,7 +189,7 @@ @define-color question_bg_color mix(#727272, shade(@core_color_a, 0.90), 0.95); @define-color question_fg_color @theme_base_color; -@define-color error_bg_color mix(#ababab, shade(@error_color, 0.77), 0.78); +@define-color error_bg_color lighter(mix(#ababab, shade(@error_color, 0.80), 0.95)); @define-color error_fg_color @theme_base_color; @define-color warning_fg_color @theme_fg_color; @@ -198,7 +198,7 @@ * menu * ********/ -@define-color menu_bg_color @theme_base_color; +@define-color menu_bg_color shade(@theme_bg_color, 1.04); @define-color menu_fg_color @theme_fg_color; /* Example: submenu arrow. */ From 316cae719d1a6641ca973c05de7538440cd7e681 Mon Sep 17 00:00:00 2001 From: Andrey Cherepanov Date: Thu, 27 Oct 2016 17:22:51 +0300 Subject: [PATCH 2/3] Fix background color of hovered menu item in Chromium 54.x --- gtk-3.0/gtk-widgets.css | 1 + 1 file changed, 1 insertion(+) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 4a107b0c..1e35cf55 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -1709,6 +1709,7 @@ menu menuitem:hover, border-width: 1px; border-color: @menubar_menuitem_hover_border_color; color: @theme_selected_fg_color; + background-color: @theme_selected_bg_color; background-image: -gtk-gradient (linear, left top, left bottom, From e1bb5fe707cbf3c2e04a78dec46e1083031f0ef7 Mon Sep 17 00:00:00 2001 From: Andrey Cherepanov Date: Thu, 27 Oct 2016 17:40:08 +0300 Subject: [PATCH 3/3] Fix transparent app-notifications Thanks beil for .app-notification styles. --- gtk-3.0/gtk-widgets.css | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css index 1e35cf55..64dbf541 100644 --- a/gtk-3.0/gtk-widgets.css +++ b/gtk-3.0/gtk-widgets.css @@ -2702,3 +2702,25 @@ printdialog.background > box.view.vertical.dialog-vbox { dialog.background dialog-vbox.vertical .vertical { background: transparent; } + +.app-notification, +.app-notification.frame { + padding: 5px; + border-radius: 0 0 4px 4px; + border-style: solid; + border-width: 0 1px 1px 1px; + border-color: darker(@theme_bg_color); + background-color: @theme_bg_color; + background-clip: padding-box; +} + +.app-notification:backdrop, +.app-notification.frame:backdrop { + background-image: none; + transition: 200ms ease-out; +} + +.app-notification border, +.app-notification.frame border { + border: none; +}