From d7ad603476aa7ccce0eb4cfc3731608dfeb64964 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Wed, 2 Mar 2016 14:44:51 +0100 Subject: GTK+-3.20 Menta: sync with BlueMenta theme --- .../Menta/gtk-3.0/gnome-applications.css | 2 +- .../Menta/gtk-3.0/gtk-widgets-assets.css | 135 +- .../Menta/gtk-3.0/gtk-widgets-backgrounds.css | 139 +- .../Menta/gtk-3.0/gtk-widgets-borders.css | 247 +- desktop-themes/Menta/gtk-3.0/gtk-widgets.css | 2673 +++++++++++++++----- desktop-themes/Menta/gtk-3.0/mate-applications.css | 613 ++--- .../Menta/gtk-3.0/other-applications.css | 317 ++- desktop-themes/Menta/gtk-3.0/window-controls.css | 404 +-- 8 files changed, 3030 insertions(+), 1500 deletions(-) (limited to 'desktop-themes/Menta') diff --git a/desktop-themes/Menta/gtk-3.0/gnome-applications.css b/desktop-themes/Menta/gtk-3.0/gnome-applications.css index 405c79bd..95bd1c28 100644 --- a/desktop-themes/Menta/gtk-3.0/gnome-applications.css +++ b/desktop-themes/Menta/gtk-3.0/gnome-applications.css @@ -21,7 +21,7 @@ } .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; } diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css index 89796a33..81074f8c 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css @@ -1,12 +1,3 @@ -/*************** - * Resize grip * - ***************/ - -.grip { - background-color: transparent; - background-image: url("assets/resize-grip.svg"); -} - /******************* * Pane separators * *******************/ @@ -32,9 +23,10 @@ * Header bar separator * *************************/ +headerbar > box > separator.vertical, .header-bar > GtkBox > .separator.vertical { - -GtkWidget-wide-separators: 1; - -GtkWidget-separator-width: 2px; +/* -GtkWidget-wide-separators: 1; deprecated */ +/* -GtkWidget-separator-width: 2px; deprecated */ background: transparent; border-width: 0 1px 0 1px; border-style: solid; @@ -48,6 +40,8 @@ /* draw regular check and radio items using our SVG assets */ +check, +.view.cell check, .check, .view.cell.check { -gtk-icon-source: -gtk-scaled(url("assets/check-normal.png")); @@ -55,14 +49,20 @@ background-position: center; } -.check:insensitive { +check:disabled, +.check:disabled { -gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png")); } -.check row:insensitive { +check row:disabled, +.check row:disabled { background-color: transparent; } +check:active, +check:checked, +.view.cell check:active, +.view.cell check:checked, .check:active, .check:checked, .view.cell.check:active, @@ -70,19 +70,25 @@ -gtk-icon-source: -gtk-scaled(url("assets/check-active.png")); } -.check:active:insensitive, -.check:checked:insensitive { +check:active:disabled, +check:checked:disabled, +.check:active:disabled, +.check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png")); } -.check:inconsistent { +check:indeterminate, +.check:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active.png")); } -.check:inconsistent:insensitive { +check:indeterminate:disabled, +.check:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/check-mixed-active-ins.png")); } +radio, +.view.cell radio, .radio, .view.cell.radio { -gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png")); @@ -90,14 +96,20 @@ background-position: center; } -.radio:insensitive { +radio:disabled, +.radio:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png")); } -.radio row:insensitive { +radio row:disabled, +.radio row:disabled { background-color: transparent; } +radio:active, +.view.cell radio:active, +radio:checked, +.view.cell radio:checked, .radio:active, .view.cell.radio:active, .radio:checked, @@ -105,16 +117,20 @@ -gtk-icon-source: -gtk-scaled(url("assets/radio-active.png")); } -.radio:active:insensitive, -.radio:checked:insensitive { +radio:active:disabled, +radio:checked:disabled, +.radio:active:disabled, +.radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png")); } -.radio:inconsistent { +radio:indeterminate, +.radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active.png")); } -.radio:inconsistent:insensitive { +.radio:indeterminate:disabled, +.radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-active-ins.png")); } @@ -146,136 +162,170 @@ /************* * GtkSwitch * *************/ + +switch, GtkSwitch.trough { background-image: url("assets/switch-off.png"); + background-repeat: no-repeat; } +switch:active, GtkSwitch.trough:active { background-image: url("assets/switch-on.png"); + background-repeat: no-repeat; } -GtkSwitch.trough:insensitive { +switch:disabled, +GtkSwitch.trough:disabled { background-image: url("assets/switch-off-ins.png"); + background-repeat: no-repeat; } -GtkSwitch.trough:active:insensitive { +switch:active:disabled, +GtkSwitch.trough:active:disabled { background-image: url("assets/switch-on-ins.png"); + background-repeat: no-repeat; } /********************* * GtkScale's slider * *********************/ +scale slider, .scale.slider, .scale.slider.horizontal { background-image: url("assets/slider.png"); + background-repeat: no-repeat; } +scale slider:hover, .scale.slider:hover, .scale.slider.horizontal:hover { background-image: url("assets/slider-hover.png"); + background-repeat: no-repeat; } - +/* .scale.slider:active, .scale.slider:active:hover, .scale.slider.horizontal:active, .scale.slider.horizontal:active:hover { background-image: url("assets/slider-hover.png"); } - -.scale.slider:insensitive, -.scale.slider:insensitive:hover, -.scale.slider.horizontal:insensitive, -.scale.slider.horizontal:insensitive:hover { +*/ +scale slider:disabled, +scale slider:disabled:hover, +.scale.slider.horizontal:disabled, +.scale.slider.horizontal:disabled:hover { background-image: url("assets/slider-ins.png"); + background-repeat: no-repeat; } - +/* .scale.scale-has-marks-above.slider.horizontal { background-image: url("assets/slider.png"); + background-repeat: no-repeat; } .scale.scale-has-marks-above.slider.horizontal:hover { background-image: url("assets/slider-hover.png"); + background-repeat: no-repeat; } -.scale.scale-has-marks-above.slider.horizontal:active, .scale.scale-has-marks-above.slider.horizontal:active:hover { background-image: url("assets/slider-hover.png"); + background-repeat: no-repeat; } -.scale.scale-has-marks-above.slider.horizontal:insensitive, -.scale.scale-has-marks-above.slider.horizontal:insensitive:hover { +.scale.scale-has-marks-above.slider.horizontal:disabled:hover { background-image: url("assets/slider-ins.png"); + background-repeat: no-repeat; } .scale.scale-has-marks-above.slider.vertical { background-image: url("assets/slider.png"); + background-repeat: no-repeat; } .scale.scale-has-marks-above.slider.vertical:hover { background-image: url("assets/slider-hover.png"); + background-repeat: no-repeat; } .scale.scale-has-marks-above.slider.vertical:active, .scale.scale-has-marks-above.slider.vertical:active:hover { background-image: url("assets/slider-hover.png"); + background-repeat: no-repeat; } -.scale.scale-has-marks-above.slider.vertical:insensitive, -.scale.scale-has-marks-above.slider.vertical:insensitive:hover { +.scale.scale-has-marks-above.slider.vertical:disabled, +.scale.scale-has-marks-above.slider.vertical:disabled:hover { background-image: url("assets/slider-ins.png"); + background-repeat: no-repeat; } .scale.scale-has-marks-below.slider.horizontal { background-image: url("assets/slider.png"); + background-repeat: no-repeat; } .scale.scale-has-marks-below.slider.horizontal:hover { background-image: url("assets/slider-hover.png"); + background-repeat: no-repeat; } .scale.scale-has-marks-below.slider.horizontal:active, .scale.scale-has-marks-below.slider.horizontal:active:hover { background-image: url("assets/slider-hover.png"); + background-repeat: no-repeat; } -.scale.scale-has-marks-below.slider.horizontal:insensitive, -.scale.scale-has-marks-below.slider.horizontal:insensitive:hover { +.scale.scale-has-marks-below.slider.horizontal:disabled:hover { background-image: url("assets/slider-ins.png"); + background-repeat: no-repeat; } .scale.scale-has-marks-below.slider.vertical { background-image: url("assets/slider.png"); + background-repeat: no-repeat; } .scale.scale-has-marks-below.slider.vertical:hover { background-image: url("assets/slider-hover.png"); + background-repeat: no-repeat; } .scale.scale-has-marks-below.slider.vertical:active, .scale.scale-has-marks-below.slider.vertical:active:hover { background-image: url("assets/slider-hover.png"); + background-repeat: no-repeat; } -.scale.scale-has-marks-below.slider.vertical:insensitive, -.scale.scale-has-marks-below.slider.vertical:insensitive:hover { +.scale.scale-has-marks-below.slider.vertical:disabled, +.scale.scale-has-marks-below.slider.vertical:disabled:hover { background-image: url("assets/slider-ins.png"); + background-repeat: no-repeat; } - +*/ /******************************** * Touch text selection handles * ********************************/ +cursor-handle.bottom, .cursor-handle.bottom { background-image: url("assets/slider.png"); } +cursor-handle.top, .cursor-handle.top { background-image: url("assets/slider.png"); } +entry cursor-handle.top, +cursor-handle.top, .entry.cursor-handle.top, .cursor-handle.top { -gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); } + +entry cursor-handle.bottom, +cursor-handle.bottom, .entry.cursor-handle.bottom, .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); @@ -284,6 +334,7 @@ GtkSwitch.trough:active:insensitive { /**************** * Content view * ****************/ +.view.content-view, .content-view.view { /*background-image: url("assets/noise-texture-light.png");*/ } diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css index 883dddfe..88b50edd 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css @@ -1,9 +1,14 @@ /* Button background */ +button, +toolbar button.raised, +toolbar .raised button, +toolbar combobox button, +toolbar.primary-toolbar .linked button, +toolbar.primary-toolbar .raised button, .button, .toolbar .button.raised, .toolbar .raised .button, -.toolbar GtkComboBox .button, -.spinbutton.vertical .button { +.toolbar GtkComboBox .button { background-image: linear-gradient(to bottom, @button_gradient_color_a, @button_gradient_color_b); @@ -11,13 +16,24 @@ } /* Pushed button and progressbar through background */ +button:checked, +button:active, +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, +toolbar button:checked, +toolbar button:checked:hover, +toolbar button.raised:checked, +toolbar .raised button:checked, +toolbar button.raised:checked:hover, +toolbar .raised button:checked:hover, .button:checked, .button:active, .button:active:hover, -.spinbutton.vertical .button:checked, -.spinbutton.vertical .button:checked:hover, -.spinbutton.vertical .button:active, -.spinbutton.vertical .button:active:hover, .toolbar .button:active, .toolbar .button:active:hover, .toolbar .button.raised:active, @@ -36,6 +52,9 @@ background-color: transparent; } +trough, +trough highlight, +row trough, .trough, .trough.highlight, .trough row { @@ -45,9 +64,17 @@ background-color: transparent; } +button:checked:hover, +button:active:hover, +toolbar button:active:hover, +toolbar button.raised:active:hover, +toolbar .raised button:active:hover, +toolbar button:checked:hover, +toolbar button.raised:checked:hover, +toolbar .raised button:checked:hover, +row trough:hover, .button:checked:hover, .button:active:hover, -.spinbutton.vertical .button:active:hover, .toolbar .button:active:hover, .toolbar .button.raised:active:hover, .toolbar .raised .button:active:hover, @@ -62,6 +89,10 @@ } /* Primary and inline toolbars pushed button background */ +toolbar.primary-toolbar button:checked, +toolbar.inline-toolbar button:checked, +toolbar.primary-toolbar button:active, +toolbar.inline-toolbar button:active, .primary-toolbar .button:checked, .inline-toolbar .button:checked, .primary-toolbar .button:active, @@ -72,6 +103,10 @@ background-color: transparent; } +toolbar.primary-toolbar button:checked:hover, +toolbar.inline-toolbar button:checked:hover, +toolbar.primary-toolbar button:active:hover, +toolbar.inline-toolbar button:active:hover, .primary-toolbar .button:checked:hover, .inline-toolbar .button:checked:hover, .primary-toolbar .button:active:hover, @@ -83,12 +118,16 @@ } /* Prelit button background */ +button:hover, +toolbar button:hover, +toolbar button.raised:hover, +toolbar .raised button:hover, +toolbar combobox button:hover, .button:hover, .toolbar .button:hover, .toolbar .button.raised:hover, .toolbar .raised .button:hover, -.toolbar GtkComboBox .button:hover, -.spinbutton.vertical .button:hover { +.toolbar GtkComboBox .button:hover { background-color: transparent; background-image: linear-gradient(to bottom, @button_hover_gradient_color_a, @@ -96,6 +135,7 @@ } /* Prelit button on primary toolbar background */ +toolbar.primary-toolbar button:hover, .primary-toolbar .button:hover { background-color: transparent; background-image: linear-gradient(to bottom, @@ -104,22 +144,31 @@ } /* Insensitive button background */ -.button:insensitive, -.spinbutton.vertical .button:insensitive, -.toolbar GtkComboBox .button:insensitive, -.toolbar .button.raised:insensitive, -.toolbar .raised .button:insensitive { +button:disabled, +toolbar combobox button:disabled, +toolbar button.raised:disabled, +toolbar .raised button:disabled, +.button:disabled, +.toolbar GtkComboBox button:disabled, +.toolbar .button.raised:disabled, +.toolbar .raised .button:disabled { background-image: none; background-color: @insensitive_bg_color; } /* Pushed + Insensitive button background */ -.button:active:insensitive, -.button:checked:insensitive, -.toolbar .button:active:insensitive, -.toolbar .button:checked:insensitive, -.toolbar GtkComboBox .button:active:insensitive, -.toolbar GtkComboBox .button:checked:insensitive { +button:active:disabled, +button:checked:disabled, +toolbar button:active:disabled, +toolbar button:checked:disabled, +toolbar combobox button:active:disabled, +toolbar combobox button:checked:disabled, +.button:active:disabled, +.button:checked:disabled, +.toolbar .button:active:disabled, +.toolbar .button:checked:disabled, +.toolbar GtkComboBox .button:active:disabled, +.toolbar GtkComboBox .button:checked:disabled { background-image: linear-gradient(to bottom, shade(@insensitive_bg_color, 0.95), @insensitive_bg_color 40%, @@ -128,6 +177,12 @@ } /* Entry background */ +entry, +combobox entry button, +combobox entry button:hover, +toolbar.primary-toolbar combobox entry button, +toolbar.primary-toolbar combobox entry button:hover, +levelbar trough, .entry, GtkComboBox.combobox-entry .button, GtkComboBox.combobox-entry .button:hover, @@ -142,15 +197,15 @@ GtkComboBox.combobox-entry .button:hover, } /* Entry pushed button background */ +toolbar.primary-toolbar combobox entry button:active, +toolbar.primary-toolbar combobox entry button:checked, +combobox entry button:active, +combobox entry button:checked, .primary-toolbar GtkComboBox.combobox-entry .button:active, .primary-toolbar GtkComboBox.combobox-entry .button:checked, /* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/ GtkComboBox.combobox-entry .button:active, -.spinbutton .button:active, -.spinbutton .button:active:hover, -GtkComboBox.combobox-entry .button:checked, -.spinbutton .button:checked, -.spinbutton .button:checked:hover { +GtkComboBox.combobox-entry .button:checked { background-image: linear-gradient(to bottom, shade(@entry_background_a, 0.9), @entry_background_b); @@ -159,6 +214,7 @@ GtkComboBox.combobox-entry .button:checked, inset 0 2px alpha(@entry_inset, 0.4); } +treeview header button, column-header.button, column-header .button { background-image: linear-gradient(to bottom, @@ -168,12 +224,14 @@ column-header .button { } /* ie. yumex-dnf */ +stack treeview header button, GtkStack column-header .button { background-image: linear-gradient(to bottom, shade(@theme_bg_color, 1.18), shade(@theme_bg_color, 1.1)); } +treeview header button:hover, column-header.button:hover, column-header .button:hover { background-image: linear-gradient(to bottom, @@ -182,6 +240,11 @@ column-header .button:hover { box-shadow: inset 0 2px 0 0 alpha(@theme_selected_bg_color, 0.7); } +treeview header button:focus, +treeview header button:checked, +treeview header button:checked:hover, +treeview header button:active, +treeview header button:active:hover, column-header.button:focus, column-header .button:focus, column-header.button:checked, @@ -201,15 +264,21 @@ column-header .button:active:hover { } /* Insensitive entry background */ -.entry:insensitive, -GtkComboBox.combobox-entry .button:insensitive, -.level-bar.trough:insensitive { +entry:disabled, +combobox entry button:disabled, +levelbar trough:disabled, +.entry:disabled, +GtkComboBox.combobox-entry .button:disabled, +.level-bar.trough:disabled { background-color: @insensitive_bg_color; background-image: none; box-shadow: none; } /* Primary and inline toolbars background */ +toolbar.primary-toolbar, +toolbar.primary-toolbar, +toolbar.inline-toolbar, .primary-toolbar .toolbar, .primary-toolbar.toolbar, .inline-toolbar.toolbar { @@ -219,6 +288,9 @@ GtkComboBox.combobox-entry .button:insensitive, background-color: transparent; } +toolbar.primary-toolbar.vertical, +toolbar.primary-toolbar.vertical, +toolbar.inline-toolbar.vertical, .primary-toolbar .toolbar.vertical, .primary-toolbar.toolbar.vertical, .inline-toolbar.toolbar.vertical { @@ -228,12 +300,14 @@ GtkComboBox.combobox-entry .button:insensitive, background-color: transparent; } +scale trough, .scale.trough { background-image: linear-gradient(to bottom, @scale_trough_bg_a, @scale_trough_bg_b); } +scale.vertical trough, .scale.trough.vertical { background-image: linear-gradient(to right, @scale_trough_bg_a, @@ -241,6 +315,8 @@ GtkComboBox.combobox-entry .button:insensitive, } /* Active switch background*/ +switch trough:active, +scale progressbar, GtkSwitch.trough:active, .scale.progressbar { background-image: linear-gradient(to bottom, @@ -249,6 +325,7 @@ GtkSwitch.trough:active, background-color: transparent; } +scale.vertical progressbar, .scale.progressbar.vertical { background-image: linear-gradient(to right, @switch_trough_active_bg_a, @@ -258,6 +335,11 @@ GtkSwitch.trough:active, /* Progressbar backgrounds */ +progressbar progress, +row progressbar progress, +row:hover progressbar progress, +row:selected progressbar progress, +row:selected:focus progressbar progress, .progressbar, .progressbar row, .progressbar row:hover, @@ -279,6 +361,7 @@ GtkSwitch.trough:active, box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1); } +progressbar.vertical progress, .progressbar.vertical { background-image: linear-gradient(to right top, alpha (@progressbar_pattern, 0.25), diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css index 9d9ffbe9..9d9960d3 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css @@ -1,17 +1,20 @@ /* Borders */ /* generic element borders */ +entry, +button:active, +button:checked, +combobox entry entry, +combobox entry button, +toolbar.inline-toolbar.vertical button:active, +toolbar.inline-toolbar.vertical button:checked, .entry, .button:active, .button:checked, GtkComboBox.combobox-entry .entry, GtkComboBox.combobox-entry .button, -.spinbutton.vertical .button:active, -.spinbutton.vertical .button:checked, .inline-toolbar.toolbar.vertical .button:active, -.inline-toolbar.toolbar.vertical .button:checked, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:active, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:checked { +.inline-toolbar.toolbar.vertical .button:checked { border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; @@ -19,20 +22,25 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu border-color: transparent; } +trough, +trough highlight, .trough, .trough.highlight { border: 1px solid @borders; } - -.entry:insensitive, -.button:active:insensitive, -.spinbutton.vertical .button:insensitive, -GtkComboBox.combobox-entry .entry:insensitive, -GtkComboBox.combobox-entry .button:insensitive, -.inline-toolbar.toolbar.vertical .button:insensitive, -.inline-toolbar.toolbar.vertical .button.default:insensitive, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:insensitive { +entry:disabled, +button:active:disabled, +combobox entry entry:disabled, +combobox entry button:disabled, +toolbar.inline-toolbar.vertical button:disabled, +toolbar.inline-toolbar.vertical button.default:disabled, +.entry:disabled, +.button:active:disabled, +GtkComboBox.combobox-entry .entry:disabled, +GtkComboBox.combobox-entry .button:disabled, +.inline-toolbar.toolbar.vertical .button:disabled, +.inline-toolbar.toolbar.vertical .button.default:disabled { border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; @@ -40,14 +48,18 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu border-color: transparent; } -.button:insensitive, -.button.default:insensitive, -.spinbutton.vertical .button:insensitive, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar .button.default:insensitive, -.inline-toolbar.toolbar.vertical .button:insensitive, -.inline-toolbar.toolbar.vertical .button.default:insensitive, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:insensitive { +button:disabled, +button.default:disabled, +toolbar.inline-toolbar button:disabled, +toolbar.inline-toolbar button.default:disabled, +toolbar.inline-toolbar.vertical button:disabled, +toolbar.inline-toolbar.vertical button.default:disabled, +.button:disabled, +.button.default:disabled, +.inline-toolbar.toolbar .button:disabled, +.inline-toolbar.toolbar .button.default:disabled, +.inline-toolbar.toolbar.vertical .button:disabled, +.inline-toolbar.toolbar.vertical .button.default:disabled { border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; @@ -55,6 +67,7 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu border-color: transparent; } +row trough, .trough row { border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch; border-radius: 4px; @@ -64,22 +77,26 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu } /* focused element borders */ +entry:focus, +button:active:focus, +button:checked:focus, +button.default:active, +button.default:checked, +combobox entry button:focus, +toolbar.inline-toolbar.vertical button:active:focus, +toolbar.inline-toolbar.vertical button:checked:focus +toolbar.inline-toolbar.vertical button.default:active, +toolbar.inline-toolbar.vertical button.default:checked, .entry:focus, .button:active:focus, .button:checked:focus, .button.default:active, .button.default:checked, GtkComboBox.combobox-entry .button:focus, -.spinbutton.vertical .button:active:focus, -.spinbutton.vertical .button:checked:focus, .inline-toolbar.toolbar.vertical .button:active:focus, .inline-toolbar.toolbar.vertical .button:checked:focus .inline-toolbar.toolbar.vertical .button.default:active, -.inline-toolbar.toolbar.vertical .button.default:checked, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active:focus, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:focus { +.inline-toolbar.toolbar.vertical .button.default:checked { border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; @@ -87,6 +104,10 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:chec border-color: transparent; } +.titlebar button:hover, +.titlebar button.titlebutton:hover, +.titlebar button.titlebutton:active, +.titlebar button:checked:checked, .titlebar .button:hover, .titlebar .titlebutton:hover, .titlebar .titlebutton:active, @@ -98,7 +119,9 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:chec border-color: transparent; } -.button { +button, +.button +/*.inline-toolbar.toolbar.vertical .button*/ { border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; border-width: 2px; @@ -106,9 +129,8 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:chec border-color: transparent; } -.spinbutton.vertical .button, -.inline-toolbar.toolbar.vertical .button, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button { +toolbar.inline-toolbar.vertical button, +.inline-toolbar.toolbar.vertical .button { border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch; border-radius: 4px; border-width: 2px; @@ -117,6 +139,8 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu } /* focused button borders */ +button.default, +button:focus, .button.default, .button:focus { border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; @@ -126,21 +150,26 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu border-color: transparent; } +button.flat:hover, .button.flat:hover { border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch; } /* overrride for osd */ +toolbar.osd button:hover, .osd.toolbar .button:hover { border-image: none; } /* primary toolbar button borders */ +toolbar.primary-toolbar button:hover, .primary-toolbar .button:hover { border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch; background-color: transparent; } +toolbar.primary-toolbar button:active, +toolbar.primary-toolbar button:checked, .primary-toolbar .button:active, .primary-toolbar .button:checked { border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch; @@ -148,6 +177,7 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu } /* tooltip elements borders */ +tooltip entry, .tooltip .entry { border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch; border-width: 1px; @@ -155,6 +185,7 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu border-color: transparent; } +tooltip button, .tooltip .button { border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch; border-width: 1px; @@ -163,6 +194,7 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu } /* tooltip focused elements borders */ +tooltip entry:focus, .tooltip .entry:focus { border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch; border-width: 1px; @@ -171,6 +203,20 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu } /* primary toolbar - generic element borders */ +toolbar.primary-toolbar entry, +toolbar.primary-toolbar combobox entry .entry, +toolbar.primary-toolbar combobox entry .button, +toolbar.primary-toolbar button:active, +toolbar.primary-toolbar button.raised:active, +toolbar.primary-toolbar raised button:active, +toolbar.inline-toolbar button:active, +toolbar.primary-toolbar button:checked, +toolbar.primary-toolbar button.raised:checked, +toolbar.primary-toolbar .raised button:checked, +toolbar.inline-toolbar .button:checked, +toolbar.primary-toolbar switch.trough, +toolbar.primary-toolbar combobox button:checked, +toolbar.primary-toolbar combobox button:active, .primary-toolbar .entry, .primary-toolbar GtkComboBox.combobox-entry .entry, .primary-toolbar GtkComboBox.combobox-entry .button, @@ -192,13 +238,20 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu border-color: transparent; } -.primary-toolbar .button.raised:insensitive, -.primary-toolbar .raised .button:insensitive, -.primary-toolbar .button.raised.default:insensitive, -.primary-toolbar .raised .button.default:insensitive, -.primary-toolbar GtkSwitch.trough:insensitive, -.primary-toolbar GtkSwitch.trough:active:insensitive, -.primary-toolbar GtkComboBox .button:insensitive { +toolbar.primary-toolbar button.raised:disabled, +toolbar.primary-toolbar raised .button:disabled, +toolbar.primary-toolbar button.raised.default:disabled, +toolbar.primary-toolbar raised .button.default:disabled, +toolbar.primary-toolbar switch.trough:disabled, +toolbar.primary-toolbar switch.trough:active:disabled, +toolbar.primary-toolbar combobox button:disabled, +.primary-toolbar .button.raised:disabled, +.primary-toolbar .raised .button:disabled, +.primary-toolbar .button.raised.default:disabled, +.primary-toolbar .raised .button.default:disabled, +.primary-toolbar GtkSwitch.trough:disabled, +.primary-toolbar GtkSwitch.trough:active:disabled, +.primary-toolbar GtkComboBox .button:disabled { border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch; border-radius: 4px; border-width: 2px; @@ -207,6 +260,15 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu } /* primary toolbar - focused element borders */ +toolbar.primary-toolbar button:active:focus, +toolbar.primary-toolbar entry:focus, +toolbar.primary-toolbar combobox entry entry:focus, +toolbar.primary-toolbar button.raised.default:checked, +toolbar.primary-toolbar .raised button.default:checked, +toolbar.inline-toolbar button.default:checked, +toolbar.primary-toolbar button.raised.default:active, +toolbar.primary-toolbar raised button.default:active, +toolbar.inline-toolbar button.default:active, .primary-toolbar .button:active:focus, .primary-toolbar .entry:focus, .primary-toolbar GtkComboBox.combobox-entry .entry:focus, @@ -225,6 +287,10 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu } /* primary toolbar - generic button borders */ +toolbar.primary-toolbar button.raised, +toolbar.primary-toolbar .raised button, +toolbar.inline-toolbar button, +toolbar.primary-toolbar combobox button, .primary-toolbar .button.raised, .primary-toolbar .raised .button, .inline-toolbar.toolbar .button, @@ -237,6 +303,9 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu } /* primary toolbar - focused button borders */ +toolbar.primary-toolbar button.raised.default, +toolbar.primary-toolbar .raised button.default, +toolbar.inline-toolbar button.default, .primary-toolbar .button.raised.default, .primary-toolbar .raised .button.default, .inline-toolbar.toolbar .button.default { @@ -248,6 +317,12 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu } /* column-headers borders */ +treeview header button, +treeview header button:active, +treeview header button:active:hover, +treeview header button:checked, +treeview header button:checked:hover, +treeview header button:disabled, column-header.button, column-header .button, column-header.button:active, @@ -258,14 +333,20 @@ column-header.button:checked, column-header .button:checked, column-header.button:checked:hover, column-header .button:checked:hover, -column-header.button:insensitive, -column-header .button:insensitive { +column-header.button:disabled, +column-header .button:disabled { border-width: 0 1px 1px 0; border-radius: 0; border-style: solid; border-color: transparent; } +treeview header button, +treeview header button:active, +treeview header button:active:hover, +treeview header button:checked, +treeview header button:checked:hover, +treeview header button.dnd, column-header.button, column-header .button, column-header.button:active, @@ -283,22 +364,31 @@ column-header .button.dnd { } /* ie. yumex-dnf */ +stack treeview header button, +stack treeview header button:focus, GtkStack column-header .button { border-width: 0px 1px 1px 0px; - border-color: transparent; + border-color: transparent; border-style: solid; - border-image: linear-gradient(to bottom, - alpha(@borders, 0.0), - shade(@borders, 1.0)) 0 1 1 0; + border-radius: 0px; + border-image: linear-gradient(to bottom, + alpha(@borders, 0.0), + shade(@borders, 1.0)) 0 1 1 0; } -column-header.button:insensitive, -column-header .button:insensitive { +treeview header button:disabled, +column-header.button:disabled, +column-header .button:disabled { border-image: linear-gradient(to top, alpha(@theme_base_color, 0.0), @insensitive_bg_color) 0 1 1 0; } +treeview header button:last-child, +treeview header button:active:last-child, +treeview header button:active:hover:last-child, +treeview header button:checked:last-child, +treeview header button:checked:hover:last-child, column-header.button:last-child, column-header:last-child .button, column-header.button:last-child:active, @@ -312,6 +402,7 @@ column-header:last-child .button:checked:hover { border-right-width: 0; } +treeview header button:focus column-header.button:focus, column-header .button:focus { border-image: linear-gradient(to top, @@ -322,6 +413,8 @@ column-header .button:focus { } /* pushed colored buttons borders */ +toolbar.selection-mode button.suggested-action, +toolbar.selection-mode GtkToolButton.suggested-action button, .selection-mode.toolbar .suggested-action.button, .selection-mode.toolbar GtkToolButton.suggested-action .button { border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch; @@ -333,6 +426,9 @@ column-header .button:focus { } /* suggested action buttons borders */ +button.suggested-action, +button.suggested-action:checked, +button.suggested-action:active, .suggested-action.button, .suggested-action.button:checked, .suggested-action.button:active { @@ -345,13 +441,56 @@ column-header .button:focus { } /* destructive action buttons borders */ +button.destructive-action, +button.destructive-action:checked, +button.destructive-action:active, .destructive-action.button, .destructive-action.button:checked, .destructive-action.button:active { - border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch; - border-radius: 3px; - border-width: 2px; - border-style: solid; - border-color: transparent; - /* Zuki note: figure out the heck it does */ + border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch; + border-radius: 3px; + border-width: 2px; + border-style: solid; + border-color: transparent; } + +button.image-button.radio:dir(ltr) { + border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-radius: 4px; + border-width: 2px; + border-style: solid; + border-color: transparent; + border-radius: 3px; +} + +button.image-button.radio.default:dir(ltr), +button.image-button.radio:dir(ltr):focus { + border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-radius: 4px; + border-width: 2px; + border-style: solid; + border-color: transparent; +} + +button.image-button.radio:dir(ltr):checked { + border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-radius: 4px; + border-width: 2px; + border-style: solid; + border-color: transparent; +} + +button.image-button.radio:dir(ltr):hover, +button.image-button.radio:dir(ltr):checked:focus, +button.image-button.radio:dir(ltr):checked:hover, +button.image-button.radio:dir(ltr):checked:focus:hover, +button.image-button.radio:dir(ltr):focus:hover:active, +button.image-button.radio:dir(ltr):checked:focus:hover:active, +button.image-button.radio.default:dir(ltr):checked { + border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + border-radius: 4px; + border-width: 2px; + border-style: solid; + border-color: transparent; +} + diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css index 2627413f..018c03ec 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css @@ -1,30 +1,14 @@ * { - engine: none; padding: 0; background-clip: padding-box; - -GtkButton-child-displacement-x: 1; - -GtkButton-child-displacement-y: 1; - -GtkButtonBox-child-min-height: 26; - -GtkCheckButton-indicator-size: 16; - -GtkCheckMenuItem-indicator-size: 12; -GtkDialog-button-spacing: 4; -GtkDialog-action-area-border: 10; /* buttons mate-appearance-properties */ - -GtkExpander-expander-size: 11; - -GtkMenu-horizontal-padding: 0; - -GtkMenu-vertical-padding: 0; - -GtkPaned-handle-size: 1; -GtkScrolledWindow-scrollbar-spacing: 0; - -GtkScrolledWindow-scrollbars-within-bevel: 1; -GtkTextView-error-underline-color: @error_color; -GtkToolButton-icon-spacing: 4; -GtkToolItemGroup-expander-size: 11; -GtkTreeView-expander-size: 11; -GtkTreeView-horizontal-separator: 4; - -GtkWidget-focus-padding: 2; - -GtkWidget-focus-line-width: 0; - -GtkWindow-resize-grip-width: 13; - -GtkWindow-resize-grip-height: 13; - -GtkStatusbar-shadow-type: none; -GtkIMHtml-hyperlink-color: @link_color; -GtkHTML-link-color: @link_color; -WnckTasklist-fade-overlay-rect: 0; @@ -32,8 +16,7 @@ outline-style: dashed; outline-offset: -3px; /* 2px */ outline-width: 0px; /* disable ugly focus-line */ - outline-radius: 2px; -/* -gtk-icon-style: regular;*/ /* disable symbolic icons */ + -gtk-outline-radius: 2px; } /*************** @@ -47,7 +30,7 @@ .background:backdrop { text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; } *:selected, @@ -62,19 +45,19 @@ color: @theme_unfocused_selected_fg_color; } -*:insensitive { +*:disabled { /*background-color: @insensitive_bg_color;*/ color: @insensitive_fg_color; border-color: @insensitive_borders; } /* Apply effects to insensitive and prelit images */ -*:insensitive { - -gtk-image-effect: dim; +*:disabled { + -gtk-icon-effect: dim; } *:hover { - -gtk-image-effect: highlight; + -gtk-icon-effect: highlight; } .gtkstyle-fallback { @@ -82,7 +65,7 @@ color: @theme_fg_color; } -.gtkstyle-fallback:prelight { +.gtkstyle-fallback:hover { background-color: shade(@theme_bg_color, 1.10); color: @theme_fg_color; } @@ -92,7 +75,7 @@ color: @theme_fg_color; } -.gtkstyle-fallback:insensitive { +.gtkstyle-fallback:disabled { background-color: @insensitive_bg_color; color: @insensitive_fg_color; } @@ -102,14 +85,22 @@ color: @theme_selected_fg_color; } +image, +image:disabled, +label, +label:disabled, +box, +box:disabled, +/*GtkGrid, +GtkGrid:disabled,*/ GtkImage, -GtkImage:insensitive, +GtkImage:disabled, GtkLabel, -GtkLabel:insensitive, +GtkLabel:disabled, GtkBox, -GtkBox:insensitive, +GtkBox:disabled, GtkGrid, -GtkGrid:insensitive { +GtkGrid:disabled { background-color: transparent; } @@ -122,6 +113,7 @@ GtkFlowBox .grid-child:selected { outline-offset: -2px; } +textView, GtkTextView { background-color: @theme_base_color; } @@ -129,22 +121,28 @@ GtkTextView { /************ * Tooltips * ************/ -.tooltip, -.tooltip.background { +tooltip { padding: 4px; border-style: solid; border-width: 1px; border-color: shade(@theme_tooltip_bg_color, 0.50); - border-radius: 0px; + border-radius: 2px; +} +tooltip.background { background-color: @theme_tooltip_bg_color; color: @theme_tooltip_fg_color; - text-shadow: none; } -.tooltip * { +tooltip decoration { + background-color: transparent; +} + +tooltip * { background-color: transparent; + color: @theme_tooltip_fg_color; + padding: 4px; } /********************* @@ -156,29 +154,31 @@ GtkTextView { to { -gtk-icon-transform: rotate(1turn); } } +spinner, .spinner { - background-image: none; - background-color: blue; + background: none; opacity: 0; -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); } -.spinner:active { +spinner:checked, +.spinner:checked { opacity: 1; - animation: spin 1s linear infinite; } -.spinner:active:insensitive { - opacity: 0.5; + animation: spin 1s linear infinite; } -.button .spinner:active { - color: @theme_fg_color; +spinner:checked:disabled, +.spinner:checked:disabled { + opacity: 0.5; } /***************** * Miscellaneous * *****************/ .view.rubberband, -.rubberband { +.rubberband, +view rubberband, +rubberband { background-color: alpha (@theme_selected_bg_color, 0.35); border-color: @theme_selected_bg_color; @@ -187,17 +187,20 @@ GtkTextView { border-radius: 0px; } +statusbar label, +statusbar frame, GtkStatusbar .label, GtkStatusbar .frame.flat { color: @theme_fg_color; - -GtkStatusbar-shadow-type: none; } +statusbar frame, GtkStatusbar .frame.flat { padding: 1px; - border-width: 0; + border-style: none; } +statusbar frame button.flat, GtkStatusbar .frame.flat .button.flat { padding: 0px; } @@ -209,45 +212,36 @@ GtkStatusbar .frame.flat .button.flat { border-radius: 0; } +treeview.view separator, +treeview.view .separator, /* why ?*/ +treeview separator, +separator, +separator:hover, GtkTreeView.view.separator, GtkTreeView.separator, .separator, .separator:hover { color: @view_separators; - background-color: transparent; + background-color: @view_separators; +} + +/*Keep treeviews from jumping, separators drawn at 0 by default until hovered*/ +treeview.view.separator { + min-height: 2px; } +.toolbar separator, .toolbar .separator { /*color: @toolbar_separator;*/ color: transparent; } -.pane-separator { - -GtkPaned-handle-size: 1; - border-width: 0 1px 1px 1px; - border-style: solid; - border-color: @borders; - background-color: @sidebar_bg; - background-image: url("assets/null.png"); - color: @borders; -} - -.pane-separator:hover, -.pane-separator:selected { - color: @theme_text_color; -} - -.notebook .pane-separator, -.notebook .pane-separator:hover { - background-color: @theme_base_color; -} - /************************ * overshoot/undershoot * ************************/ /* displays at end of mouse scrolling */ -.overshoot.top { +overshoot.top { background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, @@ -266,7 +260,7 @@ GtkTreeView.separator, box-shadow: none; } -.overshoot.top:backdrop { +overshoot.top:backdrop { background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, @@ -280,7 +274,7 @@ GtkTreeView.separator, box-shadow: none; } -.overshoot.bottom { +overshoot.bottom { background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, @@ -299,7 +293,7 @@ GtkTreeView.separator, box-shadow: none; } -.overshoot.bottom:backdrop { +overshoot.bottom:backdrop { background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, @@ -313,7 +307,7 @@ GtkTreeView.separator, box-shadow: none; } -.overshoot.left { +overshoot.left { background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, @@ -332,7 +326,7 @@ GtkTreeView.separator, box-shadow: none; } -.overshoot.left:backdrop { +overshoot.left:backdrop { background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, @@ -346,7 +340,7 @@ GtkTreeView.separator, box-shadow: none; } -.overshoot.right { +overshoot.right { background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, @@ -365,7 +359,7 @@ GtkTreeView.separator, box-shadow: none; } -.overshoot.right:backdrop { +overshoot.right:backdrop { background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, @@ -380,7 +374,7 @@ GtkTreeView.separator, } /* result is disable undershoot */ -.undershoot.top { +undershoot.top { background-color: transparent; background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, @@ -391,7 +385,7 @@ GtkTreeView.separator, background-position: center top; } -.undershoot.bottom { +undershoot.bottom { background-color: transparent; background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, @@ -402,7 +396,7 @@ GtkTreeView.separator, background-position: center bottom; } -.undershoot.left { +undershoot.left { background-color: transparent; background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, @@ -413,7 +407,7 @@ GtkTreeView.separator, background-position: left center; } -.undershoot.right { +undershoot.right { background-color: transparent; background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, @@ -427,22 +421,26 @@ GtkTreeView.separator, /**************** * Text Entries * ****************/ + +entry, .entry { border-style: solid; - padding: 5px 4px 6px; /*4px;*/ - + padding: 4px; /* border-image defined in the -assets variants */ - color: @entry_text_color; background-color: @theme_base_color; box-shadow: inset 0px 2px 3px 0px alpha(@theme_fg_color, 0.15); } +entry image.left, .entry.image.left { padding-right: 6px; } -.entry.flat, .entry.flat:focus { +entry.flat, +entry.flat:focus, +.entry.flat, +.entry.flat:focus { padding: 2px; background-color: @theme_base_color; border-color: @borders; @@ -450,12 +448,15 @@ GtkTreeView.separator, border-radius: 0; } +entry:focus, .entry:focus { box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1), inset 1px 1px alpha(@theme_selected_bg_color, 0.1), inset -1px -1px alpha(@theme_selected_bg_color, 0.2); } +entry progressbar, +entry progressbar:focus, .entry.progressbar, .entry.progressbar:focus { margin-left: 2px; @@ -474,6 +475,8 @@ GtkTreeView.separator, box-shadow: none; } +entry progressbar.pulse, +entry progressbar.pulse:focus, .entry.progressbar.pulse, .entry.progressbar.pulse:focus { background-image: linear-gradient(to top, @@ -485,15 +488,20 @@ GtkTreeView.separator, transparent 5px); } +entry selection, +entry selection:focus, +entry:selected, .entry:selected { color: @theme_selected_fg_color; background-color: @theme_selected_bg_color; } -.entry:insensitive { +entry:disabled, +.entry:disabled { color: @insensitive_fg_color; } +entry:active, .entry:active { color: @theme_unfocused_selected_fg_color; background-color: @theme_unfocused_selected_bg_color; @@ -511,181 +519,154 @@ GtkTreeView.separator, /* background-image in assets */ } -/******************* - * Symbolic images * - *******************/ -.image { - color: @internal_element_color; -} - -.image:hover { - color: @internal_element_prelight; -} - -.image:selected, -.image:selected:hover { - color: @theme_selected_fg_color; -} - -.view.image, -.view.image:hover { - color: @view_symbolic_color; -} - -.view.image:selected, -.view.image:selected:hover { - color: @theme_selected_fg_color; -} - /***************** * GtkSpinButton * *****************/ -.spinbutton .button { - color: @internal_element_color; - padding: 2px 6px; - border-width: 0; - border-radius: 0; - border-style: none; - border-image: none; - box-shadow: inset 1px 0 @inset_dark_color; -} -.spinbutton .button { - background-color: transparent; - background-image: none; +spinbutton, +spinbutton:focus { + background-image: linear-gradient(to bottom, + @entry_background_a, + @entry_background_b); + border-color: @borders; + border-width: 1px; + border-style: solid; + border-radius: 3px; + padding: 0px; } -.spinbutton .button:insensitive { - color: @internal_element_insensitive; +spinbutton:disabled { + background-color: @insensitive_bg_color; + background-image: none; + border-color: @borders; } -.spinbutton .button:active, -.spinbutton .button:hover { - color: @internal_element_prelight; +spinbutton button, +spinbutton button:focus, +spinbutton button:active, +spinbutton button:focus:active, +spinbutton button:disabled { + border-style: none; + border-image: none; + padding: 5px; + border-radius: 0px; + box-shadow: inset 1px 0 @inset_dark_color; } -.spinbutton .button:first-child { - border-radius: 3px 0 0 3px; - box-shadow: none; +spinbutton button, +spinbutton button:focus { + background-image: linear-gradient(to bottom, + @button_gradient_color_a, + @button_gradient_color_b); + background-color: transparent; + color: @internal_element_color; } -.spinbutton .button:last-child { - border-radius: 0 3px 3px 0; +spinbutton button:hover { + background-color: transparent; + background-image: linear-gradient(to bottom, + @button_hover_gradient_color_a, + @button_hover_gradient_color_b); + color: @internal_element_prelight; } -.spinbutton .button:dir(rtl) { - box-shadow: inset -1px 0 @inset_dark_color; +spinbutton button:active, +spinbutton button:active:hover { + background-image: linear-gradient(to bottom, + @button_active_gradient_color_a, + @button_active_gradient_color_b); + background-color: transparent; + color: @internal_element_prelight; } -/* Add back the glowy effect from the entry covered by the pushed button background*/ -.spinbutton .button:active, -.spinbutton .button:active:focus { - padding: 2px 4px; - box-shadow: inset 1px 0 @inset_dark_color, - inset 0 1px alpha(@theme_selected_bg_color, 0.2), - inset 0 -1px alpha(@theme_selected_bg_color, 0.2); +spinbutton button:disabled { + color: @internal_element_insensitive; } -.spinbutton .button:first-child:active, -.spinbutton .button:first-child:active:focus { - padding: 2px 4px; - box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2), - inset 0 -1px alpha(@theme_selected_bg_color, 0.2); +spinbutton button:first-child { + border-radius: 0px; } -.spinbutton .button:last-child:active, -.spinbutton .button:last-child:active:focus { - padding: 2px 4px; - box-shadow: inset 1px 0 @inset_dark_color, - inset 0 1px alpha(@theme_selected_bg_color, 0.2), - inset -1px -1px alpha(@theme_selected_bg_color, 0.2); +spinbutton button:last-child { + border-radius: 0 3px 3px 0; } -.spinbutton.vertical .button { - padding: 4px; - icon-shadow: 0 1px @button_text_shadow; +spinbutton button:dir(rtl) { + box-shadow: inset -1px 0 @inset_dark_color; } -.spinbutton.vertical .button, -.spinbutton.vertical .button:hover { - padding: 4px; - color: @theme_fg_color; +spinbutton.horizontal entry, +spinbutton.horizontal entry:focus, +stack box.vertical.linked spinbutton.horizontal entry, +stack box.vertical.linked spinbutton.horizontal entry:focus { + padding: 0px 10px 0px 2px; + border-image:none; + border-style: none; + box-shadow: inset 1px 0 @inset_dark_color; } -.spinbutton.vertical .button:insensitive { - color: @insensitive_fg_color; +spinbutton.horizontal button, +spinbutton.horizontal button:focus, +stack box.vertical.linked spinbutton.horizontal button, +stack box.vertical.linked spinbutton.horizontal button:focus { + padding: 0px 6px 0px 6px; } -.spinbutton.vertical .button:active { - color: @button_active_text; - icon-shadow: 0 1px @button_active_text_shadow; +spinbutton.vertical entry, +spinbutton.vertical entry:focus { + padding: 6px 4px 6px 2px; + border-image:none; + border-style: solid; + border-width: 1px 0px 1px 0px; + border-color: @borders; + border-radius: 0px; } -/* :insensitive:insensitive to override the dark overriden style for - normal spinbutton buttons, yeah we lack !important */ -.spinbutton.vertical .button:insensitive:insensitive { - icon-shadow: none; +spinbutton.vertical button, +spinbutton.vertical button:focus { + border-color: @borders; + border-width: 0px; + border-style: solid; + padding: 5px; + color: @theme_fg_color; } -.spinbutton.vertical .button, -/* :active:active to override the dark overriden style for - normal spinbutton buttons, yeah we lack !important */ -.spinbutton.vertical .button:active:active { - box-shadow: none; +spinbutton.vertical button:disabled { + color: @insensitive_fg_color; + -gtk-icon-shadow: none; } -.spinbutton.vertical .button:first-child, -.spinbutton.vertical .button:active:first-child { - border-image-width: 3px 3px 0 3px; - border-width: 2px 1px 0 1px; - border-bottom-left-radius: 0; - border-bottom-right-radius: 0; - padding: 4px; +spinbutton.vertical button:active, +spinbutton.vertical button:hover:active { + color: @button_active_text; + -gtk-icon-shadow: 0 1px @button_active_text_shadow; } -.spinbutton.vertical .button:last-child, -.spinbutton.vertical .button:active:last-child { - border-image-width: 0 3px 4px 3px; - border-width: 0 1px 2px 1px; - border-top-left-radius: 0; - border-top-right-radius: 0; - padding: 4px; +spinbutton.vertical button, +spinbutton.vertical button:active { + border-radius: 3px 3px 0 0; } -.spinbutton.vertical.entry { - border-image: none; - border-color: alpha(@borders, 0.1); - border-width: 0 1px 0 1px; - border-style: solid; - border-radius: 0; - box-shadow: inset 1px 0 0 0 @borders, - inset -1px 0 0 0 @borders, - inset 0 1px 0 0 @borders, - inset 0 -1px 0 0 @borders; - - /* I'm using box-shadow as borders, so I need to compensate - with padding. Those two values need to be entry padding +1 */ - padding-top: 5px; - padding-bottom: 5px; +spinbutton.vertical button:last-child, +spinbutton.vertical button:active:last-child { + border-radius: 0 0 3px 3px; } -.spinbutton.vertical.entry:insensitive { - border-color: alpha(@borders, 0.1); - box-shadow: inset 0 1px alpha(@borders, 0.4), - inset 0 -1px alpha(@borders, 0.4); +stack box.vertical.linked spinbutton.horizontal { + border-radius: 0px; } -.spinbutton.vertical.entry:focus { - border-color: alpha(@borders, 0.1); - box-shadow: inset 1px 0 0 0 @theme_selected_bg_color, - inset -1px 0 0 0 @theme_selected_bg_color, - inset 0 1px 0 0 @theme_selected_bg_color, - inset 0 -1px 0 0 @theme_selected_bg_color; +stack box.vertical.linked spinbutton.horizontal button { + border-radius: 0px; + border-style: none; + box-shadow: inset 1px 0 @inset_dark_color; } /***************** * Color Chooser * *****************/ +colorswatch, +colorswatch:selected, GtkColorSwatch, GtkColorSwatch:selected { border-width: 1px; @@ -699,57 +680,57 @@ GtkColorSwatch:selected { background-clip: border-box; } -GtkColorSwatch:hover, -GtkColorSwatch:selected:hover { +colorswatch:hover, +colorswatch:selected:hover { border-color: alpha(black, 0.45); } -GtkColorSwatch.color-dark:hover { +colorswatch.color-dark:hover { background-image: linear-gradient(to bottom, alpha(white, 0) 40%, alpha(white, 0.3) ); } -GtkColorSwatch.color-light:hover { +colorswatch.color-light:hover { background-image: linear-gradient(to top, alpha(black, 0) 40%, alpha(black, 0.1) ); } -GtkColorSwatch.color-light:selected:hover, -GtkColorSwatch.color-dark:selected:hover { +colorswatch.color-light:selected:hover, +colorswatch.color-dark:selected:hover { background-image: none; } -GtkColorSwatch.left, -GtkColorSwatch:first-child { +colorswatch.left, +colorswatch:first-child { border-top-left-radius: 6px; border-bottom-left-radius: 6px; } -GtkColorSwatch.right, -GtkColorSwatch:last-child { +colorswatch.right, +colorswatch:last-child { border-top-right-radius: 6px; border-bottom-right-radius: 6px; } -GtkColorSwatch:only-child { +colorswatch:only-child { border-radius: 6px; } -GtkColorSwatch.top { +colorswatch.top { border-top-left-radius: 6px; border-top-right-radius: 6px; } -GtkColorSwatch.bottom { +colorswatch.bottom { border-bottom-left-radius: 6px; border-bottom-right-radius: 6px; } -GtkColorChooserWidget #add-color-button { +colorchooser #add-color-button { background-clip: padding-box; border-color: mix(@borders, @theme_bg_color, 0.3); background-color: mix(@borders, @theme_bg_color, 0.3); @@ -757,7 +738,7 @@ GtkColorChooserWidget #add-color-button { box-shadow: none; } -GtkColorChooserWidget #add-color-button:hover { +colorchooser #add-color-button:hover { border-color: @borders; background-color: @borders; color: @theme_base_color; @@ -782,77 +763,127 @@ GtkColorChooserWidget #add-color-button:hover { color: #cccccc; } -GtkColorEditor GtkColorSwatch { +box.horizontal colorswatch, +GtkColorEditor colorswatch { border-radius: 6px; } -GtkColorEditor GtkColorSwatch.color-dark:hover, -GtkColorEditor GtkColorSwatch.color-light:hover { +GtkColorEditor colorswatch.color-dark:hover, +GtkColorEditor colorswatch.color-light:hover { background-image: none; border-color: alpha(black, 0.3); } +button.color, GtkColorButton.button { - padding: 1px 20px; + padding: 5px; } /**************** * Progress bar * ****************/ +progressbar, GtkProgressBar { - /* FIXME - Not working 3.14 */ - -GtkProgressBar-min-horizontal-bar-height: 16; - -GtkProgressBar-min-vertical-bar-width: 16; - border-radius: 16px; - padding: 0 0 1px 0; + border-radius: 10px; + padding: 0; font-size: smaller; } +progressbar.horizontal { + min-height: 16px; +} + +progressbar.vertical { + min-width: 16px; +} + /* progress component */ +progressbar.horizontal trough, +progressbar.horizontal progress { + min-height: 16px; + border-radius: 10px; +} + +progressbar.vertical trough, +progressbar.vertical progress { + min-width: 16px; + border-radius: 10px; +} + +progressbar progress.left { + border-top-left-radius: 10px; + border-bottom-left-radius: 10px; +} + +progressbar progress.right { + border-top-right-radius: 10px; + border-bottom-right-radius: 10px; +} + +progressbar progress.top { + border-top-right-radius: 10px; + border-top-left-radius: 10px; +} + +progressbar progress.bottom { + border-bottom-right-radius: 10px; + border-bottom-left-radius: 10px; +} + +progressbar progress, +row progressbar, +row:hover progressbar, +row:selected progressbar, +row:selected:focus progressbar, .progressbar, .progressbar row, .progressbar row:hover, .progressbar row:selected, .progressbar row:selected:focus { - border-radius: 16px; border-width: 1px; border-style: solid; border-color: @progressbar_border; } +row:selected progressbar, +row:selected:focus progressbar, .progressbar row:selected, .progressbar row:selected:focus { border-color: shade(@progressbar_border, 0.85); } /* for progressbars in cell renderers */ +row trough, .trough row { padding: 0; } +row trough, .trough row:selected, .trough row:selected:focus { background-image: linear-gradient(to bottom, mix(@trough_bg_color_a, @theme_selected_bg_color, 0.25), - mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25) - ); + mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25)); } /**************** * Level Bar * ****************/ +levelbar, GtkLevelBar { - -GtkLevelBar-min-block-width: 34; - -GtkLevelBar-min-block-height: 3; + min-width: 34px; + min-height: 3px; } +levelbar.vertical, GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; + min-width: 3px; + min-height: 34px; } +levelbar trough, .level-bar.trough { padding: 2px; border-radius: 2px; @@ -863,7 +894,7 @@ GtkLevelBar.vertical { box-shadow: none; } - +levelbar block.filled, .level-bar.fill-block { border-width: 1px; border-style: solid; @@ -874,19 +905,23 @@ GtkLevelBar.vertical { @progressbar_background_b); } +levelbar.continuous block.filled, .level-bar.indicator-continuous.fill-block { padding: 2px; border-radius: 2px; } +levelbar.discrete.horizontal block.filled, .level-bar.indicator-discrete.fill-block.horizontal { margin: 0 1px; } +levelbar.discrete.vertical block.filled, .level-bar.indicator-discrete.fill-block.vertical { margin: 1px 0; } +levelbar block.filled.high, .level-bar.fill-block.level-high { border-color: shade(@success_color, 0.85); background-image: linear-gradient(to bottom, @@ -895,6 +930,7 @@ GtkLevelBar.vertical { shade(@success_color, 0.95)); } +levelbar block.filled.low, .level-bar.fill-block.level-low { border-color: shade(@warning_color, 0.80); background-image: linear-gradient(to bottom, @@ -903,6 +939,7 @@ GtkLevelBar.vertical { shade(@warning_color, 0.90)); } +levelbar block.empty, .level-bar.fill-block.empty-fill-block { background-color: transparent; background-image: none; @@ -913,41 +950,51 @@ GtkLevelBar.vertical { * GtkScale * ************/ +scale, .scale { -GtkScale-slider-length: 16; -GtkRange-slider-width: 16; -GtkRange-trough-border: 0; } +scale slider, +scale slider:hover, +scale slider:disabled, .scale.slider, .scale.slider:hover, -.scale.slider:insensitive { +.scale.slider:disabled { border-radius: 0; border-style: none; - background-color: transparent; - /* background-image in -assets variant */ } +scale.fine-tune slider:active, +scale.fine-tune slider:active:hover, +scale.horizontal.fine-tune slider:active, +scale.horizontal.fine-tune slider:active:hover, .scale.slider.fine-tune:active, .scale.slider.fine-tune:active:hover, .scale.slider.fine-tune.horizontal:active, .scale.slider.fine-tune.horizontal:active:hover { - background-size: 50%; + background-size: 80%; background-repeat: no-repeat; background-position: center; } +scale trough, .scale.trough { margin: 6px 0; border-radius: 6px; } +scale.vertical trough, .scale.trough.vertical { margin: 0 6px; } +scale trough, +scale trough highlight, .scale.trough, .scale.trough.highlight { border-color: alpha(@theme_base_color, 0.0); @@ -957,6 +1004,8 @@ GtkLevelBar.vertical { border-bottom: 1px; } +scale.vertical trough, +scale.vertical trough highlight, .scale.trough.vertical, .scale.trough.highlight.vertical { border-color: alpha(@theme_base_color, 0.0); @@ -966,56 +1015,78 @@ GtkLevelBar.vertical { border-bottom: 0; } +scale trough, +scale.vertical trough, .scale.trough, .scale.trough.vertical { border-color: @borders; } +scale trough highlight, +scale.vertical trough highlight, .scale.trough.highlight, .scale.trough.highlight.vertical { border-color: @scale_highlight_border; } -.scale.trough:insensitive, -.scale.trough.highlight:insensitive, -.scale.trough.vertical:insensitive, -.scale.trough.highlight.vertical:insensitive { +scale trough:disabled, +scale.vertical trough:disabled, +.scale.trough:disabled, +.scale.trough.vertical:disabled { background-color: shade(@insensitive_bg_color, 0.96); border-color: shade(@insensitive_scale_borders, 1.0); box-shadow: none; background-image: none; } +scale trough highlight:disabled, +scale.vertical trough highlight:disabled, +.scale.trough.highlight:disabled, +.scale.trough.highlight.vertical:disabled { + background-color: shade(@scale_highlight_bg, 1.16); + border-color: shade(@insensitive_scale_borders, 1.0); + box-shadow: none; + background-image: none; +} + +scale trough highlight, +scale.vertical trough highlight, .scale.trough.highlight, .scale.trough.vertical.highlight { background-image: none; background-color: @scale_highlight_bg; } +scale progressbar, .scale.progressbar { background-color: @scale_progress_fill; } +.scale marks separator, .scale.mark.separator { /* defines the color of the actuall marks on the scale */ color: alpha(@theme_fg_color, 0.3); } +scale trough, .scale.trough { box-shadow: inset 0 1px shade(@theme_bg_color, 0.85), inset 0 -1px alpha(@theme_base_color, 0.4); } +scale.vertical trough, .scale.trough.vertical { box-shadow: inset 1px 0 shade(@theme_bg_color, 0.85), inset -1px 0 alpha(@theme_base_color, 0.4); } +scale trough highlight, .scale.trough.highlight { box-shadow: inset 0 1px alpha(@theme_base_color, 0.2), inset 0 -1px shade(@theme_selected_bg_color, 0.7); } +scale.vertical trough highlight, .scale.trough.vertical.highlight { box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2), inset -1px 0 shade(@theme_selected_bg_color, 0.7); @@ -1024,6 +1095,8 @@ GtkLevelBar.vertical { /********** * Frames * **********/ + +frame, .frame { border-width: 1px; border-color: @borders; @@ -1031,15 +1104,18 @@ GtkLevelBar.vertical { padding: 0; } +frame.flat, .frame.flat { border-style: none; } +frame action-bar, .frame.action-bar { padding: 6px; border-width: 1px 0 0; } +scrolledwindow.frame, GtkScrolledWindow.frame { -gtk-icon-style: regular; border-style: solid; @@ -1050,14 +1126,24 @@ GtkScrolledWindow.frame { } /* avoid double borders when a viewport is - * packed into a GtkScrolledWindow */ -GtkScrolledWindow GtkViewport.frame { + * packed into a GtkScrolledWindow, + avoid double borders in general */ +scrolledwindow viewport.frame, +frame box stack scrolledwindow, +GtkScrolledWindow viewport.frame { border-style: none; } +frame box.vertical scrolledwindow.frame { + border-width: 1px 0px 1px 0px; +} + /*********** * Buttons * ***********/ +button, +button.menuitem.menubar, +button.color, +combobox entry button, .button, .button.menuitem.menubar, GtkColorButton.button, @@ -1066,44 +1152,46 @@ GtkComboBox.combobox-entry .button { padding: 4px; } +button.text-button.toggle, GtkToggleButton.button { - padding: 3px 4px; + padding: 5px 4px; } +button.image-button, +toolbar.primary-toolbar button.image-button, .button.image-button, .primary-toolbar.toolbar .button.image-button { padding: 4px; } +button, .button { transition: all 400ms ease-out; - -GtkButton-image-spacing: 4; - -GtkButton-interior-focus: true; - -GtkButton-default-border: 0; - -GtkButton-inner-border: 3; - -GtkArrow-arrow-scaling: 0.5; - + min-height: 16px; + min-width: 16px; border-style: solid; border-color: transparent; - text-shadow: 0 1px @button_text_shadow; } +button.default, .button.default { text-shadow: none; color: @theme_fg_color; } +button.flat, .button.flat { border-color: transparent; background-color: transparent; background-image: none; box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0); text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-image: none; } +button.flat:hover, .button.flat:hover { background-color: transparent; background-image: linear-gradient(to bottom, @@ -1112,6 +1200,7 @@ GtkToggleButton.button { border-radius: 1px; } +button.image-button.circular-button, .button.image-button.circular-button { border-image: none; border-width: 1px; @@ -1119,28 +1208,47 @@ GtkToggleButton.button { border-color: @borders; } +/* arrows */ +#gtk-toolbar-arrow, +button.toggle.popup image { + color: @menu_controls_color; +} + +#gtk-toolbar-arrow:disabled, +button.toggle.popup image:disabled { + color: @insensitive_fg_color; +} + /* We may want a background for focused buttons, but in the meantime let's remove it too */ +toolbar.primary-toolbar button, +toolbar.primary-toolbar button:disabled, +toolbar.primary-toolbar button *:disabled, .primary-toolbar .button, -.primary-toolbar .button:insensitive, -.primary-toolbar .button *:insensitive { +.primary-toolbar .button:disabled, +.primary-toolbar .button *:disabled { background-image: none; background-color: transparent; } /* Remove borders from primary toolbar buttons*/ +toolbar.primary-toolbar button, .primary-toolbar .button { border-image: none; - /* setting border-style: none; here would override the border-width values * we set in gtk-widget-borders.css to zero. */ border-style: solid; border-width: 2px; border-color: transparent; - text-shadow: 0 1px @button_text_shadow; } +toolbar.primary-toolbar button:active, +toolbar.inline-toolbar button:active, +button:active, +toolbar.primary-toolbar button:checked, +toolbar.inline-toolbar button:checked, +button:checked, .primary-toolbar .button:active, .inline-toolbar .button:active, .button:active, @@ -1151,44 +1259,61 @@ GtkToggleButton.button { text-shadow: 0 1px @button_active_text_shadow; } -.button:insensitive, -.button:active *:insensitive, -.button:checked *:insensitive { +button:disabled, +button:active *:disabled, +button:checked *:disabled, +.button:disabled, +.button:active *:disabled, +.button:checked *:disabled { color: @insensitive_fg_color; text-shadow: none; } +toolbar button.raised, +toolbar raised button, +toolbar.inline-toolbar button, .toolbar .button.raised, .toolbar .raised .button, .inline-toolbar .button { - icon-shadow: 0 1px @button_text_shadow; + -gtk-icon-shadow: 0 1px @button_text_shadow; text-shadow: 0 1px @button_text_shadow; } +toolbar button.raised:active, +toolbar .raised button:active, +toolbar.inline-toolbar button:active +toolbar button.raised:checked, +toolbar .raised button:checked, +toolbar.inline-toolbar button:checked, .toolbar .button.raised:active, .toolbar .raised .button:active, .inline-toolbar .button:active .toolbar .button.raised:checked, .toolbar .raised .button:checked, .inline-toolbar .button:checked { - icon-shadow: 0 1px @button_active_text_shadow; + -gtk-icon-shadow: 0 1px @button_active_text_shadow; text-shadow: 0 1px @button_active_text_shadow; } -.toolbar .button.raised:insensitive, -.toolbar .raised .button:insensitive, -.inline-toolbar .button:insensitive { - icon-shadow: none; +toolbar button.raised:disabled, +toolbar .raised button:disabled, +toolbar.inline-toolbar button:disabled, +.toolbar .button.raised:disabled, +.toolbar .raised .button:disabled, +.inline-toolbar .button:disabled { + -gtk-icon-shadow: none; text-shadow: none; } /* linked entries/buttons */ /* Set up shadows and hilights for button visual separation */ +.linked entry, .linked .entry { box-shadow: inset -1px 0 @inset_dark_color; } +.linked entry:focus, .linked .entry:focus { box-shadow: inset 1px 0 @inset_dark_color, inset -1px 0 @inset_dark_color, @@ -1198,6 +1323,7 @@ GtkToggleButton.button { } +.linked entry:focus:first-child, .linked .entry:focus:first-child { box-shadow: inset -1px 0 @inset_dark_color, inset 1px 2px alpha(@theme_selected_bg_color, 0.1), @@ -1206,6 +1332,7 @@ GtkToggleButton.button { } +.linked entry:focus:last-child, .linked .entry:focus:last-child { box-shadow: inset 1px 0 @inset_dark_color, inset 1px 2px alpha(@theme_selected_bg_color, 0.1), @@ -1215,6 +1342,11 @@ GtkToggleButton.button { } /* Set up shadows and hilights for button visual separation */ +.linked button, +toolbar button.raised.linked, +toolbar .raised.linked button, +toolbar.inline-toolbar button, +toolbar.inline-toolbar GtkToolButton > button, .linked .button, .toolbar .button.raised.linked, .toolbar .raised.linked .button, @@ -1223,6 +1355,11 @@ GtkToggleButton.button { box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color; } +.linked button:first-child, +toolbar button.raised.linked:first-child, +toolbar .raised.linked button:first-child, +toolbar.inline-toolbar button:first-child, +toolbar.inline-toolbar GtkToolButton:first-child > button, .linked .button:first-child, .toolbar .button.raised.linked:first-child, .toolbar .raised.linked .button:first-child, @@ -1231,6 +1368,11 @@ GtkToggleButton.button { box-shadow: inset -1px 0 @inset_dark_color; } +.linked button:last-child, +toolbar button.raised.linked:last-child, +toolbar .raised.linked button:last-child, +toolbar.inline-toolbar button:last-child, +toolbar.inline-toolbar GtkToolButton:last-child > button, .linked .button:last-child, .toolbar .button.raised.linked:last-child, .toolbar .raised.linked .button:last-child, @@ -1239,6 +1381,16 @@ GtkToggleButton.button { box-shadow: inset 1px 0 @inset_light_color; } +.linked button:active, +toolbar button.raised.linked:active, +toolbar .raised.linked button:active, +toolbar.inline-toolbar button:active, +toolbar.inline-toolbar GtkToolButton > button:active, +.linked button:checked, +toolbar button.raised.linked:checked, +toolbar .raised.linked button:checked, +toolbar.inline-toolbar button:checked, +toolbar.inline-toolbar GtkToolButton > .button:checked, .linked .button:active, .toolbar .button.raised.linked:active, .toolbar .raised.linked .button:active, @@ -1252,27 +1404,60 @@ GtkToggleButton.button { box-shadow: inset 1px 0 @inset_dark_color; } -.linked .button:insensitive, -.toolbar .button.raised.linked:insensitive, -.toolbar .raised.linked .button:insensitive, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton > .button:insensitive { +.linked button:disabled, +toolbar button.raised.linked:disabled, +toolbar raised.linked button:disabled, +toolbar.inline-toolbar button:disabled, +toolbar.inline-toolbar GtkToolButton > .button:disabled, +.linked .button:disabled, +.toolbar .button.raised.linked:disabled, +.toolbar .raised.linked .button:disabled, +.inline-toolbar.toolbar .button:disabled, +.inline-toolbar.toolbar GtkToolButton > .button:disabled { box-shadow: inset -1px 0 @inset_dark_color; } /* remove box shadow from last-child and only-child */ -.linked .button:insensitive:last-child, +.linked button:disabled:last-child, +.linked button:only-child, +toolbar button.raised.linked:disabled:last-child, +toolbar raised.linked button:disabled:last-child, +toolbar.inline-toolbar button:disabled:last-child, +toolbar.inline-toolbar button:only-child, +toolbar.inline-toolbar GtkToolButton:last-child > button:disabled, +toolbar.inline-toolbar GtkToolButton:only-child > button, +.linked .button:disabled:last-child, .linked .button:only-child, -.toolbar .button.raised.linked:insensitive:last-child, -.toolbar .raised.linked .button:insensitive:last-child, -.inline-toolbar.toolbar .button:insensitive:last-child, +.toolbar .button.raised.linked:disabled:last-child, +.toolbar .raised.linked .button:disabled:last-child, +.inline-toolbar.toolbar .button:disabled:last-child, .inline-toolbar.toolbar .button:only-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive, +.inline-toolbar.toolbar GtkToolButton:last-child > .button:disabled, .inline-toolbar.toolbar GtkToolButton:only-child > .button { box-shadow: none; } /* remove inset from first-child and only-child active buttons */ +.linked button:only-child:active, +toolbar button.raised.linked:only-child:active, +toolbar raised.linked button:only-child:active, +toolbar.inline-toolbar button:only-child:active, +toolbar.inline-toolbar GtkToolButton > button:only-child:active, +.linked button:first-child:active, +toolbar button.raised.linked:first-child:active, +toolbar raised.linked button:first-child:active, +toolbar.inline-toolbar button:first-child:active, +toolbar.inline-toolbar GtkToolButton > button:first-child:active, +.linked button:only-child:checked, +toolbar button.raised.linked:only-child:checked, +toolbar raised.linked button:only-child:checked, +toolbar.inline-toolbar button:only-child:checked, +toolbar.inline-toolbar GtkToolButton > button:only-child:checked, +.linked button:first-child:checked, +toolbar button.raised.linked:first-child:checked, +toolbar raised.linked button:first-child:checked, +toolbar.inline-toolbar button:first-child:checked, +toolbar.inline-toolbar GtkToolButton > button:first-child:checked, .linked .button:only-child:active, .toolbar .button.raised.linked:only-child:active, .toolbar .raised.linked .button:only-child:active, @@ -1297,10 +1482,29 @@ GtkToggleButton.button { } /* Middle button */ +.linked entry, +.linked > combobox > button:last-child, +.linked > combobox > button:focus:last-child, +.linked > combobox > button:disabled:last-child, +.linked > combobox > button:active:last-child, +.linked > combobox > button:focus:active:last-child, +.linked > combobox > button:checked:last-child, +.linked > combobox > button:focus:checked:last-child, +.linked > combobox > button:hover:last-child, +.linked > combobox > button:active:hover:last-child, +.linked > combobox > button:checked:hover:last-child, +.linked button, +.linked button:hover, /* gtk-widget-factory middle page button */ +.linked button:active, +.linked button:active:hover, +.linked button:checked, +.linked button:checked:checked, /* gtk-widget-factory middle page button */ +.linked button:checked:hover, +.linked button:disabled, .linked .entry, .linked > GtkComboBox > .button:last-child, .linked > GtkComboBox > .button:focus:last-child, -.linked > GtkComboBox > .button:insensitive:last-child, +.linked > GtkComboBox > .button:disabled:last-child, .linked > GtkComboBox > .button:active:last-child, .linked > GtkComboBox > .button:focus:active:last-child, .linked > GtkComboBox > .button:checked:last-child, @@ -1315,7 +1519,7 @@ GtkToggleButton.button { .linked .button:checked, .linked .button:checked:checked, /* gtk-widget-factory middle page button */ .linked .button:checked:hover, -.linked .button:insensitive { +.linked .button:disabled { border-right-width: 0; border-left-width: 0; border-image-width: 3px 0 4px 0; @@ -1323,10 +1527,27 @@ GtkToggleButton.button { } /* Leftmost button */ +.linked entry:first-child, +.linked > combobox:first-child > button:last-child, +.linked > combobox:first-child > button:focus:last-child, +.linked > combobox:first-child > button:disabled:last-child, +.linked > combobox:first-child > button:active:last-child, +.linked > combobox:first-child > button:focus:active:last-child, +.linked > combobox:first-child > button:checked:first-child:last-child, +.linked > combobox:first-child > button:focus:checked:first-child:last-child, +.linked > combobox:first-child > button:hover:first-child:last-child, +.linked > combobox:first-child > button:active:hover:last-child, +.linked > combobox:first-child > button:checked:hover:last-child, +.linked button:first-child, +.linked button:active:first-child, +.linked button:active:hover:first-child, +.linked button:checked:first-child, +.linked button:checked:hover:first-child, +.linked button:disabled:first-child, .linked .entry:first-child, .linked > GtkComboBox:first-child > .button:last-child, .linked > GtkComboBox:first-child > .button:focus:last-child, -.linked > GtkComboBox:first-child > .button:insensitive:last-child, +.linked > GtkComboBox:first-child > .button:disabled:last-child, .linked > GtkComboBox:first-child > .button:active:last-child, .linked > GtkComboBox:first-child > .button:focus:active:last-child, .linked > GtkComboBox:first-child > .button:checked:first-child:last-child, @@ -1339,7 +1560,7 @@ GtkToggleButton.button { .linked .button:active:hover:first-child, .linked .button:checked:first-child, .linked .button:checked:hover:first-child, -.linked .button:insensitive:first-child { +.linked .button:disabled:first-child { border-right-width: 0; border-left-width: 2px; border-image-width: 3px 0 4px 4px; @@ -1348,10 +1569,27 @@ GtkToggleButton.button { } /* Rightmost button */ +.linked entry:last-child, +.linked > combobox:last-child > button, +.linked > combobox:last-child > button:last-child, +.linked > combobox:last-child > button:disabled:last-child, +.linked > combobox:last-child > button:active:last-child, +.linked > combobox:last-child > button:focus:active:last-child, +.linked > combobox:last-child > button:checked:last-child, +.linked > combobox:last-child > button:focus:checked:last-child, +.linked > combobox:last-child > button:hover:last-child, +.linked > combobox:last-child > button:active:hover:last-child, +.linked > combobox:last-child > button:checked:hover:last-child, +.linked button:last-child, +.linked button:active:last-child, +.linked button:active:hover:last-child, +.linked button:checked:last-child, +.linked button:checked:hover:last-child, +.linked button:disabled:last-child, .linked .entry:last-child, .linked > GtkComboBox:last-child > .button, .linked > GtkComboBox:last-child > .button:last-child, -.linked > GtkComboBox:last-child > .button:insensitive:last-child, +.linked > GtkComboBox:last-child > .button:disabled:last-child, .linked > GtkComboBox:last-child > .button:active:last-child, .linked > GtkComboBox:last-child > .button:focus:active:last-child, .linked > GtkComboBox:last-child > .button:checked:last-child, @@ -1364,7 +1602,7 @@ GtkToggleButton.button { .linked .button:active:hover:last-child, .linked .button:checked:last-child, .linked .button:checked:hover:last-child, -.linked .button:insensitive:last-child { +.linked .button:disabled:last-child { border-right-width: 2px; border-left-width: 0; border-image-width: 3px 4px 4px 0; @@ -1373,10 +1611,27 @@ GtkToggleButton.button { } /* Linked single button */ +.linked entry:only-child, +.linked > combobox:only-child > button, +.linked > combobox:only-child > button:only-child, +.linked > combobox:only-child > button:disabled:only-child, +.linked > combobox:only-child > button:hover:only-child, +.linked > combobox:only-child > button:active:only-child, +.linked > combobox:only-child > button:active:hover:only-child, +.linked > combobox:only-child > button:focus:active:only-child, +.linked > combobox:only-child > button:checked:only-child, +.linked > combobox:only-child > button:checked:hover:only-child, +.linked > combobox:only-child > button:focus:checked:only-child, +.linked button:only-child, +.linked button:active:only-child, +.linked button:active:hover:only-child, +.linked button:checked:only-child, +.linked button:checked:hover:only-child, +.linked button:disabled:only-child, .linked .entry:only-child, .linked > GtkComboBox:only-child > .button, .linked > GtkComboBox:only-child > .button:only-child, -.linked > GtkComboBox:only-child > .button:insensitive:only-child, +.linked > GtkComboBox:only-child > .button:disabled:only-child, .linked > GtkComboBox:only-child > .button:hover:only-child, .linked > GtkComboBox:only-child > .button:active:only-child, .linked > GtkComboBox:only-child > .button:active:hover:only-child, @@ -1389,7 +1644,7 @@ GtkToggleButton.button { .linked .button:active:hover:only-child, .linked .button:checked:only-child, .linked .button:checked:hover:only-child, -.linked .button:insensitive:only-child { +.linked .button:disabled:only-child { border-right-width: 1px; border-left-width: 1px; border-image-width: 3px 4px 4px 4px; @@ -1397,9 +1652,26 @@ GtkToggleButton.button { } /* Middle button (vertical) */ +.linked.vertical > combobox > button:last-child, +.linked.vertical > combobox > button:focus:last-child, +.linked.vertical > combobox > button:disabled:last-child, +.linked.vertical > combobox > button:active:last-child, +.linked.vertical > combobox > button:focus:active:last-child, +.linked.vertical > combobox > button:checked:last-child, +.linked.vertical > combobox > button:focus:checked:last-child, +.linked.vertical > combobox > button:hover:last-child, +.linked.vertical > combobox > button:active:hover:last-child, +.linked.vertical > combobox > button:checked:hover:last-child, +.linked.vertical entry, +.linked.vertical button, +.linked.vertical button:active, +.linked.vertical button:active:hover, +.linked.vertical button:checked, +.linked.vertical button:checked:hover, +.linked.vertical button:disabled, .linked.vertical > GtkComboBox > .button:last-child, .linked.vertical > GtkComboBox > .button:focus:last-child, -.linked.vertical > GtkComboBox > .button:insensitive:last-child, +.linked.vertical > GtkComboBox > .button:disabled:last-child, .linked.vertical > GtkComboBox > .button:active:last-child, .linked.vertical > GtkComboBox > .button:focus:active:last-child, .linked.vertical > GtkComboBox > .button:checked:last-child, @@ -1413,7 +1685,7 @@ GtkToggleButton.button { .linked.vertical .button:active:hover, .linked.vertical .button:checked, .linked.vertical .button:checked:hover, -.linked.vertical .button:insensitive { +.linked.vertical .button:disabled { border-top-width: 0px; border-bottom-width: 0px; border-right-width: 1px; @@ -1423,9 +1695,26 @@ GtkToggleButton.button { } /* Top button (vertical) */ +.linked.vertical > combobox:first-child > button:last-child, +.linked.vertical > combobox:first-child > button:focus:last-child, +.linked.vertical > combobox:first-child > button:disabled:last-child, +.linked.vertical > combobox:first-child > button:active:last-child, +.linked.vertical > combobox:first-child > button:focus:active:last-child, +.linked.vertical > combobox:first-child > button:checked:first-child:last-child, +.linked.vertical > combobox:first-child > button:focus:checked:first-child:last-child, +.linked.vertical > combobox:first-child > button:hover:first-child:last-child, +.linked.vertical > combobox:first-child > button:active:hover:last-child, +.linked.vertical > combobox:first-child > button:checked:hover:last-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:checked:first-child, +.linked.vertical button:checked:hover:first-child, +.linked.vertical button:disabled:first-child, .linked.vertical > GtkComboBox:first-child > .button:last-child, .linked.vertical > GtkComboBox:first-child > .button:focus:last-child, -.linked.vertical > GtkComboBox:first-child > .button:insensitive:last-child, +.linked.vertical > GtkComboBox:first-child > .button:disabled:last-child, .linked.vertical > GtkComboBox:first-child > .button:active:last-child, .linked.vertical > GtkComboBox:first-child > .button:focus:active:last-child, .linked.vertical > GtkComboBox:first-child > .button:checked:first-child:last-child, @@ -1439,7 +1728,7 @@ GtkToggleButton.button { .linked.vertical .button:active:hover:first-child, .linked.vertical .button:checked:first-child, .linked.vertical .button:checked:hover:first-child, -.linked.vertical .button:insensitive:first-child { +.linked.vertical .button:disabled:first-child { border-bottom-width: 0px; border-top-width: 1px; border-right-width: 1px; @@ -1449,9 +1738,26 @@ GtkToggleButton.button { } /* Bottom button (vertical) */ +.linked.vertical > combobox:last-child > button, +.linked.vertical > combobox:last-child > button:last-child, +.linked.vertical > combobox:last-child > button:disabled:last-child, +.linked.vertical > combobox:last-child > button:active:last-child, +.linked.vertical > combobox:last-child > button:focus:active:last-child, +.linked.vertical > combobox:last-child > button:checked:last-child, +.linked.vertical > combobox:last-child > button:focus:checked:last-child, +.linked.vertical > combobox:last-child > button:hover:last-child, +.linked.vertical > combobox:last-child > button:active:hover:last-child, +.linked.vertical > combobox:last-child > button:checked:hover: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:checked:last-child, +.linked.vertical button:checked:hover:last-child, +.linked.vertical button:disabled:last-child, .linked.vertical > GtkComboBox:last-child > .button, .linked.vertical > GtkComboBox:last-child > .button:last-child, -.linked.vertical > GtkComboBox:last-child > .button:insensitive:last-child, +.linked.vertical > GtkComboBox:last-child > .button:disabled:last-child, .linked.vertical > GtkComboBox:last-child > .button:active:last-child, .linked.vertical > GtkComboBox:last-child > .button:focus:active:last-child, .linked.vertical > GtkComboBox:last-child > .button:checked:last-child, @@ -1465,7 +1771,7 @@ GtkToggleButton.button { .linked.vertical .button:active:hover:last-child, .linked.vertical .button:checked:last-child, .linked.vertical .button:checked:hover:last-child, -.linked.vertical .button:insensitive:last-child { +.linked.vertical .button:disabled:last-child { border-top-width: 0px; border-bottom-width: 1px; border-right-width: 1px; @@ -1475,9 +1781,26 @@ GtkToggleButton.button { } /* Linked single button (vertical) */ +.linked.vertical > combobox:only-child > button, +.linked.vertical > combobox:only-child > button:only-child, +.linked.vertical > combobox:only-child > button:disabled:only-child, +.linked.vertical > combobox:only-child > button:hover:only-child, +.linked.vertical > combobox:only-child > button:active:only-child, +.linked.vertical > combobox:only-child > button:active:hover:only-child, +.linked.vertical > combobox:only-child > button:focus:active:only-child, +.linked.vertical > combobox:only-child > button:checked:only-child, +.linked.vertical > combobox:only-child > button:checked:hover:only-child, +.linked.vertical > combobox:only-child > button:focus:checked: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:checked:only-child, +.linked.vertical button:checked:hover:only-child, +.linked.vertical button:disabled:only-child, .linked.vertical > GtkComboBox:only-child > .button, .linked.vertical > GtkComboBox:only-child > .button:only-child, -.linked.vertical > GtkComboBox:only-child > .button:insensitive:only-child, +.linked.vertical > GtkComboBox:only-child > .button:disabled:only-child, .linked.vertical > GtkComboBox:only-child > .button:hover:only-child, .linked.vertical > GtkComboBox:only-child > .button:active:only-child, .linked.vertical > GtkComboBox:only-child > .button:active:hover:only-child, @@ -1491,31 +1814,46 @@ GtkToggleButton.button { .linked.vertical .button:active:hover:only-child, .linked.vertical .button:checked:only-child, .linked.vertical .button:checked:hover:only-child, -.linked.vertical .button:insensitive:only-child { +.linked.vertical .button:disabled:only-child { border-width: 1px; border-image-width: 3px 4px 4px 4px; border-radius: 4px; } /* Linked button shadows (vertical) */ +.linked.vertical button, +toolbar.inline-toolbar.vertical button, +toolbar.inline-toolbar.vertical GtkToolButton > button, .linked.vertical .button, .inline-toolbar.toolbar.vertical .button, .inline-toolbar.toolbar.vertical GtkToolButton > .button { box-shadow: inset 0 1px @inset_light_color, inset 0 -1px @inset_dark_color; } +.linked.vertical button:first-child, +toolbar.inline-toolbar.vertical button:first-child, +toolbar.inline-toolbar.vertical GtkToolButton:first-child > button, .linked.vertical .button:first-child, .inline-toolbar.toolbar.vertical .button:first-child, .inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button { box-shadow: inset 0 -1px @inset_dark_color; } +.linked.vertical button:last-child, +toolbar.inline-toolbar.vertical button:last-child, +toolbar.inline-toolbar.vertical GtkToolButton:last-child > button, .linked.vertical .button:last-child, .inline-toolbar.toolbar.vertical .button:last-child, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button { box-shadow: inset 0 -1px @inset_light_color; } +.linked.vertical button:active, +.linked.vertical button:checked, +toolbar.inline-toolbar.vertical button:active, +toolbar.inline-toolbar.vertical button:checked, +toolbar.inline-toolbar.vertical GtkToolButton > button:active, +toolbar.inline-toolbar.vertical GtkToolButton > button:checked, .linked.vertical .button:active, .linked.vertical .button:checked, .inline-toolbar.toolbar.vertical .button:active, @@ -1525,23 +1863,37 @@ GtkToggleButton.button { box-shadow: inset 0 1px @inset_dark_color, inset 0 -1px @inset_dark_color; } -.linked.vertical .button:insensitive, -.inline-toolbar.toolbar.vertical .button:insensitive, -.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive { +.linked.vertical button:disabled, +toolbar.inline-toolbar.vertical button:disabled, +toolbar.inline-toolbar.vertical GtkToolButton > button:disabled, +.linked.vertical .button:disabled, +.inline-toolbar.toolbar.vertical .button:disabled, +.inline-toolbar.toolbar.vertical GtkToolButton > .button:disabled { box-shadow: inset 0 -1px @inset_dark_color; } +.linked.vertical button:only-child, +.linked.vertical button:disabled:last-child, +toolbar.inline-toolbar.vertical button:disabled:last-child, +toolbar.inline-toolbar.vertical button:only-child, +toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:disabled, +toolbar.inline-toolbar.vertical GtkToolButton:only-child > button, .linked.vertical .button:only-child, -.linked.vertical .button:insensitive:last-child, -.inline-toolbar.toolbar.vertical .button:insensitive:last-child, +.linked.vertical .button:disabled:last-child, +.inline-toolbar.toolbar.vertical .button:disabled:last-child, .inline-toolbar.toolbar.vertical .button:only-child, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive, +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:disabled, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button { box-shadow: none; } /* remove shadows from linked menu buttons */ .linked GtkMenuButton.menu-button:active, +toolbar GtkMenuButton.menu-button.raised.linked:active, +toolbar .raised.linked GtkMenuButton.menu-button:active, +toolbar.inline-toolbar GtkMenuButton.menu-button:active, +toolbar.inline-toolbar GtkToolButton > GtkMenuButton.menu-button:active, +.linked GtkMenuButton.menu-button:active, .toolbar GtkMenuButton.menu-button.raised.linked:active, .toolbar .raised.linked GtkMenuButton.menu-button:active, .inline-toolbar.toolbar GtkMenuButton.menu-button:active, @@ -1552,23 +1904,40 @@ GtkToggleButton.button { /* Linked buttons on primary toolbars */ /* Middle button */ +toolbar.primary-toolbar button.raised.linked, +toolbar.primary-toolbar button.raised.linked:active, +toolbar.primary-toolbar button.raised.linked:checked, +toolbar.primary-toolbar button.raised.linked:disabled, +toolbar.primary-toolbar .linked entry, +toolbar.primary-toolbar .linked button, +toolbar.primary-toolbar .linked button:active, +toolbar.primary-toolbar .linked button:checked, +toolbar.primary-toolbar .linked button:disabled, +toolbar.inline-toolbar button, +toolbar.inline-toolbar button:active, +toolbar.inline-toolbar button:checked, +toolbar.inline-toolbar button:disabled, +toolbar.inline-toolbar GtkToolButton > button, +toolbar.inline-toolbar GtkToolButton > button:active, +toolbar.inline-toolbar GtkToolButton > button:checked, +toolbar.inline-toolbar GtkToolButton > button:disabled, .primary-toolbar .button.raised.linked, .primary-toolbar .button.raised.linked:active, .primary-toolbar .button.raised.linked:checked, -.primary-toolbar .button.raised.linked:insensitive, +.primary-toolbar .button.raised.linked:disabled, .primary-toolbar .linked .entry, .primary-toolbar .linked .button, .primary-toolbar .linked .button:active, .primary-toolbar .linked .button:checked, -.primary-toolbar .linked .button:insensitive, +.primary-toolbar .linked .button:disabled, .inline-toolbar.toolbar .button, .inline-toolbar.toolbar .button:active, .inline-toolbar.toolbar .button:checked, -.inline-toolbar.toolbar .button:insensitive, +.inline-toolbar.toolbar .button:disabled, .inline-toolbar.toolbar GtkToolButton > .button, .inline-toolbar.toolbar GtkToolButton > .button:active, .inline-toolbar.toolbar GtkToolButton > .button:checked, -.inline-toolbar.toolbar GtkToolButton > .button:insensitive { +.inline-toolbar.toolbar GtkToolButton > .button:disabled { border-right-width: 0; border-left-width: 0; border-image-width: 3px 0 4px 0; @@ -1576,23 +1945,40 @@ GtkToggleButton.button { } /* Leftmost button */ +toolbar.primary-toolbar button.raised.linked:first-child, +toolbar.primary-toolbar button.raised.linked:active:first-child, +toolbar.primary-toolbar button.raised.linked:checked:first-child, +toolbar.primary-toolbar button.raised.linked:disabled:first-child, +toolbar.primary-toolbar .linked entry:first-child, +toolbar.primary-toolbar .linked button:first-child, +toolbar.primary-toolbar .linked button:active:first-child, +toolbar.primary-toolbar .linked button:checked:first-child, +toolbar.primary-toolbar .linked button:disabled:first-child, +toolbar.inline-toolbar button:first-child, +toolbar.inline-toolbar button:active:first-child, +toolbar.inline-toolbar button:checked:first-child, +toolbar.inline-toolbar button:disabled:first-child, +toolbar.inline-toolbar GtkToolButton:first-child > button, +toolbar.inline-toolbar GtkToolButton:first-child > button:active, +toolbar.inline-toolbar GtkToolButton:first-child > button:checked, +toolbar.inline-toolbar GtkToolButton:first-child > button:disabled, .primary-toolbar .button.raised.linked:first-child, .primary-toolbar .button.raised.linked:active:first-child, .primary-toolbar .button.raised.linked:checked:first-child, -.primary-toolbar .button.raised.linked:insensitive:first-child, +.primary-toolbar .button.raised.linked:disabled:first-child, .primary-toolbar .linked .entry:first-child, .primary-toolbar .linked .button:first-child, .primary-toolbar .linked .button:active:first-child, .primary-toolbar .linked .button:checked:first-child, -.primary-toolbar .linked .button:insensitive:first-child, +.primary-toolbar .linked .button:disabled:first-child, .inline-toolbar.toolbar .button:first-child, .inline-toolbar.toolbar .button:active:first-child, .inline-toolbar.toolbar .button:checked:first-child, -.inline-toolbar.toolbar .button:insensitive:first-child, +.inline-toolbar.toolbar .button:disabled:first-child, .inline-toolbar.toolbar GtkToolButton:first-child > .button, .inline-toolbar.toolbar GtkToolButton:first-child > .button:active, .inline-toolbar.toolbar GtkToolButton:first-child > .button:checked, -.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive { +.inline-toolbar.toolbar GtkToolButton:first-child > .button:disabled { border-left-width: 2px; border-right-width: 0; border-image-width: 3px 0 4px 3px; @@ -1601,23 +1987,40 @@ GtkToggleButton.button { } /* Rightmost button */ +toolbar.primary-toolbar button.raised.linked:last-child, +toolbar.primary-toolbar button.raised.linked:active:last-child, +toolbar.primary-toolbar button.raised.linked:checked:last-child, +toolbar.primary-toolbar button.raised.linked:disabled:last-child, +toolbar.primary-toolbar .linked entry:last-child, +toolbar.primary-toolbar .linked button:last-child, +toolbar.primary-toolbar .linked button:active:last-child, +toolbar.primary-toolbar .linked button:checked:last-child, +toolbar.primary-toolbar .linked button:disabled:last-child, +toolbar.inline-toolbar button:last-child, +toolbar.inline-toolbar button:active:last-child, +toolbar.inline-toolbar button:checked:last-child, +toolbar.inline-toolbar button:disabled:last-child, +toolbar.inline-toolbar GtkToolButton:last-child > button, +toolbar.inline-toolbar GtkToolButton:last-child > button:active, +toolbar.inline-toolbar GtkToolButton:last-child > button:checked, +toolbar.inline-toolbar GtkToolButton:last-child > button:disabled, .primary-toolbar .button.raised.linked:last-child, .primary-toolbar .button.raised.linked:active:last-child, .primary-toolbar .button.raised.linked:checked:last-child, -.primary-toolbar .button.raised.linked:insensitive:last-child, +.primary-toolbar .button.raised.linked:disabled:last-child, .primary-toolbar .linked .entry:last-child, .primary-toolbar .linked .button:last-child, .primary-toolbar .linked .button:active:last-child, .primary-toolbar .linked .button:checked:last-child, -.primary-toolbar .linked .button:insensitive:last-child, +.primary-toolbar .linked .button:disabled:last-child, .inline-toolbar.toolbar .button:last-child, .inline-toolbar.toolbar .button:active:last-child, .inline-toolbar.toolbar .button:checked:last-child, -.inline-toolbar.toolbar .button:insensitive:last-child, +.inline-toolbar.toolbar .button:disabled:last-child, .inline-toolbar.toolbar GtkToolButton:last-child > .button, .inline-toolbar.toolbar GtkToolButton:last-child > .button:active, .inline-toolbar.toolbar GtkToolButton:last-child > .button:checked, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive { +.inline-toolbar.toolbar GtkToolButton:last-child > .button:disabled { border-left-width: 0; border-right-width: 2px; border-image-width: 3px 3px 4px 0; @@ -1627,14 +2030,22 @@ GtkToggleButton.button { } /* Single button */ +toolbar.inline-toolbar button:only-child, +toolbar.inline-toolbar button:active:only-child, +toolbar.inline-toolbar button:checked:only-child, +toolbar.inline-toolbar button:disabled:only-child, +toolbar.inline-toolbar GtkToolButton:only-child > button, +toolbar.inline-toolbar GtkToolButton:only-child > button:active, +toolbar.inline-toolbar GtkToolButton:only-child > button:checked, +toolbar.inline-toolbar GtkToolButton:only-child > button:disabled, .inline-toolbar.toolbar .button:only-child, .inline-toolbar.toolbar .button:active:only-child, .inline-toolbar.toolbar .button:checked:only-child, -.inline-toolbar.toolbar .button:insensitive:only-child, +.inline-toolbar.toolbar .button:disabled:only-child, .inline-toolbar.toolbar GtkToolButton:only-child > .button, .inline-toolbar.toolbar GtkToolButton:only-child > .button:active, .inline-toolbar.toolbar GtkToolButton:only-child > .button:checked, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive { +.inline-toolbar.toolbar GtkToolButton:only-child > .button:disabled { border-right-width: 2px; border-left-width: 2px; border-image-width: 3px 3px 4px 3px; @@ -1643,24 +2054,36 @@ GtkToggleButton.button { /* Special-case GtkMenuToolButton, since it's a GtkToolButton, but it * has a box inside to pack the button and the actual menu */ +toolbar.inline-toolbar GtkMenuToolButton button:first-child, +toolbar.inline-toolbar GtkMenuToolButton button:active:first-child, +toolbar.inline-toolbar GtkMenuToolButton button:checked:first-child, +toolbar.inline-toolbar GtkMenuToolButton button:disabled:first-child, +toolbar.inline-toolbar GtkMenuToolButton button:last-child, +toolbar.inline-toolbar GtkMenuToolButton button:active:last-child, +toolbar.inline-toolbar GtkMenuToolButton button:checked:last-child, +toolbar.inline-toolbar.toolbar GtkMenuToolButton button:disabled:last-child, .inline-toolbar.toolbar GtkMenuToolButton .button:first-child, .inline-toolbar.toolbar GtkMenuToolButton .button:active:first-child, .inline-toolbar.toolbar GtkMenuToolButton .button:checked:first-child, -.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:first-child, +.inline-toolbar.toolbar GtkMenuToolButton .button:disabled:first-child, .inline-toolbar.toolbar GtkMenuToolButton .button:last-child, .inline-toolbar.toolbar GtkMenuToolButton .button:active:last-child, .inline-toolbar.toolbar GtkMenuToolButton .button:checked:last-child, -.inline-toolbar.toolbar GtkMenuToolButton .button:insensitive:last-child { +.inline-toolbar.toolbar GtkMenuToolButton .button:disabled:last-child { border-right-width: 0; border-left-width: 0; border-image-width: 3px 0 4px 0; border-radius: 0; } +toolbar.inline-toolbar GtkMenuToolButton:first-child button:first-child, +toolbar.inline-toolbar GtkMenuToolButton:first-child button:active:first-child, +toolbar.inline-toolbar GtkMenuToolButton:first-child button:checked:first-child, +toolbar.inline-toolbar GtkMenuToolButton:first-child button:disabled:first-child, .inline-toolbar.toolbar GtkMenuToolButton:first-child .button:first-child, .inline-toolbar.toolbar GtkMenuToolButton:first-child .button:active:first-child, .inline-toolbar.toolbar GtkMenuToolButton:first-child .button:checked:first-child, -.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:insensitive:first-child { +.inline-toolbar.toolbar GtkMenuToolButton:first-child .button:disabled:first-child { border-left-width: 2px; border-right-width: 0; border-image-width: 3px 0 3px 3px; @@ -1668,10 +2091,14 @@ GtkToggleButton.button { border-top-right-radius: 0; } +toolbar.inline-toolbar GtkMenuToolButton:last-child button:last-child, +toolbar.inline-toolbar GtkMenuToolButton:last-child button:active:last-child, +toolbar.inline-toolbar GtkMenuToolButton:last-child button:checked:last-child, +toolbar.inline-toolbar GtkMenuToolButton:last-child button:disabled:last-child, .inline-toolbar.toolbar GtkMenuToolButton:last-child .button:last-child, .inline-toolbar.toolbar GtkMenuToolButton:last-child .button:active:last-child, .inline-toolbar.toolbar GtkMenuToolButton:last-child .button:checked:last-child, -.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:insensitive:last-child { +.inline-toolbar.toolbar GtkMenuToolButton:last-child .button:disabled:last-child { border-left-width: 0; border-right-width: 2px; border-image-width: 3px 3px 4px 0; @@ -1682,14 +2109,22 @@ GtkToggleButton.button { /* Vertical inline toolbars */ /* Middle button */ +toolbar.inline-toolbar.vertical button, +toolbar.inline-toolbar.vertical button:active, +toolbar.inline-toolbar.vertical button:checked, +toolbar.inline-toolbar.vertical button:disabled, +toolbar.inline-toolbar.vertical GtkToolButton > button, +toolbar.inline-toolbar.vertical GtkToolButton > button:active, +toolbar.inline-toolbar.vertical GtkToolButton > button:checked, +toolbar.inline-toolbar.toolbar.vertical GtkToolButton > button:disabled, .inline-toolbar.toolbar.vertical .button, .inline-toolbar.toolbar.vertical .button:active, .inline-toolbar.toolbar.vertical .button:checked, -.inline-toolbar.toolbar.vertical .button:insensitive, +.inline-toolbar.toolbar.vertical .button:disabled, .inline-toolbar.toolbar.vertical GtkToolButton > .button, .inline-toolbar.toolbar.vertical GtkToolButton > .button:active, .inline-toolbar.toolbar.vertical GtkToolButton > .button:checked, -.inline-toolbar.toolbar.vertical GtkToolButton > .button:insensitive { +.inline-toolbar.toolbar.vertical GtkToolButton > .button:disabled { border-bottom-width: 0; border-top-width: 0; border-image-width: 0 3px 0 3px; @@ -1697,14 +2132,22 @@ GtkToggleButton.button { } /* Topmost button */ +toolbar.inline-toolbar.vertical button:first-child, +toolbar.inline-toolbar.vertical button:active:first-child, +toolbar.inline-toolbar.vertical button:checked:first-child, +toolbar.inline-toolbar.vertical button:disabled:first-child, +toolbar.inline-toolbar.vertical GtkToolButton:first-child > button, +toolbar.inline-toolbar.vertical GtkToolButton:first-child > button:active, +toolbar.inline-toolbar.vertical GtkToolButton:first-child > button:checked, +toolbar.inline-toolbar.vertical GtkToolButton:first-child > button:disabled, .inline-toolbar.toolbar.vertical .button:first-child, .inline-toolbar.toolbar.vertical .button:active:first-child, .inline-toolbar.toolbar.vertical .button:checked:first-child, -.inline-toolbar.toolbar.vertical .button:insensitive:first-child, +.inline-toolbar.toolbar.vertical .button:disabled:first-child, .inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button, .inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:active, .inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:checked, -.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:insensitive { +.inline-toolbar.toolbar.vertical GtkToolButton:first-child > .button:disabled { border-width: 1px 1px 0 1px; border-image-width: 3px 3px 0 3px; border-bottom-left-radius: 0; @@ -1712,14 +2155,22 @@ GtkToggleButton.button { } /* Bottommost button */ +toolbar.inline-toolbar.vertical button:last-child, +toolbar.inline-toolbar.vertical button:active:last-child, +toolbar.inline-toolbar.vertical button:checked:last-child, +toolbar.inline-toolbar.vertical button:disabled:last-child, +toolbar.inline-toolbar.vertical GtkToolButton:last-child > button, +toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:active, +toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:checked, +toolbar.inline-toolbar.vertical GtkToolButton:last-child > button:disabled, .inline-toolbar.toolbar.vertical .button:last-child, .inline-toolbar.toolbar.vertical .button:active:last-child, .inline-toolbar.toolbar.vertical .button:checked:last-child, -.inline-toolbar.toolbar.vertical .button:insensitive:last-child, +.inline-toolbar.toolbar.vertical .button:disabled:last-child, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:active, .inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:checked, -.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:insensitive { +.inline-toolbar.toolbar.vertical GtkToolButton:last-child > .button:disabled { border-width: 0 1px 2px 1px; border-image-width: 0 3px 4px 3px; border-top-left-radius: 0; @@ -1727,14 +2178,22 @@ GtkToggleButton.button { } /* Single button */ +toolbar.inline-toolbar.vertical button:only-child, +toolbar.inline-toolbar.vertical button:active:only-child, +toolbar.inline-toolbar.vertical button:checked:only-child, +toolbar.inline-toolbar.vertical button:disabled:only-child, +toolbar.inline-toolbar.vertical GtkToolButton:only-child > button, +toolbar.inline-toolbar.vertical GtkToolButton:only-child > button:active, +toolbar.inline-toolbar.vertical GtkToolButton:only-child > button:checked, +toolbar.inline-toolbar.vertical GtkToolButton:only-child > button:disabled, .inline-toolbar.toolbar.vertical .button:only-child, .inline-toolbar.toolbar.vertical .button:active:only-child, .inline-toolbar.toolbar.vertical .button:checked:only-child, -.inline-toolbar.toolbar.vertical .button:insensitive:only-child, +.inline-toolbar.toolbar.vertical .button:disabled:only-child, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:active, .inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:checked, -.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:insensitive { +.inline-toolbar.toolbar.vertical GtkToolButton:only-child > .button:disabled { border-top-width: 1px; border-bottom-width: 2px; border-image-width: 3px 3px 3px 4px; @@ -1746,6 +2205,7 @@ GtkToggleButton.button { color: @link_color; } +button.flat.link.text-button, GtkLinkButton.button, GtkLinkButton.button:hover, GtkLinkButton.button:active, @@ -1754,18 +2214,30 @@ GtkLinkButton.button:active:hover { text-shadow: none; } +button separator, .button .separator { color: shade(@internal_element_color, 1.30); } /* Stack switcher */ -.stack-switcher > .button > GtkLabel, .header-bar .stack-switcher > .button.titlebutton > GtkLabel, +stackswitcher > button > label, +headerbar stackswitcher > button.titlebutton > label, +headerbar.titlebar stackswitcher > button.titlebutton > label, +calendar.header stackswitcher > button.titlebutton > label, +.stack-switcher > .button > GtkLabel, +.header-bar .stack-switcher > .button.titlebutton > GtkLabel, .titlebar .stack-switcher > .button.titlebutton > GtkLabel, GtkCalendar.header .stack-switcher > .button.titlebutton > GtkLabel { padding-left: 6px; padding-right: 6px; } -.stack-switcher > .button > GtkImage, .header-bar .stack-switcher > .button.titlebutton > GtkImage, + +stackswitcher > button > image, +headerbar stackswitcher > button.titlebutton > image, +headerbar.titlebar stackswitcher > button.titlebutton > image, +calendar.header stackswitcher > button.titlebutton > image, +.stack-switcher > .button > GtkImage, +.header-bar .stack-switcher > .button.titlebutton > GtkImage, .titlebar .stack-switcher > .button.titlebutton > GtkImage, GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage { padding-left: 6px; @@ -1773,36 +2245,105 @@ GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage { padding-top: 3px; padding-bottom: 3px; } + +stackswitcher > button.text-button, .stack-switcher > .button.text-button { - padding: 5px 10px 6px; + padding: 5px 10px 6px; } -.stack-switcher > .button.image-button, .header-bar .stack-switcher > .titlebutton.button, + +stackswitcher > button.image-button, +headerbar stackswitcher > button.titlebutton, +headerbar.titlebar stackswitcher > button.titlebutton, +calendar.header stackswitcher > button.titlebutton, +.stack-switcher > .button.image-button, +.header-bar .stack-switcher > .titlebutton.button, .titlebar .stack-switcher > .titlebutton.button, GtkCalendar.header .stack-switcher > .titlebutton.button { padding: 5px 2px; } -.stack-switcher > .button.needs-attention > GtkLabel, .stack-switcher > .button.needs-attention > GtkImage { + +stackswitcher > button.needs-attention > label, +stackswitcher > button.needs-attention > image, +.stack-switcher > .button.needs-attention > GtkLabel, +.stack-switcher > .button.needs-attention > GtkImage { animation: needs_attention 150ms ease-in; background-color: @theme_bg_color; /* FIXME: ? */ background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 4px; } -.stack-switcher > .button.needs-attention > GtkLabel:backdrop, .stack-switcher > .button.needs-attention > GtkImage:backdrop { + +stackswitcher > button.needs-attention > label:backdrop, +stackswitcher > button.needs-attention > image:backdrop, +.stack-switcher > .button.needs-attention > GtkLabel:backdrop, +.stack-switcher > .button.needs-attention > GtkImage:backdrop { background-size: 6px 6px, 0 0; } -.stack-switcher > .button.needs-attention > GtkLabel:dir(rtl), .stack-switcher > .button.needs-attention > GtkImage:dir(rtl) { + +stackswitcher > button.needs-attention > label:dir(rtl), +stackswitcher > button.needs-attention > image:dir(rtl), +.stack-switcher > .button.needs-attention > GtkLabel:dir(rtl), +.stack-switcher > .button.needs-attention > GtkImage:dir(rtl) { background-position: left 3px, left 4px; } -.stack-switcher > .button.needs-attention:active > GtkLabel, .stack-switcher > .button.needs-attention:active > GtkImage, .stack-switcher > .button.needs-attention:checked > GtkLabel, .stack-switcher > .button.needs-attention:checked > GtkImage { + +stackswitcher > button.needs-attention:active > label, +stackswitcher > button.needs-attention:active > image, +stackswitcher > button.needs-attention:checked > label, +stackswitcher > button.needs-attention:checked > image, +.stack-switcher > .button.needs-attention:active > GtkLabel, +.stack-switcher > .button.needs-attention:active > GtkImage, +.stack-switcher > .button.needs-attention:checked > GtkLabel, +.stack-switcher > .button.needs-attention:checked > GtkImage { animation: none; background-image: none; } +stackswitcher > button:dir(ltr).text-button.radio, +stackswitcher > button:dir(ltr).text-button.radio:hover, +stackswitcher > button:dir(ltr).text-button.radio:hover:active, +stackswitcher > button:dir(ltr).text-button.radio:active, +stackswitcher > button:dir(ltr).text-button.radio:checked, +stackswitcher > button:dir(ltr).text-button.radio:checked:hover, +stackswitcher > button:dir(ltr).text-button.radio:checked:hover:active { + padding: 5px 10px 6px; + border-width: 1px 0px 1px 0px; + border-image-width: 3px 0px 4px 0; + border-style: solid; + border-color: @borders; + border-radius: 0px; +} + +stackswitcher > button:dir(ltr).text-button.radio:first-child, +stackswitcher > button:dir(ltr).text-button.radio:hover:first-child, +stackswitcher > button:dir(ltr).text-button.radio:hover:active:first-child, +stackswitcher > button:dir(ltr).text-button.radio:active:first-child, +stackswitcher > button:dir(ltr).text-button.radio:checked:first-child, +stackswitcher > button:dir(ltr).text-button.radio:checked:hover:first-child, +stackswitcher > button:dir(ltr).text-button.radio:checked:hover:active:first-child { + border-width: 1px 0px 1px 1px; + border-image-width: 3px 0 4px 3px; + border-radius: 3px 0px 0px 3px; +} + +stackswitcher > button:dir(ltr).text-button.radio:last-child, +stackswitcher > button:dir(ltr).text-button.radio:hover:last-child, +stackswitcher > button:dir(ltr).text-button.radio:hover:active:last-child, +stackswitcher > button:dir(ltr).text-button.radio:active:last-child, +stackswitcher > button:dir(ltr).text-button.radio:checked:last-child, +stackswitcher > button:dir(ltr).text-button.radio:checked:hover:last-child, +stackswitcher > button:dir(ltr).text-button.radio:checked:hover:active:last-child { + border-width: 1px 1px 1px 0px; + border-image-width: 3px 3px 4px 0; + border-radius: 0px 3px 3px 0px; +} + /***************** * Notebooks and * * tabs * *****************/ + +notebook, .notebook { padding: 0; background-clip: border-box; @@ -1810,69 +2351,81 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { border-color: @borders; border-width: 0px; background-color: shade (@theme_bg_color, 1.1); - -GtkNotebook-initial-gap: 0; - -GtkNotebook-arrow-spacing: 5; - -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: 0; - -GtkNotebook-has-tab-gap: false; - -GtkWidget-focus-padding: 0; - -GtkWidget-focus-line-width: 0; } +notebook :hover, .notebook :hover { - -gtk-image-effect: highlight; + -gtk-icon-effect: highlight; /* deprecated, but ignored */ color: @theme_fg_color; } +frame notebook header.top, .notebook.frame.top { border-width: 0px 1px 1px 1px; } +frame notebook header.bottom, .notebook.frame.bottom { border-width: 1px 1px 0px 1px; } +.frame notebook header.left, .notebook.frame.left { border-width: 1px 1px 1px 0px; } +.frame notebook header.right, .notebook.frame.right { border-width: 1px 0px 1px 1px; } +notebook header, .notebook.header { background-image: linear-gradient(to bottom, shade(@theme_bg_color, 0.96), shade(@theme_bg_color, 1.0)); border-width: 0px; - box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0); } +notebook header.top, .notebook.header.top { border-width: 1px; - border-radius: 4px 4px 0px 0px; + border-radius: 0px; + box-shadow: inset 0px 1px 0 0 alpha(@borders, 0.4), + inset 0px -1px 0 0 alpha(@borders, 0.4); } +notebook header.bottom, .notebook.header.bottom { border-width: 1px; - border-radius: 0px 0px 4px 4px; + border-radius: 0px; + box-shadow: inset 0px 1px 0 0 alpha(@borders, 0.4), + inset 0px -1px 0 0 alpha(@borders, 0.4); } +notebook header.left, .notebook.header.left { border-width: 1px; - border-radius: 4px 0px 0px 4px; + border-radius: 0px; + box-shadow: inset 1px 0px alpha(@borders, 0.4), + inset -1px 0px alpha(@borders, 0.4); } +notebook header.right, .notebook.header.right { border-width: 1px; - border-radius: 0px 4px 4px 0px; + border-radius: 0px; + box-shadow: inset 1px 0px alpha(@borders, 0.4), + inset -1px 0px alpha(@borders, 0.4); } +notebook viewport, .notebook GtkViewport { background-color: @theme_base_color; border-width: 0px; } +notebook header tab, .notebook tab { border-color: transparent; border-width: 0px; @@ -1880,46 +2433,62 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { background-color: transparent; } +notebook header tab label, .notebook tab GtkLabel { color: mix (@theme_fg_color, @theme_bg_color, 0.40); font-weight: normal; } +notebook header .prelight-page, +notebook header .prelight-page label, .notebook .prelight-page, .notebook .prelight-page GtkLabel { color: mix (@theme_fg_color, @theme_bg_color, 0.15); } +notebook header .active-page, +notebook header tab .active-page label, .notebook .active-page, .notebook tab .active-page GtkLabel { color: @theme_fg_color; } +/* tabs in caja and pluma */ +notebook header tab { + padding: 4px; + border-style: solid; + border-width: 0px 1px 0px 1px; + border-color: transparent; +} + /* horizontal tabs */ +notebook.frame header.top tab, +notebook.frame header.bottom tab, .notebook tab.top, -/* wtf, why this doesn't work? */ .notebook tab.bottom { padding: 6px 21px 4px; + border-style: solid; + border-width: 0px 1px 0px 1px; + border-color: transparent; } -/* workaround for wtf */ -.notebook tab.bottom:active { - padding: 3px 21px 7px 21px; -} +notebook header.top tab:active, +notebook header.top tab:active:hover, .notebook tab.top:active, .notebook tab.top:active:hover { background-image: linear-gradient(to bottom, shade(@theme_bg_color, 1.18), shade(@theme_bg_color, 1.1)); border-radius: 4px 4px 0px 0px; - border-width: 1px 1px 0px 1px; + border-width: 0px 1px 0px 1px; border-style: solid; border-color: @borders; box-shadow: none; } +notebook header.top tab:hover, .notebook tab.top:hover { background-image: linear-gradient(to bottom, alpha(@theme_base_color, 0.0), @@ -1930,6 +2499,8 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { border-color: @borders; } +notebook header.bottom tab:active, +notebook header.bottom tab:active:hover, .notebook tab.bottom:active, .notebook tab.bottom:active:hover { background-image: linear-gradient(to top, @@ -1942,6 +2513,7 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { box-shadow: none; } +notebook header.bottom tab:hover, .notebook tab.bottom:hover { background-image: linear-gradient(to top, alpha(@theme_base_color, 0.0), @@ -1954,11 +2526,25 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { /* vertical tabs */ +notebook.frame header.left tab, +notebook.frame header.right tab, .notebook tab.left, .notebook tab.right { padding: 5px 20px; + border-style: solid; + border-color: transparent; +} + +notebook header.left tab { + border-width: 1px 0px 1px 1px; +} + +notebook header.right tab { + border-width: 1px 1px 1px 0px; } +notebook header.left tab:active, +notebook header.left tab:active:hover, .notebook tab.left:active, .notebook tab.left:active:hover { background-image: linear-gradient(to right, @@ -1969,15 +2555,18 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { border-color: @borders; } +notebook header.left tab:hover, .notebook tab.left:hover { background-image: linear-gradient(to right, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); - border-width: 1px 0px 1px 0px; + border-width: 1px 0px 1px 1px; border-style: solid; border-color: @borders; } +notebook header.right tab:active, +notebook header.right tab:active:hover, .notebook tab.right:active, .notebook tab.right:active:hover { background-image: linear-gradient(to left, @@ -1988,15 +2577,17 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { border-color: @borders; } +notebook header.right tab:hover, .notebook tab.right:hover { background-image: linear-gradient(to left, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); - border-width: 1px 0px 1px 0px; + border-width: 1px 1px 1px 0px; border-style: solid; border-color: @borders; } +notebook tab.reorderable-page:hover, .notebook tab.reorderable-page:hover { background-image: linear-gradient(to bottom, alpha(@theme_base_color, 0.0), @@ -2006,6 +2597,7 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { border-style: none; } +notebook tab.reorderable-page:active, .notebook tab.reorderable-page:active { background-image: linear-gradient(to bottom, shade(@theme_bg_color, 1.18), @@ -2016,6 +2608,8 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { } /* close button styling */ +notebook button.flat, +notebook button.flat.small-button, .notebook tab .button { color: mix (@theme_fg_color, @theme_bg_color, 0.85); border-image: none; @@ -2026,17 +2620,21 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { border-color: transparent; border-width: 1px; padding: 1px; - icon-shadow: none; + -gtk-icon-shadow: none; } +notebook .prelight-page button.flat.small-button, +notebook .active-page button.flat.small-button, .notebook .prelight-page .button, .notebook tab.prelight-page .button, .notebook .active-page .button, .notebook tab.active-page .button { color: mix(@theme_fg_color, @theme_base_color, 0.6); - icon-shadow: 0 1px @button_text_shadow; + -gtk-icon-shadow: 0 1px @button_text_shadow; } +notebook button.flat:hover, +notebook button.flat.small-button:hover, .notebook tab .button:hover { color: @theme_fg_color; border-color: transparent; @@ -2045,68 +2643,101 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { background-color: transparent; } +notebook button.flat:active, +notebook button.flat:active:hover, +notebook button.flat.small-button:active, +notebook button.flat.small-button:active:hover, .notebook tab .button:active, .notebook tab .button:active:hover { color: @button_active_text; background-color: alpha(black, 0.08); box-shadow: inset 0 1px alpha(black, 0.05); - icon-shadow: 0 1px @button_active_text_shadow; + -gtk-icon-shadow: 0 1px @button_active_text_shadow; border-color: alpha(black, 0.27) alpha(black, 0.13) alpha(black, 0.13) 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: @menu_controls_color; +} + +notebook header.top tabs arrow.down, +notebook header.bottom tabs arrow.down { + -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); + color: @menu_controls_color; +} + +notebook header.left tabs arrow.up, +notebook header.right tabs arrow.up { + -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); + color: @menu_controls_color; +} + +notebook header.left tabs arrow.down, +notebook header.right tabs arrow.down { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); + color: @menu_controls_color; +} + +notebook header tabs arrow, .notebook.arrow { - /* FIXME, why this doesn't work? */ - -GtkNotebook-arrow-scaling: 0.5; color: shade(@theme_fg_color, 2.6); } +notebook header tabs arrow:hover, .notebook.arrow:hover { color: @theme_selected_bg_color; } +notebook header tabs arrow:active, .notebook.arrow:active { color: @theme_fg_color; } -.notebook.arrow:insensitive { +notebook header tabs arrow:disabled, +.notebook.arrow:disabled { color: rgba(141, 144, 145, 0.3); } +notebook header tabs arrow:backdrop, .notebook.arrow:backdrop { color: rgba(84, 89, 90, 0.4); } -.notebook.arrow:backdrop:insensitive { +notebook header tabs arrow:disabled, +.notebook.arrow:backdrop:disabled { color: #c7c7c7; } /************** * ComboBoxes * **************/ + +combobox, GtkComboBox { padding: 0; - - -GtkComboBox-arrow-scaling: 0.5; - -GtkComboBox-shadow-type: none; - text-shadow: 0 1px @button_text_shadow; } -GtkComboBox:insensitive { +combobox:disabled, +GtkComboBox:disabled { text-shadow: none; color: @insensitive_fg_color; } +combobox separator, GtkComboBox .separator { /* always disable separators */ - -GtkWidget-wide-separators: true; -GtkWidget-horizontal-separator: 0; -GtkWidget-vertical-separator: 0; } +combobox entry entry:first-child, +combobox entry button:first-child, GtkComboBox.combobox-entry .entry:first-child, GtkComboBox.combobox-entry .button:first-child { border-image-width: 3px 0 4px 3px; @@ -2114,6 +2745,8 @@ GtkComboBox.combobox-entry .button:first-child { border-right-width: 0; } +combobox entry entry:last-child, +combobox entry button:last-child, GtkComboBox.combobox-entry .entry:last-child, GtkComboBox.combobox-entry .button:last-child { border-image-width: 3px 3px 4px 0; @@ -2121,6 +2754,8 @@ GtkComboBox.combobox-entry .button:last-child { border-left-width: 0; } +toolbar.primary-toolbar combobox entry entry:first-child, +toolbar.primary-toolbar combobox entry button:first-child, .primary-toolbar GtkComboBox.combobox-entry .entry:first-child, .primary-toolbar GtkComboBox.combobox-entry .button:first-child { border-image-width: 4px 0 4px 4px; @@ -2128,6 +2763,8 @@ GtkComboBox.combobox-entry .button:last-child { border-right-width: 0; } +toolbar.primary-toolbar combobox entry entry:last-child, +toolbar.primary-toolbar combobox entry button:last-child, .primary-toolbar GtkComboBox.combobox-entry .entry:last-child, .primary-toolbar GtkComboBox.combobox-entry .button:last-child { border-image-width: 4px 4px 4px 0; @@ -2135,18 +2772,24 @@ GtkComboBox.combobox-entry .button:last-child { border-left-width: 0; } +combobox entry entry:focus:first-child, GtkComboBox.combobox-entry .entry:focus:first-child { box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1), inset 1px 1px alpha(@theme_selected_bg_color, 0.1), inset 0 -1px alpha(@theme_selected_bg_color, 0.2); } +combobox entry entry:focus:last-child, GtkComboBox.combobox-entry .entry:focus:last-child { box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1), inset -1px 1px alpha(@theme_selected_bg_color, 0.1), inset 0 -1px alpha(@theme_selected_bg_color, 0.2); } +combobox entry button:last-child, +combobox entry button:hover:last-child, +combobox entry button:active:last-child, +combobox entry button:hover:active:last-child, GtkComboBox.combobox-entry .button:last-child, GtkComboBox.combobox-entry .button:hover:last-child, GtkComboBox.combobox-entry .button:active:last-child, @@ -2156,6 +2799,10 @@ GtkComboBox.combobox-entry .button:hover:active:last-child { inset 0 2px alpha(@entry_inset, 0.4); } +combobox entry button:first-child, +combobox entry button:hover:first-child, +combobox entry button:active:first-child, +combobox entry button:hover:active:first-child, GtkComboBox.combobox-entry .button:first-child, GtkComboBox.combobox-entry .button:hover:first-child, GtkComboBox.combobox-entry .button:active:first-child, @@ -2165,55 +2812,77 @@ GtkComboBox.combobox-entry .button:hover:active:first-child { inset 0 2px alpha(@entry_inset, 0.4); } -GtkComboBox.combobox-entry .button:insensitive:first-child { +combobox entry button:disabled:first-child, +GtkComboBox.combobox-entry .button:disabled:first-child { box-shadow: inset -1px 0 @inset_dark_color; } -GtkComboBox.combobox-entry .button:insensitive:last-child { +combobox entry button:disabled:last-child, +GtkComboBox.combobox-entry .button:disabled:last-child { box-shadow: inset 1px 0 @inset_dark_color; } +combobox entry button:hover, +combobox entry button:active, +combobox entry button:active:hover, GtkComboBox.combobox-entry .button:hover, GtkComboBox.combobox-entry .button:active, GtkComboBox.combobox-entry .button:active:hover { color: shade (@theme_selected_bg_color, 0.80); - transition: all 400ms ease-in; + transition: all 200ms ease-in; } +combobox button, GtkComboBox .button { color: @theme_fg_color; } +combobox.linked button.combo, +combobox.linked button.combo:checked { + border-right-width: 2px; + border-left-width: 0; + border-image-width: 3px 4px 4px 0; + border-bottom-left-radius: 0; + border-top-left-radius: 0; +} + +combobox arrow { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); + color: @menu_controls_color; + min-height: 16px; + min-width: 16px; +} + /******************** * Various choosers * ********************/ +button.font separator, +GtkFileChooserButton separator, +filechooser horizontal.separator, GtkFontButton .separator, GtkFileChooserButton .separator, GtkFileChooserWidget horizontal.separator { /* always disable separators */ - -GtkWidget-wide-separators: true; -GtkWidget-horizontal-separator: 0; -GtkWidget-vertical-separator: 0; } +button.font label:last-child, GtkFontButton GtkLabel:last-child { color: mix(@theme_fg_color, @theme_bg_color, 0.35); } +GtkFileChooserButton image:last-child, GtkFileChooserButton GtkImage:last-child { color: @internal_element_color; } -GtkFileChooserWidget.vertical GtkPaned.horizontal { - -GtkPaned-handle-size: 3px; - border-color: transparent; -} - /************** * Scrollbars * **************/ +scrollbar, .scrollbar { background-image: none; border-style: solid; @@ -2222,12 +2891,12 @@ GtkFileChooserWidget.vertical GtkPaned.horizontal { -GtkScrollbar-has-forward-stepper: true; -GtkRange-stepper-size: 16; -GtkRange-slider-width: 13; - -GtkScrollbar-min-slider-length: 42; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */ - + -GtkScrollbar-min-slider-length: 42; -GtkRange-stepper-spacing: 0; -GtkRange-trough-under-steppers: 1; } +scrollbars-junction, .scrollbars-junction { /* the small square between scrollbars!!! */ background-image: none; background-color: @theme_bg_color; @@ -2237,6 +2906,12 @@ GtkFileChooserWidget.vertical GtkPaned.horizontal { box-shadow: none; } +scrollbar trough, +scrollbar trough.vertical, +.sidebar scrollbar trough, +.sidebar scrollbar trough.vertical, +placessidebar scrollbar.trough, +placessidebar scrollbar.trough.vertical, .scrollbar.trough, .scrollbar.trough.vertical, .sidebar.scrollbar.trough, @@ -2253,6 +2928,9 @@ GtkPlacesSidebar .scrollbar.trough.vertical { border-image: none; } +scrollbar trough.horizontal, +.sidebar scrollbar trough.horizontal, +placessidebar scrollbar trough.horizontal, .scrollbar.trough.horizontal, .sidebar.scrollbar.trough.horizontal, GtkPlacesSidebar .scrollbar.trough.horizontal { @@ -2266,10 +2944,14 @@ GtkPlacesSidebar .scrollbar.trough.horizontal { border-image: none; } +scrollbar button, +scrollbar button:active, +scrollbar button:active:hover, +scrollbar button:disabled, .scrollbar.button, .scrollbar.button:active, .scrollbar.button:active:hover, -.scrollbar.button:insensitive { +.scrollbar.button:disabled { border-style: none; border-image: none; border-radius: 0; @@ -2277,43 +2959,54 @@ GtkPlacesSidebar .scrollbar.trough.horizontal { background-color: transparent; } +scrollbar button:active, +scrollbar button:active:hover, .scrollbar.button:active, .scrollbar.button:active:hover { background-color: alpha(shade(@scrollbar_trough, 0.8), 0.5); } +scrollbar button.top:hover, .scrollbar.button.top:hover { box-shadow: inset 0 -1px mix(@scrollbar_slider, @scrollbar_trough, 0.8); } +scrollbar button.bottom:hover, .scrollbar.button.bottom:hover { box-shadow: inset 0 1px mix(@scrollbar_slider, @scrollbar_trough, 0.8); } +scrollbar button.right:hover, .scrollbar.button.right:hover { box-shadow: inset 1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8); } +scrollbar button.left:hover, .scrollbar.button.left:hover { box-shadow: inset -1px 0 mix(@scrollbar_slider, @scrollbar_trough, 0.8); } +scrollbar button, .scrollbar.button { color: @theme_fg_color; } +scrollbar button:hover, .scrollbar.button:hover { color: @theme_fg_color; } -.scrollbar.button:insensitive { +scrollbar button:disabled, +.scrollbar.button:disabled { color: @insensitive_fg_color; } +scrollbar button:active, .scrollbar.button:active { color: @theme_fg_color; } +scrollbar.vertical slider, .scrollbar.slider.vertical { background-image: linear-gradient(to right, shade(@scrollbar_slider, 0.95), @@ -2325,6 +3018,8 @@ GtkPlacesSidebar .scrollbar.trough.horizontal { border-width: 1px; } +scrollbar.vertical slider:hover, +scrollbar.vertical slider:hover:active, .scrollbar.slider.vertical:hover, .scrollbar.slider.vertical:hover:active { background-image: linear-gradient(to right, @@ -2336,6 +3031,7 @@ GtkPlacesSidebar .scrollbar.trough.horizontal { border-width: 1px; } +scrollbar.horizontal slider, .scrollbar.slider.horizontal { background-image: linear-gradient(to bottom, shade(@scrollbar_slider, 0.95), @@ -2347,6 +3043,8 @@ GtkPlacesSidebar .scrollbar.trough.horizontal { border-width: 1px; } +scrollbar.horizontal slider:hover, +scrollbar.horizontal slider:hover:active, .scrollbar.slider.horizontal:hover, .scrollbar.slider.horizontal:hover:active { background-image: linear-gradient(to bottom, @@ -2358,7 +3056,8 @@ GtkPlacesSidebar .scrollbar.trough.horizontal { border-width: 1px; } -.scrollbar.slider:insensitive { +scrollbar slider:disabled, +.scrollbar.slider:disabled { background-color: shade(@scrollbar_slider, 0.85); border-style: solid; border-image: none; @@ -2366,7 +3065,8 @@ GtkPlacesSidebar .scrollbar.trough.horizontal { border-width: 1px; } -.scrollbar.slider.fine-tune:prelight:active { +scrollbar.fine-tune slider:hover:active, +.scrollbar.slider.fine-tune:hover:active { background-image: linear-gradient(to right, shade(@scrollbar_slider, 0.85), shade(@scrollbar_slider, 0.7)); @@ -2379,31 +3079,40 @@ GtkPlacesSidebar .scrollbar.trough.horizontal { /********* * Menus * *********/ + /* combobox menus */ +treemenu menu, GtkTreeMenu.menu { background-color: @menu_bg_color; } +treemenu menuitem, GtkTreeMenu .menuitem { padding: 2px; border-style: none; } +treemenu menuitem, GtkTreeMenu .menuitem { color: @theme_text_color; } +treemenu menuitem, +button menuitem, +toolbar button menuitem, GtkTreeMenu .menuitem, .button .menuitem, .toolbar .button .menuitem { text-shadow: none; } +context-menu, .context-menu { font: initial; text-shadow: none; } +menu, .menu { background-color: @menu_bg_color; color: @menu_fg_color; @@ -2412,70 +3121,77 @@ GtkTreeMenu .menuitem, margin: 4px; } +menu button, .menu.button { background-image: none; background-color: @theme_base_color; color: @internal_element_color; - border-image: none; border-style: none; } +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 { - background-image: linear-gradient(to bottom, - @theme_bg_color, - shade (@theme_bg_color, 0.96)); - border-width: 0; - -GtkWidget-window-dragging: true; + background-image: linear-gradient(to bottom, + @theme_bg_color, + shade (@theme_bg_color, 0.96)); + border-width: 0; + -GtkWidget-window-dragging: true; } +menubar menuitem, .menubar .menuitem { - -gtk-icon-style: regular; transition: all 200ms ease-out; + -gtk-icon-style: regular; border-style: none; padding: 4px 6px; text-shadow: 0 1px @button_text_shadow; } +menubar menuitem:hover, .menubar .menuitem:hover { - background-image: linear-gradient(to bottom, - shade (@theme_bg_color, 1.0), - shade (@theme_bg_color, 0.82)); + background-image: linear-gradient(to bottom, + shade (@theme_bg_color, 1.0), + shade (@theme_bg_color, 0.82)); } +menubar menuitem:hover, .menubar .menuitem:hover { color: @menu_fg_color; } +menu menuitem, .menu .menuitem { - background-color: transparent; - -GtkMenuItem-arrow-scaling: 0.6; - transition: all 150ms ease-out; - padding: 6px 5px; + background-color: transparent; + transition: all 150ms ease-out; + padding: 6px 5px; } +menu menuitem:hover, .menu .menuitem:hover { border-radius: 0; } +menu menuitem:active, +menu menuitem:hover, .menu .menuitem:active, .menu .menuitem:hover { background-color: @theme_selected_bg_color; @@ -2486,27 +3202,35 @@ GtkTreeMenu .menuitem, border: none; } -.menu .menuitem:insensitive { +menu menuitem:disabled, +.menu .menuitem:disabled { background-color: transparent; } +menu menuitem:active, +menu menuitem:hover, .menu .menuitem:active, .menu .menuitem:hover { color: @theme_selected_fg_color; } -.menu .menuitem *:insensitive { +menu menuitem *:disabled, +.menu .menuitem *:disabled { color: mix (@menu_fg_color, @menu_bg_color, 0.6); } -.menu .menuitem .accelerator:insensitive { +menu menuitem accelerator:disabled, +.menu .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 (@theme_selected_fg_color, 0.7); @@ -2516,73 +3240,121 @@ GtkModelMenuItem GtkBox GtkImage { padding-right: 6px; } +menuitem arrow, .menuitem.arrow { - color: @menu_controls_color; + min-height: 16px; + min-width: 16px; + margin-left: 10px; + color: @menu_controls_color; +} + +menu menuitem arrow:dir(ltr) { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } +menu menuitem arrow:dir(rtl) { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); +} + +menu arrow.top { + -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); +} + +menu arrow.bottom { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); +} + +menuitem separator, .menuitem.separator { color: @menu_separator; - - -GtkMenuItem-horizontal-padding: 0; } +menuitem check, +menuitem radio, +menuitem check:hover, +menuitem radio:hover, +menuitem check:disabled, +menuitem radio:disabled, .menuitem.check, .menuitem.radio, .menuitem.check:hover, .menuitem.radio:hover, -.menuitem.check:insensitive, -.menuitem.radio:insensitive { +.menuitem.check:disabled, +.menuitem.radio:disabled { background-image: none; background-color: transparent; + min-height: 12px; + min-width: 12px; + background-position: center center; } +menuitem check:checked, +menuitem radio:checked, .menuitem.check:checked, .menuitem.radio:checked { background-color: transparent; } +menuitem check:checked, .menuitem.check:checked { -gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked.svg")); } +menuitem check:checked:hover, .menuitem.check:checked:hover { -gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked-selected.svg")); } -.menuitem.check:checked:insensitive { +menuitem check:checked:disabled, +.menuitem.check:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked-insensitive.svg")); } -.menuitem.check:inconsistent, -.menuitem.radio:inconsistent { +menuitem check:indeterminate, +menuitem radio:indeterminate, +.menuitem.check:indeterminate, +.menuitem.radio:indeterminate { -gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed.svg")); } -.menuitem.check:inconsistent:insensitive, -.menuitem.radio:inconsistent:insensitive { +menuitem check:indeterminate:disabled, +menuitem radio:indeterminate:disabled, +.menuitem.check:indeterminate:disabled, +.menuitem.radio:indeterminate:disabled { -gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-insensitive.svg")); } -.menuitem.check:inconsistent:hover, -.menuitem.radio:inconsistent:hover { +menuitem check:indeterminate:hover, +menuitem radio:indeterminate:hover, +.menuitem.check:indeterminate:hover, +.menuitem.radio:indeterminate:hover { -gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-selected.svg")); } +menuitem radio:checked, .menuitem.radio:checked { -gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked.svg")); } +menuitem radio:checked:hover, .menuitem.radio:checked:hover { -gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-selected.svg")); } -.menuitem.radio:checked:insensitive { +menuitem radio:checked:disabled, +.menuitem.radio:checked:disabled { -gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-insensitive.svg")); } /*************** * Menu Button * ***************/ +toolbar GtkMenuButton menu-button:active, +toolbar GtkMenuButton menu-button.raised:active, +menu-button:active, +.linked menu-button:active, +toolbar .linked.raised menu-button:active, +toolbar menu-button.linked.raised:active, .toolbar GtkMenuButton.menu-button:active, .toolbar GtkMenuButton.menu-button.raised:active, GtkMenuButton.menu-button:active, @@ -2591,34 +3363,44 @@ GtkMenuButton.menu-button:active, .toolbar GtkMenuButton.menu-button.linked.raised:active { /* background-image: none; background-color: @menu_bg_color; - border-image: none; border-color: @menu_bg_color; border-radius: 4px 4px 0 0; color: @theme_text_color;*/ } +menu-button:active, +.linked menu-button:active, +.toolbar .linked.raised menu-button:active, +toolbar menu-button.linked.raised:active, GtkMenuButton.menu-button:active, .linked GtkMenuButton.menu-button:active, .toolbar .linked.raised GtkMenuButton.menu-button:active, .toolbar GtkMenuButton.menu-button.linked.raised:active { text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; box-shadow: none; } +.linked menu-button:active:last-child, +toolbar .linked.raised menu-button:active:last-child, +toolbar menu-button.linked.raised:active:last-child, .linked GtkMenuButton.menu-button:active:last-child, .toolbar .linked.raised GtkMenuButton.menu-button:active:last-child, .toolbar GtkMenuButton.menu-button.linked.raised:active:last-child { border-top-left-radius: 0; } +.linked menu-button:active:first-child, +toolbar .linked.raised menu-button:active:first-child, +toolbar menu-button.linked.raised:active:first-child, .linked GtkMenuButton.menu-button:active:first-child, .toolbar .linked.raised GtkMenuButton.menu-button:active:first-child, .toolbar GtkMenuButton.menu-button.linked.raised:active:first-child { border-top-right-radius: 0; } +button menuitem menubar:active, .button.menuitem.menubar:active { background-image: none; background-color: @menu_bg_color; @@ -2630,12 +3412,16 @@ GtkMenuButton.menu-button:active, border-style: solid; } +button menuitem menubar:active, +menu-button:active, +toolbar menu-button:active, .button.menuitem.menubar:active, GtkMenuButton.menu-button:active, .toolbar GtkMenuButton.menu-button:active { color: @theme_text_color; } +menu-button menu, GtkMenuButton .menu { text-shadow: none; } @@ -2644,23 +3430,40 @@ GtkMenuButton .menu { * Radiobuttons * ****************/ +check, +radio, +check:disabled, +radio:disabled, .check, .radio, -.check:insensitive, -.radio:insensitive { +.check:disabled, +.radio:disabled { background-color: transparent; border-style: none; } +check, +radio { + padding: 0px 6px 0px 0px; +} + +checkbutton:hover, +checkbutton:active:hover, +checkbutton:selected, +checkbutton:selected:focus, +checkbutton:disabled, GtkCheckButton:hover, GtkCheckButton:active:hover, GtkCheckButton:selected, GtkCheckButton:selected:focus, -GtkCheckButton:insensitive { +GtkCheckButton:disabled { background-color: transparent; } -GtkCheckButton.text-button, GtkRadioButton.text-button { +checkbutton.text-button, +radiobutton.text-button, +GtkCheckButton.text-button, +GtkRadioButton.text-button { padding: 1px 2px 4px; outline-offset: 0; } @@ -2668,6 +3471,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { /************ * Toolbars * ************/ +toolbar, .toolbar { border-style: none; border-color: darker (@theme_bg_color); @@ -2675,19 +3479,23 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-color: @theme_bg_color; } +toolbar button, .toolbar .button { padding: 1px; } +toolbar button.text-button, .toolbar .button.text-button { padding: 2px 16px; } +toolbar button.image-button, .toolbar .button.image-button { padding: 5px 4px 4px 5px; } -.toolbar:insensitive { +toolbar:disabled, +.toolbar:disabled { color: alpha (@theme_fg_color, 0.6); background-color: @insensitive_bg_color; } @@ -2695,6 +3503,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { /******************** * Menubar Toolbars * ********************/ +toolbar menubar, .toolbar.menubar { -GtkToolbar-button-relief: normal; @@ -2707,6 +3516,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { /*************** * Header bars * ***************/ +.titlebar, calendar.header, +headerbar, .titlebar, GtkCalendar.header, .header-bar { border-width: 0 0 1px; @@ -2717,6 +3528,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { padding: 6px; } +headerbar button.text-button, .header-bar .button.text-button { padding: 2px 16px; } @@ -2725,12 +3537,16 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { padding: 4px 5px; } +.titlebar .title, calendar.header .title, +headerbar .title, .titlebar .title, GtkCalendar.header .title, .header-bar .title { font: Bold; padding: 0px 12px; } +.titlebar .subtitle, calendar.header .subtitle, +headerbar .subtitle, .titlebar .subtitle, GtkCalendar.header .subtitle, .header-bar .subtitle { font-size: smaller; @@ -2740,6 +3556,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { /*************** * Action bars * ***************/ +actionbar, .action-bar { border-width: 1px 0 0; border-style: solid; @@ -2753,19 +3570,23 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { padding: 6px 6px 5px 6px; } +actionbar .button.text-button, .action-bar .button.text-button { padding: 2px 16px; } +actionbar .button.image-button, .action-bar .button.image-button { padding: 5px 5px 4px 5px; } +actionbar .title, .action-bar .title { font: Bold 10; padding: 0px 12px 0px 12px; } +actionbar .subtitle, .action-bar .subtitle { font: 9; padding: 0px 12px 0px 12px; @@ -2775,6 +3596,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { * Dialog * ***************/ +messagedialog, .prompt, GtkMessageDialog { -GtkDialog-content-area-border: 0; @@ -2785,6 +3607,7 @@ GtkMessageDialog { } /* ie. mate-keyboard-properties option window */ +GtkDialog scrolledwindow, GtkDialog GtkScrolledWindow.frame { border-color: @borders; border-style: solid; @@ -2792,11 +3615,13 @@ GtkDialog GtkScrolledWindow.frame { border-radius: 2px; } +GtkDialog scrolledwindow viewport .vertical, GtkDialog GtkScrolledWindow.frame GtkViewport .vertical { background-color: shade (@theme_bg_color, 1.07); } -GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { +GtkDialog scrolledwindow viewport .vertical, GtkExpander .vertical. +GtkDialog GtkScrolledWindow.frame GtkViewport .vertical, GtkExpander .vertical { background-color: @theme_base_color; border-radius: 3px; border-color: @borders; @@ -2805,131 +3630,168 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { } /* middle buttons */ +.dialog-action-area.linked button, +.dialog-action-area.linked button:active, +.dialog-action-area.linked button:active:hover, +.dialog-action-area.linked button:checked, +.dialog-action-area.linked button:checked:hover, +.dialog-action-area.linked button:disabled, .dialog-action-area.linked .button, .dialog-action-area.linked .button:active, .dialog-action-area.linked .button:active:hover, .dialog-action-area.linked .button:checked, .dialog-action-area.linked .button:checked:hover, -.dialog-action-area.linked .button:insensitive { - border-style: solid; - border-radius: 0; +.dialog-action-area.linked .button:disabled { + border-style: solid; + border-radius: 0; border-width: 1px; -/* border-right-width: 0px; - border-left-width: 0px;*/ - border-color: @borders; - border-image: none; + border-color: @borders; + border-image: none; } +.dialog-action-area.linked button.default, +.dialog-action-area.linked button.default:active, +.dialog-action-area.linked button.default:checked, +.dialog-action-area.linked button.default:disabled, +.dialog-action-area.linked button:focus, .dialog-action-area.linked .button.default, .dialog-action-area.linked .button.default:active, .dialog-action-area.linked .button.default:checked, -.dialog-action-area.linked .button.default:insensitive, +.dialog-action-area.linked .button.default:disabled, .dialog-action-area.linked .button:focus { - border-style: solid; - border-radius: 0; + border-style: solid; + border-radius: 0; border-width: 1px; -/* border-right-width: 0px; - border-left-width: 0px;*/ - border-color: shade(@infobar_bg_color, 1.0); - -GtkWidget-focus-line-width: 0; + border-color: @theme_selected_bg_color; } - /* left 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:checked:first-child, +.dialog-action-area.linked button:checked:hover:first-child, +.dialog-action-area.linked button:disabled:first-child, .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:checked:first-child, .dialog-action-area.linked .button:checked:hover:first-child, -.dialog-action-area.linked .button:insensitive:first-child { - border-style: solid; +.dialog-action-area.linked .button:disabled:first-child { + border-style: solid; border-width: 1px; -/* border-right-width: 0;*/ - border-radius: 3px 0 0px 3px; - border-color: @borders; - border-image: none; + border-radius: 3px 0 0px 3px; + border-color: @borders; + border-image: none; } +.dialog-action-area.linked button.default:first-child, +.dialog-action-area.linked button.default:active:first-child, +.dialog-action-area.linked button.default:checked:first-child, +.dialog-action-area.linked button.default:disabled:first-child, +.dialog-action-area.linked button:focus:first-child, .dialog-action-area.linked .button.default:first-child, .dialog-action-area.linked .button.default:active:first-child, .dialog-action-area.linked .button.default:checked:first-child, -.dialog-action-area.linked .button.default:insensitive:first-child, +.dialog-action-area.linked .button.default:disabled:first-child, .dialog-action-area.linked .button:focus:first-child { - border-style: solid; + border-style: solid; border-width: 1px; -/* border-right-width: 0;*/ - border-radius: 3px 0 0px 3px; - border-color: shade(@infobar_bg_color, 1.0); - -GtkWidget-focus-line-width: 0; + border-radius: 3px 0 0px 3px; + border-color: @theme_selected_bg_color; +/* -GtkWidget-focus-line-width: 0; deprecated */ } /* right 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:checked:last-child, +.dialog-action-area.linked button:checked:hover:last-child, +.dialog-action-area.linked button:disabled:last-child, .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:checked:last-child, .dialog-action-area.linked .button:checked:hover:last-child, -.dialog-action-area.linked .button:insensitive:last-child { - border-style: solid; +.dialog-action-area.linked .button:disabled:last-child { + border-style: solid; border-width: 1px; -/* border-left-width: 0;*/ - border-radius: 0 3px 3px 0; - border-color: @borders; - border-image: none; + border-radius: 0 3px 3px 0; + border-color: @borders; + border-image: none; } +.dialog-action-area.linked button.default:last-child, +.dialog-action-area.linked button.default:active:last-child, +.dialog-action-area.linked button.default:checked:last-child, +.dialog-action-area.linked button.default:disabled:last-child, +.dialog-action-area.linked button:focus:last-child, .dialog-action-area.linked .button.default:last-child, .dialog-action-area.linked .button.default:active:last-child, .dialog-action-area.linked .button.default:checked:last-child, -.dialog-action-area.linked .button.default:insensitive:last-child, +.dialog-action-area.linked .button.default:disabled:last-child, .dialog-action-area.linked .button:focus:last-child { - border-style: solid; + border-style: solid; border-width: 1px; -/* border-left-width: 0;*/ - border-radius: 0 3px 3px 0; - border-color: shade(@infobar_bg_color, 1.0); - -GtkWidget-focus-line-width: 0; + border-radius: 0 3px 3px 0; + border-color: @theme_selected_bg_color; } /* single button */ +.dialog-action-area.linked button:only-child, +.dialog-action-area.linked button:active:only-child, +.dialog-action-area.linked button:active:hover:only-child, +.dialog-action-area.linked button:checked:only-child, +.dialog-action-area.linked button:checked:hover:only-child, +.dialog-action-area.linked button:disabled:only-child, .dialog-action-area.linked .button:only-child, .dialog-action-area.linked .button:active:only-child, .dialog-action-area.linked .button:active:hover:only-child, .dialog-action-area.linked .button:checked:only-child, .dialog-action-area.linked .button:checked:hover:only-child, -.dialog-action-area.linked .button:insensitive:only-child { +.dialog-action-area.linked .button:disabled:only-child { padding-left: 6px; padding-right: 6px; border-width: 1px; border-radius: 3px; - border-color: @borders; - border-image: none; + border-color: @borders; + border-image: none; } +.dialog-action-area.linked button.default:only-child, +.dialog-action-area.linked button.default:active:only-child, +.dialog-action-area.linked button.default:checked:only-child, +.dialog-action-area.linked button.default:disabled:only-child, +.dialog-action-area.linked button:focus:only-child, .dialog-action-area.linked .button.default:only-child, .dialog-action-area.linked .button.default:active:only-child, .dialog-action-area.linked .button.default:checked:only-child, -.dialog-action-area.linked .button.default:insensitive:only-child, +.dialog-action-area.linked .button.default:disabled:only-child, .dialog-action-area.linked .button:focus:only-child { padding-left: 6px; padding-right: 6px; border-width: 1px; border-radius: 3px; - border-color: shade(@infobar_bg_color, 1.0); - -GtkWidget-focus-line-width: 0; + border-color: @theme_selected_bg_color; } +.dialog-action-area.linked button.suggested-action, +.dialog-action-area.linked button.suggested-action:active, +.dialog-action-area.linked button.suggested-action:checked, +.dialog-action-area.linked button.suggested-action:disabled, .dialog-action-area.linked .button.suggested-action, .dialog-action-area.linked .button.suggested-action:active, .dialog-action-area.linked .button.suggested-action:checked, -.dialog-action-area.linked .button.suggested-action:insensitive { - box-shadow: none; +.dialog-action-area.linked .button.suggested-action:disabled { + box-shadow: none; } /*************** * Search bars * ***************/ +searchbar, .search-bar { border-width: 0 0 1px; border-style: solid; @@ -2940,6 +3802,7 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4); } +searchbar button.close-button, .search-bar .button.close-button { padding: 5px 4px 5px 5px; } @@ -2951,6 +3814,7 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { /* applications using EggEditableToolbar usually set the primary-toolbar * hint on the containing vbox, so we need to handle both these cases here. */ +toolbar.primary-toolbar, .primary-toolbar .toolbar, .primary-toolbar.toolbar { border-style: solid; @@ -2964,21 +3828,23 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4); } +toolbar.primary-toolbar separator, .primary-toolbar .toolbar .separator, .primary-toolbar.toolbar .separator { -GtkWidget-window-dragging: true; } -.primary-toolbar .toolbar:insensitive, -.primary-toolbar.toolbar:insensitive { +toolbar.primary-toolbar:disabled, +.primary-toolbar .toolbar:disabled, +.primary-toolbar.toolbar:disabled { background-image: none; background-color: shade (@theme_bg_color, 0.97); - border-color: shade (@theme_bg_color, 0.91); text-shadow: none; } /* progressbars on primary toolbar entries are special */ +toolbar.primary-toolbar entry.progressbar, .primary-toolbar .toolbar .entry.progressbar, .primary-toolbar.toolbar .entry.progressbar { background-image: linear-gradient(to bottom, @@ -2996,7 +3862,7 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { /******************* * Inline toolbars * *******************/ - +toolbar.inline-toolbar, .inline-toolbar.toolbar { border-width: 1px; border-style: solid; @@ -3006,11 +3872,13 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { padding: 2px; } +toolbar.inline-toolbar:last-child, .inline-toolbar.toolbar:last-child { border-top-width: 0; border-radius: 0 0 3px 3px; } +toolbar.inline-toolbar.vertical:last-child, .inline-toolbar.toolbar.vertical:last-child { border-left-width: 0; border-radius: 0; @@ -3019,17 +3887,26 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { /*********** * Sidebar * ***********/ +.sidebar .view, +placessidebar .view, .sidebar, -.sidebar .view { +GtkPlacesSidebar.sidebar .view { -gtk-icon-style: regular; background-color: @sidebar_bg; } +.sidebar.frame, .sidebar .frame { border-style: none; } +.sidebar:backdrop { + background-color: @sidebar_bg; +} + /* dialog open */ +dialog filechooser placessidebar.sidebar.frame viewport.frame list, +dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row, GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame GtkListBox.sidebar.list, GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame GtkListBox.sidebar.list, GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row, @@ -3037,27 +3914,32 @@ GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-r background-color: @sidebar_bg; } +dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:hover, GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:hover { background-color: shade (@theme_selected_bg_color, 1.15); color: shade (@theme_selected_bg_color, 0.35); } +dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row:selected:hover, GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:selected:hover, GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row:selected:hover { color: shade (@theme_selected_fg_color, 1.00); } +dialog filechooser placessidebar.sidebar.frame viewport.frame list row.activatable.sidebar-row revealer.sidebar-revealer image.sidebar-icon, GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-icon, GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .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, GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-label, GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .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, GtkFileChooserDialog GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-button.image-button.button, GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-row.activatable.sidebar-row .sidebar-revealer .sidebar-button.image-button.button { background-color: transparent; @@ -3067,23 +3949,12 @@ GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-r padding: 4px 12px 4px 0px; } -/* workaround for broken first/last-child logic with linked buttons - in pathbar with gtk+-3.18 */ -.path-bar.linked .button.image-button, -.path-bar.linked .button.image-button:checked:hover, -.path-bar.linked .button.text-button { - border-right-width: 1px; - border-left-width: 1px; - border-image-width: 3px 3px 4px 3px; - border-radius: 3px; - padding: 4px; -} - .sidebar row:hover { background-color: shade (@theme_selected_bg_color, 1.15); color: shade (@theme_selected_bg_color, 0.35); } +.sidebar scrollbar trough, .sidebar .scrollbar.trough { box-shadow: none; border-radius: 100px; @@ -3092,22 +3963,29 @@ GtkFileChooserWidget GtkPlacesSidebar.sidebar.frame .frame .sidebar.list .list-r border-color: transparent; } +.sidebar scrollbar trough, .sidebar .scrollbar.trough { background-color: @sidebar_scrollbar_trough; } +.sidebar scrollbar slider, .sidebar .scrollbar.slider { background-color: @sidebar_bg; } +.sidebar scrollbar slider:hover, .sidebar .scrollbar.slider:hover { background-color: mix (@sidebar_bg, @theme_base_color, 0.35); } +.sidebar scrollbar slider:hover:active, .sidebar .scrollbar.slider:hover:active { background-color: @theme_base_color; } +.sidebar radio, +.sidebar radio:focus, +.sidebar radio:selected, .sidebar .radio, .sidebar .radio:focus, .sidebar .radio:selected { @@ -3132,6 +4010,9 @@ GtkOverlay.osd { background-origin: border-box; } +.osd button, +.osd button:active, +.osd button:checked, .osd.button, .osd.button:active, .osd.button:checked, @@ -3144,30 +4025,38 @@ GtkOverlay.osd { border-radius: 5px; } +.osd button, .osd .button { border-color: shade (@theme_selected_bg_color, 0.5); } -.osd .button:insensitive { +.osd button:disabled, +.osd .button:disabled { border-color: alpha(@osd_button_border,0.5); } +.osd button:active, +.osd button:checked, .osd .button:active, .osd .button:checked { border-color: @osd_button_border_active; } +.osd button, .osd.button, .osd .button { padding: 4px; + background-image: linear-gradient(to bottom, @osd_button_bg_a, @osd_button_bg_b 68%, @osd_button_bg_c ); + color: @osd_button_fg; + text-shadow: 0 -1px @osd_button_shadow; - icon-shadow: 0 -1px @osd_button_shadow; + -gtk-icon-shadow: 0 -1px @osd_button_shadow; } .osd.button { @@ -3181,38 +4070,50 @@ GtkOverlay.osd { } .osd.button, -.osd.button:prelight, +.osd.button:hover, .osd.button:active, .osd.button:checked { background-color: shade(@osd_bg, 1.10); } +.osd button, +.osd button:hover, +.osd button:active, +.osd button:checked, .osd .button, -.osd .button:prelight, +.osd .button:hover, .osd .button:active, .osd .button:checked { background-color: transparent; } -.osd.button:insensitive, -.osd .button:insensitive { +.osd button:disabled, +.osd.button:disabled, +.osd .button:disabled { background-image: none; background-color: @osd_button_bg_insensitive; } -.osd.button:active:insensitive, -.osd .button:active:insensitive, -.osd.button:checked:insensitive, -.osd .button:checked:insensitive { +.osd button:active:disabled, +.osd button:checked:disabled +.osd.button:active:disabled, +.osd .button:active:disabled, +.osd.button:checked:disabled, +.osd .button:checked:disabled { background-image: none; background-color: @osd_button_bg_insensitive_active; } +.osd button:hover, .osd.button:hover, .osd .button:hover { color: @osd_button_fg_hover; } +.osd button:active, +.osd button:hover:active, +.osd button:checked, +.osd button:hover:checked .osd.button:active, .osd.button:hover:active, .osd .button:active, @@ -3224,17 +4125,21 @@ GtkOverlay.osd { color: @osd_button_fg_active; } -.osd.button:insensitive, -.osd.button:active *:insensitive, -.osd.button:checked *:insensitive, -.osd .button:insensitive, -.osd .button:active *:insensitive, -.osd .button:checked *:insensitive { +.osd button:disabled, +.osd button:active *:disabled, +.osd button:checked *:disabled, +.osd.button:disabled, +.osd.button:active *:disabled, +.osd.button:checked *:disabled, +.osd .button:disabled, +.osd .button:active *:disabled, +.osd .button:checked *:disabled { color: @osd_button_fg_insensitive; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; } +.osd button:hover, .osd.button:hover, .osd .button:hover { background-image: linear-gradient(to bottom, @@ -3244,6 +4149,10 @@ GtkOverlay.osd { ); } +.osd button:checked, +.osd button:checked:hover, +.osd button:active, +.osd button:active:hover, .osd.button:active, .osd.button:active:hover, .osd .button:active, @@ -3262,6 +4171,7 @@ GtkOverlay.osd { } /* left/right button box */ +toolbar.osd .linked.horizontal, .osd.toolbar .horizontal.linked { background-image: linear-gradient(to left, shade(@theme_selected_bg_color, 1.1), @@ -3270,28 +4180,34 @@ GtkOverlay.osd { } /* button in osd-toolbar */ +toolbar.osd .linked button.image-button:active:first-child, .osd .linked .button:active:first-child { border-left-width: 1px; } +toolbar.osd .linked button.image-button:active:last-child, .osd .linked .button:active:last-child { border-right-width: 1px; } +toolbar.osd button.image-button, .osd.toolbar .flat.button.image-button { box-shadow: none; } +.osd button.menu-button:active, .osd GtkMenuButton.menu-button:active { background-color: transparent; border-color: @osd_button_border; } +.osd button.menu-button:active, .osd GtkMenuButton.menu-button:active { color: @osd_button_fg_active; text-shadow: 0 -1px @osd_button_shadow; } +toolbar.osd, .osd.toolbar { color: @osd_fg; text-shadow: 0 1px @osd_text_shadow; @@ -3307,6 +4223,7 @@ GtkOverlay.osd { -GtkToolbar-button-relief: normal; } +toolbar.osd button, .osd.toolbar .button { padding: 4px; border-width: 1px; @@ -3314,18 +4231,25 @@ GtkOverlay.osd { box-shadow: inset @osd_button_inset; } +toolbar.osd button:first-child .osd.toolbar .button:first-child { border-radius: 5px 0 0 5px; border-width: 1px 0 1px 1px; box-shadow: inset -1px 0 @osd_button_inset; } +toolbar.osd button:last-child, .osd.toolbar .button:last-child { box-shadow: none; border-radius: 0 5px 5px 0; border-width: 1px 1px 1px 0; } +toolbar.osd button:only-child, +toolbar.osd GtkToolButton button, +toolbar.osd GtkToolButton:only-child button, +toolbar.osd GtkToolButton:last-child button, +toolbar.osd GtkToolButton:first-child button, .osd.toolbar .button:only-child, .osd.toolbar GtkToolButton .button, .osd.toolbar GtkToolButton:only-child .button, @@ -3334,24 +4258,27 @@ GtkOverlay.osd { border-width: 1px; border-radius: 5px; border-style: solid; - box-shadow: none; } +toolbar.osd separator, .osd.toolbar .separator { color: shade(@osd_lowlight, 0.80); } /* used by gnome-settings-daemon's media-keys OSD */ +.osd trough, .osd.trough { background-color: @osd_trough_bg; border-width: 0; } +.osd progressbar, .osd.progressbar { background-color: @osd_fg; } +.osd scale trough, .osd .scale.trough { border: 1px solid rgba(0,0,0,0.1); border-image: none; @@ -3359,17 +4286,21 @@ GtkOverlay.osd { background-color: transparent; } +.osd scale trough highlight, .osd .scale.trough.highlight { background-image: none; background-color: @theme_selected_bg_color; } -.osd .scale.trough:insensitive, -.osd .scale.trough.highlight:insensitive { +.osd scale trough:disabled, +.osd scale trough highlight:disabled, +.osd .scale.trough:disabled, +.osd .scale.trough.highlight:disabled { background-image: none; background-color: transparent; } +.osd popover.background.scale-popup, .osd .scale-popup.popover.background { color: @osd_fg; border-style: solid; @@ -3382,28 +4313,37 @@ GtkOverlay.osd { background-color: transparent; } +.osd popover.background.scale-popup button.flat.image-button, .osd .scale-popup.popover.background .button.flat.image-button { background-image: linear-gradient(to bottom, - alpha(shade(@theme_selected_bg_color, 0.90), 0.6), + alpha(shade(@theme_selected_bg_color, 1.90), 0.6), alpha(shade(@theme_selected_bg_color, 0.75), 0.6)); border-radius: 5px; border-width: 1px; padding: 2px; } -.osd .scale-popup.popover.background .button.flat.image-button:insensitive { +.osd popover.background.scale-popup button.flat.image-button:disabled, +.osd .scale-popup.popover.background .button.flat.image-button:disabled { background-color: alpha (@osd_button_bg_insensitive, 0.5); background-image: none; } +.osd progressbar, +progressbar .osd, .osd GtkProgressBar, GtkProgressBar.osd { padding: 0; - -GtkProgressBar-xspacing: 0; - -GtkProgressBar-yspacing: 3px; - -GtkProgressBar-min-horizontal-bar-height: 3px; + min-height: 3px; +} + +.osd progressbar.horizontal, +progressbar.horizontal .osd { + min-height: 3px; } +.osd progressbar trough, +progressbar .osd trough, .osd GtkProgressBar.trough, GtkProgressBar.osd.trough { padding: 0; @@ -3415,6 +4355,8 @@ GtkProgressBar.osd.trough { border-radius: 0; } +.osd progressbar, +progressbar .osd, .osd GtkProgressBar.progressbar, GtkProgressBar.osd.progressbar { border-style: none; @@ -3423,36 +4365,41 @@ GtkProgressBar.osd.progressbar { border-radius: 0; } +.osd view, .osd .view, .osd.view { background-color: @osd_view_bg; } +.osd scrollbar trough, .osd .scrollbar.trough { background-color: @osd_scrollbar_trough; } +.osd scrollbar slider, .osd .scrollbar.slider { background-color: @osd_scrollbar_slider; } +.osd scrollbar slider:hover .osd .scrollbar.slider:hover { background-color: @osd_scrollbar_slider_prelight; } +.osd scrollbar slider:active, .osd .scrollbar.slider:active { background-color: @osd_scrollbar_slider_active; } +.osd iconview.cell:selected, +.osd iconview.cell:selected:focus .osd GtkIconView.cell:selected, .osd GtkIconView.cell:selected:focus { background-color: transparent; - border-style: solid; border-radius: 15px; border-width: 3px; border-color: @osd_button_fg; - outline-color: transparent; } @@ -3469,18 +4416,19 @@ GtkProgressBar.osd.progressbar { /**************************** * Suggested action buttons * ****************************/ +toolbar button.suggested-action, +button.suggested-action, .toolbar .suggested-action.button, .suggested-action.button { background-image: linear-gradient(to bottom, @suggested_action_button_a, @suggested_action_button_b); - border-image: none; - border-color: @suggested_action_button_border; - border-width: 1px; color: @suggested_action_button_fg; } +toolbar button.suggested-action:hover, +button.suggested-action:hover, .toolbar .suggested-action.button:hover, .suggested-action.button:hover { background-image: linear-gradient(to bottom, @@ -3488,6 +4436,14 @@ GtkProgressBar.osd.progressbar { shade(@suggested_action_button_b, 1.05)); } +toolbar button.suggested-action:active, +toolbar button.suggested-action:hover:active, +button.suggested-action:active, +button.suggested-action:hover:active, +toolbar button.suggested-action:checked, +toolbar button.suggested-action:hover:checked, +button.suggested-action:checked, +button.suggested-action:hover:checked, .toolbar .suggested-action.button:active, .toolbar .suggested-action.button:hover:active, .suggested-action.button:active, @@ -3503,12 +4459,22 @@ GtkProgressBar.osd.progressbar { color: @suggested_action_button_fg; } +toolbar button.suggested-action, +button.suggested-action, .toolbar .suggested-action.button, .suggested-action.button { text-shadow: 0 1px @suggested_action_button_shadow; - icon-shadow: 0 1px @suggested_action_button_shadow; + -gtk-icon-shadow: 0 1px @suggested_action_button_shadow; } +toolbar button.suggested-action:active, +toolbar button.suggested-action:hover:active, +button.suggested-action:active, +button.suggested-action:hover:active, +toolbar button.suggested-action:checked, +toolbar button.suggested-action:checked, +button.suggested-action:checked, +button.suggested-action:hover:checked, .toolbar .suggested-action.button:active, .toolbar .suggested-action.button:hover:active, .suggested-action.button:active, @@ -3518,19 +4484,23 @@ GtkProgressBar.osd.progressbar { .suggested-action.button:checked, .suggested-action.button:hover:checked { text-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15); - icon-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15); + -gtk-icon-shadow: 0 1px shade(@suggested_action_button_shadow, 1.15); } -.suggested-action.button:insensitive, -.suggested-action.button:active *:insensitive, -.suggested-action.button:checked *:insensitive { - icon-shadow: none; +button.suggested-action:disabled, +button.suggested-action:active *:disabled, +button.suggested-action:checked *:disabled, +.suggested-action.button:disabled, +.suggested-action.button:active *:disabled, +.suggested-action.button:checked *:disabled { + -gtk-icon-shadow: none; background-image: none; background-color: @insentitive_bg_color; border: 1px solid @insensitive_borders; } -.suggested-action.button GtkLabel:insensitive { +button.suggested-action label:disabled, +.suggested-action.button GtkLabel:disabled { color: @insensitive_fg_color; text-shadow: none; } @@ -3538,6 +4508,7 @@ GtkProgressBar.osd.progressbar { /****************************** * Destructive action buttons * ******************************/ +button.destructive-action, .destructive-action.button { background-image: linear-gradient(to bottom, @destructive_action_button_a, @@ -3546,12 +4517,17 @@ GtkProgressBar.osd.progressbar { color: @destructive_action_button_fg; } +button.destructive-action:hover, .destructive-action.button:hover { background-image: linear-gradient(to bottom, shade(@destructive_action_button_a, 1.10), shade(@destructive_action_button_b, 1.05)); } +button.destructive-action:active, +button.destructive-action:hover:active, +button.destructive-action:checked, +button.destructive-action:hover:checked, .destructive-action.button:active, .destructive-action.button:hover:active, .destructive-action.button:checked, @@ -3563,22 +4539,29 @@ GtkProgressBar.osd.progressbar { color: @destructive_action_button_fg; } +button.destructive-action, .destructive-action.button { text-shadow: 0 1px @destructive_action_button_shadow; - icon-shadow: 0 1px @destructive_action_button_shadow; + -gtk-icon-shadow: 0 1px @destructive_action_button_shadow; } +button.destructive-action:active, +button.destructive-action:hover:active, +button.destructive-action:checked, +button.destructive-action:hover:checked, .destructive-action.button:active, .destructive-action.button:hover:active, .destructive-action.button:checked, .destructive-action.button:hover:checked { text-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15); - icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15); + -gtk-icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15); } /************************** * Selection Mode classes * **************************/ +headerbar.selection-mode, +toolbar.selection-mode, .selection-mode.header-bar, .selection-mode.toolbar { color: @selection_toolbar_fg; @@ -3594,6 +4577,7 @@ GtkProgressBar.osd.progressbar { text-shadow: 0 1px @selection_toolbar_shadow; } +headerbar.selection-mode, .selection-mode.header-bar { border-top-color: @selection_toolbar_bg_a; border-bottom-color: @selection_toolbar_border; @@ -3601,11 +4585,15 @@ GtkProgressBar.osd.progressbar { box-shadow: inset 0 -1px shade(@selection_toolbar_border, 1.20); } +toolbar.selection-mode, .selection-mode.toolbar { padding: 6px; } /* regular button */ +headerbar.selection-mode button, +toolbar.selection-mode button, +toolbar.selection-mode GtkToolButton button, .selection-mode.header-bar .button, .selection-mode.toolbar .button, .selection-mode.toolbar GtkToolButton .button { @@ -3622,6 +4610,9 @@ GtkProgressBar.osd.progressbar { color: @selection_toolbar_button_fg; } +headerbar.selection-mode button:hover, +toolbar.selection-mode button:hover, +toolbar.selection-mode GtkToolButton button:hover, .selection-mode.header-bar .button:hover, .selection-mode.toolbar .button:hover, .selection-mode.toolbar GtkToolButton .button:hover { @@ -3630,6 +4621,18 @@ GtkProgressBar.osd.progressbar { shade(@selection_toolbar_button_b, 1.02)); } +headerbar.selection-mode button:active, +headerbar.selection-mode button:hover:active, +toolbar.selection-mode button:active, +toolbar.selection-mode button:hover:active, +toolbar.selection-mode GtkToolButton button:active, +toolbar.selection-mode GtkToolButton button:hover:active, +headerbar.selection-mode button:checked, +headerbar.selection-mode button:hover:checked, +toolbar.selection-mode button:checked, +toolbar.selection-mode button:hover:checked, +toolbar.selection-mode GtkToolButton button:checked, +toolbar.selection-mode GtkToolButton button:hover:checked, .selection-mode.header-bar .button:active, .selection-mode.header-bar .button:hover:active, .selection-mode.toolbar .button:active, @@ -3648,6 +4651,12 @@ GtkProgressBar.osd.progressbar { box-shadow: none; } +headerbar.selection-mode button:active, +toolbar.selection-mode button:active, +toolbar.selection-mode GtkToolButton button:active, +headerbar.selection-mode button:checked, +toolbar.selection-mode button:checked, +toolbar.selection-mode GtkToolButton button:checked, .selection-mode.header-bar .button:active, .selection-mode.toolbar .button:active, .selection-mode.toolbar GtkToolButton .button:active, @@ -3657,6 +4666,15 @@ GtkProgressBar.osd.progressbar { color: @selection_toolbar_button_fg; } +headerbar.selection-mode button, +headerbar.selection-mode button:active, +headerbar.selection-mode button:checked, +toolbar.selection-mode button, +toolbar.selection-mode button:active, +toolbar.selection-mode button:checked, +toolbar.selection-mode GtkToolButton button, +toolbar.selection-mode GtkToolButton button:active, +toolbar.selection-mode GtkToolButton button:checked, .selection-mode.header-bar .button, .selection-mode.header-bar .button:active, .selection-mode.header-bar .button:checked, @@ -3667,10 +4685,13 @@ GtkProgressBar.osd.progressbar { .selection-mode.toolbar GtkToolButton .button:active, .selection-mode.toolbar GtkToolButton .button:checked { text-shadow: 0 1px @selection_toolbar_button_shadow; - icon-shadow: 0 1px @selection_toolbar_button_shadow; + -gtk-icon-shadow: 0 1px @selection_toolbar_button_shadow; } /* suggested button */ +headerbar.selection-mode button.suggested-action, +toolbar.selection-mode button.suggested-action, +toolbar.selection-mode GtkToolButton button.suggested-action, .selection-mode.header-bar .suggested-action.button, .selection-mode.toolbar .suggested-action.button, .selection-mode.toolbar GtkToolButton.suggested-action .button { @@ -3688,15 +4709,30 @@ GtkProgressBar.osd.progressbar { color: @theme_text_color; } -.selection-mode.header-bar .suggested-action.button:hover, -.selection-mode.toolbar .suggested-action.button:hover, -.selection-mode.toolbar GtkToolButton.suggested-action .button:hover { +headerbar.selection-mode .suggested-action.button:hover, +toolbar.selection-mode .suggested-action.button:hover, +toolbar.selection-mode GtkToolButton.suggested-action .button:hover, +.selection-mode.header-bar button.suggested-action:hover, +.selection-mode.toolbar button.suggested-action:hover, +.selection-mode.toolbar GtkToolButton button.suggested-action:hover { background-image: linear-gradient(to bottom, shade(@selection_toolbar_suggested_button_a, 1.15), shade(@selection_toolbar_suggested_button_b, 1.15) 40%, @selection_toolbar_suggested_button_c); } +headerbar.selection-mode button.suggested-action:active, +headerbar.selection-mode button.suggested-action:hover:active, +toolbar.selection-mode button.suggested-action:active, +toolbar.selection-mode button.suggested-action:hover:active, +toolbar.selection-mode GtkToolButton button.suggested-action button:active, +toolbar.selection-mode GtkToolButton button.suggested-action button:hover:active, +headerbar.selection-mode button.suggested-action:checked, +headerbar.selection-mode button.suggested-action:hover:checked, +toolbar.selection-mode button.suggested-action:checked, +toolbar.selection-mode button.suggested-action:hover:checked, +toolbar.selection-mode GtkToolButton button.suggested-action button:checked, +toolbar.selection-mode GtkToolButton button.suggested-action button:hover:checked, .selection-mode.header-bar .suggested-action.button:active, .selection-mode.header-bar .suggested-action.button:hover:active, .selection-mode.toolbar .suggested-action.button:active, @@ -3716,6 +4752,12 @@ GtkProgressBar.osd.progressbar { box-shadow: none; } +headerbar.selection-mode button.suggested-action:active, +toolbar.selection-mode button.suggested-action:active, +toolbar.selection-mode GtkToolButton button.suggested-action:active, +headerbar.selection-mode button.suggested-action:checked, +toolbar.selection-mode button.suggested-action:checked, +toolbar.selection-mode GtkToolButton button.suggested-action:checked, .selection-mode.header-bar .suggested-action.button:active, .selection-mode.toolbar .suggested-action.button:active, .selection-mode.toolbar GtkToolButton.suggested-action:active, @@ -3725,6 +4767,15 @@ GtkProgressBar.osd.progressbar { color: @theme_text_color; } +headerbar.selection-mode button.suggested-action, +headerbar.selection-mode button.suggested-action:active, +headerbar.selection-mode button.suggested-action:checked, +toolbar.selection-mode button.suggested-action, +toolbar.selection-mode button.suggested-action:active, +toolbar.selection-mode button.suggested-action:checked, +toolbar.selection-mode GtkToolButton button.suggested-action button, +toolbar.selection-mode GtkToolButton button.suggested-action:active, +toolbar.selection-mode GtkToolButton button.suggested-action:checked, .selection-mode.header-bar .suggested-action.button, .selection-mode.header-bar .suggested-action.button:active, .selection-mode.header-bar .suggested-action.button:checked, @@ -3735,10 +4786,12 @@ GtkProgressBar.osd.progressbar { .selection-mode.toolbar GtkToolButton.suggested-action:active, .selection-mode.toolbar GtkToolButton.suggested-action:checked { text-shadow: 0 1px @button_text_shadow; - icon-shadow: 0 1px @button_text_shadow; + -gtk-icon-shadow: 0 1px @button_text_shadow; } /* menu button */ +headerbar.selection-mode button.selection-menu, +toolbar.selection-mode button.selection-menu, .selection-mode.header-bar .selection-menu.button, .selection-mode.toolbar .selection-menu.button { background-image: none; @@ -3750,11 +4803,17 @@ GtkProgressBar.osd.progressbar { color: @selection_menu_fg; } +toolbar.selection-mode .dim-label, +toolbar.selection-mode button.selection-menu .dim-label, .selection-mode.toolbar .dim-label, .selection-mode.toolbar .selection-menu.button .dim-label { color: @selection_menu_fg; } +headerbar.selection-mode button.selection-menu:hover, +toolbar.selection-mode .dim-label:hover, +toolbar.selection-mode button.selection-menu:hover, +toolbar.selection-mode button.selection-menu .dim-label:hover, .selection-mode.header-bar .selection-menu.button:hover, .selection-mode.toolbar .dim-label:hover, .selection-mode.toolbar .selection-menu.button:hover, @@ -3763,6 +4822,10 @@ GtkProgressBar.osd.progressbar { color: @selection_menu_hover; } +headerbar.selection-mode button.selection-menu:active, +toolbar.selection-mode button.selection-menu:active, +headerbar.selection-mode button.selection-menu:checked, +toolbar.selection-mode button.selection-menu:checked, .selection-mode.header-bar .selection-menu.button:active, .selection-mode.toolbar .selection-menu.button:active, .selection-mode.header-bar .selection-menu.button:checked, @@ -3770,10 +4833,13 @@ GtkProgressBar.osd.progressbar { border-color: transparent; border-radius: 3px; border-width: 1px; - background-color: transparent; } +headerbar.selection-mode button.selection-menu:active, +toolbar.selection-mode button.selection-menu:active, +headerbar.selection-mode button.selection-menu:checked, +toolbar.selection-mode button.selection-menu:checked, .selection-mode.header-bar .selection-menu.button:active, .selection-mode.toolbar .selection-menu.button:active, .selection-mode.header-bar .selection-menu.button:checked, @@ -3781,11 +4847,16 @@ GtkProgressBar.osd.progressbar { color: @selection_menu_active; } +headerbar.selection-mode button.selection-menu, +toolbar.selection-mode button.selection-menu.button, .selection-mode.header-bar .selection-menu.button, .selection-mode.toolbar .selection-menu.button { text-shadow: 0 1px @selection_toolbar_shadow; } +headerbar.selection-mode button.selection-menu menuitem, +toolbar.selection-mode button.selection-menu menuitem, + .selection-mode.header-bar .selection-menu.button .menuitem, .selection-mode.toolbar .selection-menu.button .menuitem { text-shadow: none; @@ -3794,12 +4865,14 @@ GtkProgressBar.osd.progressbar { /**************** * GtkAssistant * ****************/ -GtkAssistant .sidebar .highlight { +assistant .sidebar highlight, +GtkAssistant .sidebar highlight { background-color: transparent; color: @theme_fg_color; font: bold; } +assistant .sidebar, GtkAssistant .sidebar { padding: 12px 18px 12px; @@ -3819,31 +4892,39 @@ GtkAssistant .sidebar { * GtkSwitch * *************/ +switch, GtkSwitch { border-radius: 8px; - padding: 8px; /* 8px to avoid padding list-row issue if active */ + padding: 8px; background-color: transparent; } +switch, +switch:disabled, GtkSwitch.trough, -GtkSwitch.trough:insensitive { +GtkSwitch.trough:disabled { border: none; border-image: none; color: transparent; box-shadow: none; background-color: transparent; - background-size: /*48px 26px*/ 50px 28px; /* Size + 2 to adjust to the padding. */ + background-size: 50px 28px; background-position: center center; background-repeat: no-repeat; text-shadow: none; } /* don't display on/off */ +switch +switch:hover, +switch:disabled:hover, GtkSwitch.trough:hover, -GtkSwitch.trough:insensitive:hover { +GtkSwitch.trough:disabled:hover { color: transparent; } +switch slider, +switch slider:hover, GtkSwitch.slider, GtkSwitch.slider:hover { background-color: transparent; @@ -3854,34 +4935,65 @@ GtkSwitch.slider:hover { /************ * Pathbars * ************/ -.path-bar .button, .path-bar .header-bar .button.titlebutton, .header-bar .path-bar .button.titlebutton, +.path-bar button, +.path-bar headerbar button.titlebutton, +headerbar .path-bar button.titlebutton, +.path-bar .titlebar button.titlebutton, +.titlebar .path-bar button.titlebutton, +.path-bar calendar.header button.titlebutton, +calendar.header .path-bar button.titlebutton, +.path-bar .button, +.path-bar .header-bar .button.titlebutton, +.header-bar .path-bar .button.titlebutton, .path-bar .titlebar .button.titlebutton, .titlebar .path-bar .button.titlebutton, .path-bar GtkCalendar.header .button.titlebutton, GtkCalendar.header .path-bar .button.titlebutton { padding: 5px 6px 6px; } + +.path-bar button:first-child, .path-bar .button:first-child { padding-left: 8px; } + +.path-bar button:last-child, .path-bar .button:last-child { padding-right: 8px; } + +.path-bar button:only-child, .path-bar .button:only-child { padding-left: 12px; padding-right: 12px; } + +.path-bar button label:last-child, .path-bar .button .label:last-child { padding-left: 2px; } + +.path-bar button label:first-child, .path-bar .button .label:first-child { padding-right: 2px; } + +.path-bar button label:only-child, .path-bar .button .label:only-child { padding-right: 0; padding-left: 0; } -.path-bar .button GtkImage, .path-bar .header-bar .button.titlebutton GtkImage, .header-bar .path-bar .button.titlebutton GtkImage, + +.path-bar button GtkImage, +.path-bar headerbar button.titlebutton image, +headerbar .path-bar button.titlebutton image, +.path-bar .titlebar button.titlebutton image, +.titlebar .path-bar button.titlebutton image, +.path-bar calendar.header button.titlebutton image, +calendar.header .path-bar button.titlebutton image +.path-bar .button GtkImage, +.path-bar .header-bar .button.titlebutton GtkImage, +.header-bar .path-bar .button.titlebutton GtkImage, .path-bar .titlebar .button.titlebutton GtkImage, .titlebar .path-bar .button.titlebutton GtkImage, .path-bar GtkCalendar.header .button.titlebutton GtkImage, @@ -3892,69 +5004,77 @@ GtkCalendar.header .path-bar .button.titlebutton GtkImage { /*********************** * Tree and Icon views * ***********************/ -GtkTreeView { - -GtkTreeView-vertical-separator: 0; - - -GtkWidget-focus-line-width: 0; - -GtkWidget-focus-padding: 1; +GtkTreeView, +treeview { + -GtkTreeView-vertical-separator: 0; outline-color: alpha(@theme_text_color, 0.6); } -GtkTreeView.dnd { +GtkTreeView.dnd, +treeview dnd { border-color: @internal_element_color; border-radius: 2px; border-width: 1px; border-style: solid; } -GtkTreeView:selected:focus { +GtkTreeView:selected:focus, +treeview:selected:focus { outline-color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.30); } GtkIconView, -GtkViewport { +GtkViewport, +iconview, +viewport { /* avoid resizing theme thumbnails in mate-appearance-properties */ padding: 0px; } GtkIconView.cell:selected, -GtkIconView.cell:selected:focus { +GtkIconView.cell:selected:focus, +iconview cell:selected, +iconview cell:selected:focus { border-radius: 4px; - - /* FIXME: this probably needs to be better; - * see https://bugzilla.gnome.org/show_bug.cgi?id=644157 - */ outline-color: @treeview_focus_border; outline-style: solid; outline-offset: 3px; } GtkIconView.cell:hover, -GtkIconView.cell:hover:focus { +GtkIconView.cell:hover:focus, +iconview cell:hover, +iconview cell:hover:focus { border-radius: 4px; } +.view text, +textview, .view { background-color: @theme_base_color; color: @theme_text_color; } -.view:insensitive { +.view text selection:disabled, +.view:disabled { background-color: @insensitive_bg_color; color: @insensitive_fg_color; } +.view text selection, .view:selected { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } +.view text selection:hover, .view:hover { background-color: shade (@theme_selected_bg_color, 1.30); color: shade (@theme_selected_bg_color, 0.35); } +.view text selection:backdrop, .view:selected:backdrop { background-color: shade(@theme_unfocused_bg_color, 0.94); color: @theme_fg_color; @@ -3966,10 +5086,6 @@ GtkIconView.cell:hover:focus { color: shade (@theme_selected_bg_color, 0.35); } -.view row:selected:hover { - color: shade (@theme_selected_fg_color, 1.00); -} - .cell { /*color: @theme_text_color;*/ /* Don't use, seems to change hover effect on combobox menuitems */ padding: 2px; @@ -4012,6 +5128,8 @@ row:selected:focus:backdrop { box-shadow: none; } +treeview row:nth-child(even), +treeview row:nth-child(odd), GtkTreeView row:nth-child(even), GtkTreeView row:nth-child(odd) { background-color: shade (@theme_base_color, 1.0); @@ -4020,16 +5138,21 @@ GtkTreeView row:nth-child(odd) { box-shadow: none; } +treeview row:nth-child(odd):hover, +treeview row:nth-child(even):hover, GtkTreeView row:nth-child(odd):hover, GtkTreeView row:nth-child(even):hover { background-color: shade (@theme_selected_bg_color, 1.30); } +treeview row:nth-child(odd):backdrop:hover, +treeview row:nth-child(even):backdrop:hover, GtkTreeView row:nth-child(odd):backdrop:hover, GtkTreeView row:nth-child(even):backdrop:hover { background-color: shade (@theme_base_color, 0.96); } +.sidebar treeview row:backdrop:selected, .sidebar GtkTreeView row:backdrop:selected { background-color: @theme_selected_bg_color; border-style: solid; @@ -4039,40 +5162,56 @@ GtkTreeView row:nth-child(even):backdrop:hover { box-shadow: inset 0 1px 0 alpha (@borders, 0.3), inset 0 -1px 0 @borders; } -/* ie. pluma open dialog */ +/* ie. filechooser dialog */ +.sidebar treeview row:hover, .sidebar GtkTreeView row:hover { background-color: shade (@theme_selected_bg_color, 1.15); color: shade (@theme_selected_bg_color, 0.35); } +.sidebar treeview row:active:hover, +.sidebar treeview row:checked:hover, +.sidebar treeview row:selected:hover, .sidebar GtkTreeView row:active:hover, .sidebar GtkTreeView row:checked:hover, .sidebar GtkTreeView row:selected:hover { color: shade (@theme_selected_fg_color, 1.00); } +treeview header button, column-header.button, column-header .button { color: @theme_fg_color; + border-image: none; } +treeview header button, +treeview header button:disabled, +treeview header button:hover, column-header.button, column-header .button, -column-header.button:insensitive, -column-header .button:insensitive, +column-header.button:disabled, +column-header .button:disabled, column-header.button:hover, column-header .button:hover { padding: 0 4px; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-radius: 0; } -column-header.button:insensitive, -column-header .button:insensitive { +treeview header button:disabled, +treeview header button:disabled, +column-header.button:disabled, +column-header .button:disabled { background-color: @insensitive_bg_color; } +treeview header button:hover, +treeview header button:active, +treeview header button:active:hover, +treeview header button:checked, +treeview header button:checked:hover, column-header.button:hover, column-header .button:hover, column-header.button:active, @@ -4085,10 +5224,11 @@ column-header.button:checked:hover, column-header .button:checked:hover { color: @theme_fg_color; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-radius: 0; } +treeview header button.dnd, column-header .button.dnd { background-color: transparent; background-image: linear-gradient(to bottom, @@ -4120,6 +5260,14 @@ column-header .button.dnd { background-image: none; } +.app-notification button, +.app-notification headerbar button.titlebutton, +headerbar .app-notification button.titlebutton, +.app-notification .titlebar button.titlebutton, +.titlebar .app-notification button.titlebutton, +.app-notification calendar.header button.titlebutton, +calendar.header .app-notification button.titlebutton, +.app-notification.frame button, .app-notification .button, .app-notification .header-bar .button.titlebutton, .header-bar .app-notification .button.titlebutton, @@ -4135,12 +5283,26 @@ GtkCalendar.header .app-notification .button.titlebutton, background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: none; - icon-shadow: 0 1px black; + -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border-radius: 3px; padding: 0 0px 2px 0px; } +.app-notification button.flat, +.app-notification headerbar button.titlebutton, +headerbar .app-notification button.titlebutton, +.app-notification .titlebar button.titlebutton, +.titlebar .app-notification button.titlebutton, +.app-notification calendar.header button.titlebutton, +calendar.header .app-notification button.titlebutton, +.app-notification.frame button.flat, +.app-notification.frame headerbar button.titlebutton, +headerbar .app-notification.frame button.titlebutton, +.app-notification.frame .titlebar button.titlebutton, +.titlebar .app-notification.frame button.titlebutton, +.app-notification.frame calendar.header button.titlebutton, +calendar.header .app-notification.frame button.titlebutton, .app-notification .button.flat, .app-notification .header-bar .titlebutton.button, .header-bar .app-notification .titlebutton.button, @@ -4155,10 +5317,12 @@ GtkCalendar.header .app-notification .titlebutton.button, .titlebar .app-notification.frame .titlebutton.button, .app-notification.frame GtkCalendar.header .titlebutton.button, GtkCalendar.header .app-notification.frame .titlebutton.button { - icon-shadow: 0 1px black; + -gtk-icon-shadow: 0 1px black; text-shadow: 0 1px black; } +.app-notification button:hover, +.app-notification.frame button:hover, .app-notification .button:hover, .app-notification.frame .button:hover { color: white; @@ -4168,11 +5332,19 @@ GtkCalendar.header .app-notification.frame .titlebutton.button { background-clip: padding-box; box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); text-shadow: none; - icon-shadow: 0 1px black; + -gtk-icon-shadow: 0 1px black; outline-color: rgba(238, 238, 236, 0.3); border-radius: 3px; } +.app-notification button:active, +.app-notification button:checked, +.app-notification button:backdrop:active, +.app-notification button:backdrop:checked, +.app-notification.frame button:active, +.app-notification.frame button:checked, +.app-notification.frame button:backdrop:active, +.app-notification.frame button:backdrop:checked, .app-notification .button:active, .app-notification .button:checked, .app-notification .button:backdrop:active, @@ -4188,15 +5360,19 @@ GtkCalendar.header .app-notification.frame .titlebutton.button { background-clip: padding-box; box-shadow: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; outline-color: rgba(238, 238, 236, 0.3); border-radius: 3px; } -.app-notification .button:insensitive, -.app-notification .button:backdrop:insensitive, -.app-notification.frame .button:insensitive, -.app-notification.frame .button:backdrop:insensitive { +.app-notification button:disabled, +.app-notification button:backdrop:disabled, +.app-notification.frame button:disabled, +.app-notification.frame button:backdrop:disabled, +.app-notification .button:disabled, +.app-notification .button:backdrop:disabled, +.app-notification.frame .button:disabled, +.app-notification.frame .button:backdrop:disabled { color: #878989; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, @@ -4204,11 +5380,13 @@ GtkCalendar.header .app-notification.frame .titlebutton.button { background-clip: padding-box; box-shadow: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-radius: 3px; padding: 0px; } +.app-notification button:backdrop, +.app-notification.frame button:backdrop, .app-notification .button:backdrop, .app-notification.frame .button:backdrop { color: #eeeeec; @@ -4218,7 +5396,7 @@ GtkCalendar.header .app-notification.frame .titlebutton.button { background-clip: padding-box; box-shadow: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-radius: 3px; padding: 0px; } @@ -4226,55 +5404,80 @@ GtkCalendar.header .app-notification.frame .titlebutton.button { /************* * Expanders * *************/ +treeview.view expander, GtkTreeView.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); color: @theme_fg_color; } + +treeview.view expander:dir(rtl), GtkTreeView.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } + +treeview.view expander:hover, GtkTreeView.view.expander:hover { color: @theme_fg_color; } + +treeview.view expander:selected, GtkTreeView.view.expander:selected { color: @theme_selected_fg_color; } + +treeview.view expander:selected:hover, GtkTreeView.view.expander:selected:hover { color: @theme_selected_fg_color; } + +treeview.view expander:checked, GtkTreeView.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } +expander arrow, GtkExpander { + min-width: 16px; + min-height: 16px; -gtk-icon-style: regular; -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } + +expander arrow:dir(rtl), GtkExpander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } + +expander arrow:hover, GtkExpander:hover { color: @internal_element_color; } + +expander arrow:checked, GtkExpander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } +expander, .expander { color: @theme_fg_color; border-color: @theme_fg_color; } +expander:active, .expander:active { color: @theme_fg_color; border-color: @theme_fg_color; } +expander:hover, .expander:hover { color: @internal_element_color; border-color: @internal_element_color; } +expander row:selected, +expander row:selected:focus, .expander row:selected, .expander row:selected:focus { color: @expander_row_selected_color; @@ -4286,6 +5489,8 @@ GtkExpander:checked { box-shadow: none; } +expander row:selected:hover, +expander row:selected:focus:hover, .expander row:selected:hover, .expander row:selected:focus:hover { color: @theme_selected_fg_color; @@ -4296,10 +5501,13 @@ GtkExpander:checked { * List boxes * **************/ +list, .list { background-color: @list_box_bg; } +list row, +list row.activatable, .list-row { padding: 2px; transition: all 200ms ease-in; @@ -4307,14 +5515,22 @@ GtkExpander:checked { background-color: @theme_base_color; } +list row:hover, +list row.activatable:hover, .list-row:hover { + padding: 2px; background-image: none; background-color: shade (@theme_selected_bg_color, 1.55); color: shade (@theme_selected_bg_color, 0.35); } +list row:selected, +list row:selected:hover, +list row.activatable:selected, +list row.activatable:selected:hover, .list-row:selected, .list-row:selected:hover { + padding: 2px; border-width: 0; border-style: solid; border-color: shade (@theme_selected_bg_color, 0.85); @@ -4326,8 +5542,13 @@ GtkExpander:checked { color: @theme_selected_fg_color; } +list row:selected:backdrop, +list row:selected:backdrop:hover, +list row.activatable:selected:backdrop, +list row.activatable:selected:backdrop:hover, .list-row:selected:backdrop, .list-row:selected:backdrop:hover { + padding: 2px; border-width: 0; border-style: solid; border-color: shade (@theme_bg_color, 0.85); @@ -4339,43 +5560,51 @@ GtkExpander:checked { box-shadow: none; } +list row button, .list-row.button { - border-color: transparent; - background-color: @theme_base_color; - background-image: none; - box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); - text-shadow: none; - icon-shadow: none; - border-image: none; - border-radius: 0; - border: none; + border-color: transparent; + background-color: @theme_base_color; + background-image: none; + box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); + text-shadow: none; + -gtk-icon-shadow: none; + border-image: none; + border-radius: 0; + border: none; } +list row button:selected, +list row button:selected:hover, +list row button:active, +list row button:checked, +list row button:active:hover, +list row button:checked:hover, .list-row.button:selected, .list-row.button:selected:hover, .list-row.button:active, .list-row.button:checked, .list-row.button:active:hover, .list-row.button:checked:hover { - background-color: @theme_selected_bg_color; - background-image: linear-gradient(to bottom, - shade (@theme_selected_bg_color, 1.0), - shade (@theme_selected_bg_color, 0.85)); + background-color: @theme_selected_bg_color; + background-image: linear-gradient(to bottom, + shade (@theme_selected_bg_color, 1.0), + shade (@theme_selected_bg_color, 0.85)); color: @theme_selected_fg_color; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-radius: 0px; border-image: none; border-style: solid; border-width: 0px; } +list row button:hover, .list-row.button:hover { - background-image: none; - background-color: shade (@theme_selected_bg_color, 1.55); - color: shade (@theme_selected_bg_color, 0.35); + background-image: none; + background-color: shade (@theme_selected_bg_color, 1.55); + color: shade (@theme_selected_bg_color, 0.35); text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-image: none; border-radius: 0px; border-style: solid; @@ -4385,10 +5614,12 @@ GtkExpander:checked { * Calendar * **************/ +calendar, GtkCalendar { padding: 2px; } +calendar.view, GtkCalendar.view { border-radius: 3px; border-style: solid; @@ -4396,6 +5627,7 @@ GtkCalendar.view { padding: 2px; } +calendar.header, GtkCalendar.header { border-radius: 0; background-image: linear-gradient(to bottom, @@ -4404,12 +5636,16 @@ GtkCalendar.header { border-width: 0; } +calendar button, +calendar button:disabled, GtkCalendar.button, -GtkCalendar.button:insensitive { +GtkCalendar.button:disabled { background-image: none; background-color: transparent; } +highlight, +calendar.highlight, .highlight, GtkCalendar.highlight { background-color: @theme_selected_bg_color; @@ -4423,6 +5659,7 @@ GtkCalendar.highlight { * GtkAboutDialog * ******************/ +dialog.background dialog-vbox.vertical .vertical, GtkAboutDialog.background .vertical.dialog-vbox GtkGrid.vertical { background: transparent; } @@ -4430,6 +5667,7 @@ GtkAboutDialog.background .vertical.dialog-vbox GtkGrid.vertical { /************** * GtkInfoBar * **************/ +infobar, GtkInfoBar { border-width: 0; border-style: none; @@ -4445,14 +5683,22 @@ GtkInfoBar { border-color: darker(@infobar_bg_color); } +.info button.close, +.warning button.close, +.question button.close, +.error button.close, .info .button.close, .warning .button.close, .question .button.close, .error .button.close { color: @theme_fg_color; - icon-shadow: none; + -gtk-icon-shadow: none; } +.info button.close:hover, +.warning button.close:hover, +.question button.close:hover, +.error button.close:hover, .info .button.close:hover, .warning .button.close:hover, .question .button.close:hover, @@ -4463,6 +5709,10 @@ GtkInfoBar { alpha(black, 0.02)); } +.info button.close:active, +.warning button.close:active, +.question button.close:active, +.error button.close:active, .info .button.close:active, .warning .button.close:active, .question .button.close:active, @@ -4473,28 +5723,52 @@ GtkInfoBar { transparent); } +entry.info, +entry.info:focus, +.info button, +.info button:disabled, +.info button:active, +.info button:checked, +entry.warning, +entry.warning:focus, +.warning button, +.warning button:disabled, +.warning button:active, +.warning button:checked, +entry.error, +entry.error:focus, +.error button, +.error button:disabled, +.error button:active, +.error button:checked, +entry.question, +entry.question:focus, +.question button, +.question button:disabled, +.question button:active, +.question button:checked. .info .entry, .info .entry:focus, .info .button, -.info .button:insensitive, +.info .button:disabled, .info .button:active, .info .button:checked, .warning .entry, .warning .entry:focus, .warning .button, -.warning .button:insensitive, +.warning .button:disabled, .warning .button:active, .warning .button:checked, .error .entry, .error .entry:focus, .error .button, -.error .button:insensitive, +.error .button:disabled, .error .button:active, .error .button:checked, .question .entry, .question .entry:focus, .question .button, -.question .button:insensitive, +.question .button:disabled, .question .button:active, .question .button:checked { color: @theme_fg_color; @@ -4515,6 +5789,7 @@ GtkInfoBar { /************* * Popovers * *************/ +popover, .popover { background-clip: initial; margin: 10px; @@ -4526,9 +5801,27 @@ GtkInfoBar { background-color: @menu_bg_color; box-shadow: 0 1px 5px @wm_shadow; text-shadow: none; - icon-shadow: none; -} - + -gtk-icon-shadow: none; +} + +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 > search-bar popover.osd > search-bar, +popover > .location-bar popover.osd > searchbar, +popover > toolbar popover.osd > .location-bar, +popover > .inline-toolbar popover.osd > .location-bar, +popover > searchbar popover.osd > .location-bar, +popover > .location-bar popover.osd > .location-bar, .popover > .list, .popover > .view, .popover > .toolbar .popover.osd > .toolbar, @@ -4551,16 +5844,18 @@ GtkInfoBar { background-color: transparent; } +popover separator, .popover .separator { font-size: 80%; font-weight: bold; color: alpha(@theme_fg_color,0.1); text-shadow: none; background-color: transparent; - icon-shadow: none; + -gtk-icon-shadow: none; border: 0; } +popover.osd, .popover.osd { background-image: none; background-color: alpha(shade(#3D3E40, 0.85), 0.75); @@ -4568,24 +5863,34 @@ GtkInfoBar { box-shadow: none; color: @theme_selected_fg_color; } + +popover.osd toolbar, .popover.osd .toolbar { background-image: none; background-color: transparent; border: none; box-shadow: none; } + +popover.osd button, .popover.osd .button { text-shadow: 0 -1px @osd_text_shadow; - icon-shadow: 0 -1px @osd_text_shadow; + -gtk-icon-shadow: 0 -1px @osd_text_shadow; } + +popover.osd button:active, +popover button:checked, .popover.osd .button:active, .popover.osd .button:checked { box-shadow: none; } -.popover.osd .button:insensitive { + +popover.osd button:disabled, +.popover.osd .button:disabled { color: alpha(@theme_selected_fg_color, 0.4); } +popover list, .popover .list { background-color: @theme_base_color; } @@ -4595,20 +5900,38 @@ GtkModelButton.button { border-radius: 0; } +modelbutton:checked, +modelbutton:active, +modelbutton:disabled, +modelbutton:active:disabled, +modelbutton:checked:disabled, +modelbutton, +modelbutton:focus, +modelbutton:active:focus, +modelbutton:checked:focus, +modelbutton.flat:checked, +modelbutton.flat:active, +modelbutton.flat:disabled, +modelbutton.flat:active:disabled, +modelbutton.flat:checked:disabled, +modelbutton.flat, +modelbutton.flat:focus, +modelbutton.flat:active:focus, +modelbutton.flat:checked:focus, GtkModelButton.button:checked, GtkModelButton.button:active, -GtkModelButton.button:insensitive, -GtkModelButton.button:active:insensitive, -GtkModelButton.button:checked:insensitive, +GtkModelButton.button:disabled, +GtkModelButton.button:active:disabled, +GtkModelButton.button:checked:disabled, GtkModelButton.button, GtkModelButton.button:focus, GtkModelButton.button:active:focus, GtkModelButton.button:checked:focus, GtkModelButton.button.flat:checked, GtkModelButton.button.flat:active, -GtkModelButton.button.flat:insensitive, -GtkModelButton.button.flat:active:insensitive, -GtkModelButton.button.flat:checked:insensitive, +GtkModelButton.button.flat:disabled, +GtkModelButton.button.flat:active:disabled, +GtkModelButton.button.flat:checked:disabled, GtkModelButton.button.flat, GtkModelButton.button.flat:focus, GtkModelButton.button.flat:active:focus, @@ -4622,6 +5945,14 @@ GtkModelButton.button.flat:checked:focus { border-radius: 2px; } +modelbutton:checked:hover, +modelbutton:active:hover, +modelbutton:hover, +modelbutton:selected, +modelbutton.flat:checked:hover, +modelbutton.flat:active:hover, +modelbutton.flat:hover, +modelbutton.flat:selected, GtkModelButton.button:checked:hover, GtkModelButton.button:active:hover, GtkModelButton.button:hover, @@ -4641,6 +5972,9 @@ GtkModelButton.button.flat:selected { } /* middle button*/ +.linked modelbutton:hover, +.linked modelbutton:active:hover, +.linked modelbutton:checked:hover, .linked GtkModelButton.button:hover, .linked GtkModelButton.button:active:hover, .linked GtkModelButton.button:checked:hover { @@ -4650,6 +5984,9 @@ GtkModelButton.button.flat:selected { } /* left button*/ +.linked modelbutton:hover:first-child, +.linked modelbutton:active:hover:first-child, +.linked modelbutton:checked:hover:first-child, .linked GtkModelButton.button:hover:first-child, .linked GtkModelButton.button:active:hover:first-child, .linked GtkModelButton.button:checked:hover:first-child { @@ -4658,6 +5995,9 @@ GtkModelButton.button.flat:selected { } /* right button*/ +.linked modelbutton:hover:last-child, +.linked modelbutton:active:hover:last-child, +.linked modelbutton:checked:hover:last-child, .linked GtkModelButton.button:hover:last-child, .linked GtkModelButton.button:active:hover:last-child, .linked GtkModelButton.button:checked:hover:last-child { @@ -4665,6 +6005,7 @@ GtkModelButton.button.flat:selected { border-radius: 0 3px 3px 0; } +popover button.default.suggested-action.text-button, .popover .button.default.suggested-action.text-button { background-color: @menu_bg_color; color: @theme_fg_color; @@ -4676,11 +6017,14 @@ GtkModelButton.button.flat:selected { border-radius: 2px; } +popover button.default.suggested-action.text-button:hover, .popover .button.default.suggested-action.text-button:hover { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } +entry cursor-handle, +cursor-handle, .entry.cursor-handle, .cursor-handle { background-color: transparent; @@ -4689,14 +6033,20 @@ GtkModelButton.button.flat:selected { border-style: none; } +entry cursor-handle.top, +cursor-handle.top, .entry.cursor-handle.top, .cursor-handle.top { -gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); + color: @menu_controls_color; } +entry cursor-handle.bottom, +cursor-handle.bottom, .entry.cursor-handle.bottom, .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); + color: @menu_controls_color; } /******* @@ -4737,13 +6087,7 @@ GtkModelButton.button.flat:selected { color: @theme_unfocused_fg_color; } -.titlebar .titlebutton { - color: @wm_title; - padding: 4px 5px; -/* border: none; - border-image: none;*/ -} - +.titlebar button.titlebutton, .titlebar .titlebutton { color: @wm_title; padding: 2px 6px 3px 3px; @@ -4754,11 +6098,15 @@ GtkModelButton.button.flat:selected { -gtk-icon-style: requested; } +.titlebar button.titlebutton:hover, .titlebar .titlebutton:hover { border: none; border-image: none; } +.titlebar button.titlebutton:active, +.titlebar button.titlebutton:checked, +.titlebar button.titlebutton:checked:checked, .titlebar .titlebutton:active, .titlebar .titlebutton:checked, .titlebar .titlebutton:checked:checked { @@ -4766,16 +6114,19 @@ GtkModelButton.button.flat:selected { border-image: none; } +.titlebar button.titlebutton:backdrop, .titlebar .titlebutton:backdrop { color: @wm_unfocused_title; - icon-shadow: none; + -gtk-icon-shadow: none; } /* workaround to avoid unwanted black frames if switching compositor on/off */ +.background decoration, .background .window-frame { box-shadow: none; } +.background.csd decoration, .background.csd .window-frame { border-radius: 6px 6px 0px 0px; border-width: 0px; @@ -4785,20 +6136,25 @@ GtkModelButton.button.flat:selected { } /* workaround to avoid unwanted black frames if switching compositor on/off */ +decoration:backdrop, .window-frame:backdrop { /* box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;*/ box-shadow: none; } +.tiled decoration, .window-frame.tiled { border-radius: 0; background-color: @theme_bg_color; } +.ssd decoration, +decoration.ssd, .window-frame.ssd { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); } +.solid-csd decoration, .window-frame.solid-csd { border-radius: 0; margin: 2px; @@ -4807,26 +6163,85 @@ GtkModelButton.button.flat:selected { box-shadow: none; } +.csd.popup decoration, .window-frame.csd.popup { border-radius: 0; box-shadow: none; } +tooltip.csd decoration, .window-frame.csd.tooltip { border-radius: 5px; box-shadow: 0 1px 5px @wm_shadow; } +messagedialog.csd decoration, .window-frame.csd.message-dialog { border-radius: 7px; box-shadow: 0 1px 5px @wm_shadow; } /* print dialog */ +printdialog.background .vertical.view.dialog-vbox, GtkPrintUnixDialog.background .vertical.view.dialog-vbox { background-color: shade (@theme_bg_color, 1.1) } +/* filechooser dialog */ +filechooser revealer .vertical.view { + background-color: @theme_bg_color; + border-style: solid; + border-width: 1px 1px 0px 1px; + border-color: @borders; +} + +filechooser placessidebar.sidebar.frame { + border-style: solid; +} + +/* calendar */ +/* this makes no sense for gtk+-3.20 :) */ +calendar.button { + background-image: none; +} + +calendar { + border-color: @borders; +} + +/********* + * Paned * + *********/ + +/* the small line between sidebar and view */ +paned > separator { + min-width: 3px; + min-height: 3px; + -gtk-icon-source: none; + border-style: none; + background-color: @theme_bg_color; + background-size: 1px 1px; + } + +paned > separator:hover, +paned > separator:selected { + background-color: transparent; +} + +paned > separator:backdrop { +} + +paned > separator.wide { + margin: 0; + padding: 0; + min-width: 5px; + min-height: 5px; + background-size: 1px 1px, 1px 1px; +} + +paned > separator.wide:backdrop { +} + /* Various hacks and shit */ /* FIXME - BELOW: Some stuff that can probably be done better or in another way */ @@ -4882,11 +6297,7 @@ GtkPrintUnixDialog.background .vertical.view.dialog-vbox { .floating-bar .button { background-color: alpha (@theme_base_color, 0.0); background-image: none; - border-style: none; border-image: none; - - -GtkButton-image-spacing: 0; - -GtkButton-inner-border: 0; } diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css index 719c0837..cc09cce1 100644 --- a/desktop-themes/Menta/gtk-3.0/mate-applications.css +++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css @@ -2,74 +2,15 @@ * CAJA File manager * *********************/ -/* for breadcrumbs path bar */ - -.caja-pathbar-button, -CajaPathbarButton { - background-image: -gtk-gradient(linear, left top, left bottom, - color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)), - color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)), - color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)), - color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90))); - border-color: #979797; - color: @theme_fg_color; - -CajaPathbarButton-border-radius: 3px; -} - -CajaPathbarButton:active { - background-image: -gtk-gradient(linear, left top, left bottom, - color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)), - color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)), - color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0))); -} - -CajaPathbarButton:hover { - background-image: -gtk-gradient(linear, left top, left bottom, - color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)), - color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)), - color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)), - color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85))); -} - -CajaPathbarButton:active:hover { - background-image: -gtk-gradient(linear, left top, left bottom, - color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)), - color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)), - color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25))); -} - - -/* For Places Sidebar diskfull indicators */ - -CajaPlacesTreeView { - -CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65); - -CajaPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0); - -CajaPlacesTreeView-disk-full-bar-width: 2px; - -CajaPlacesTreeView-disk-full-bar-radius: 1px; - -CajaPlacesTreeView-disk-full-bottom-padding: 1px; - -CajaPlacesTreeView-disk-full-max-length: 70px; -} - -CajaPlacesTreeView:selected { - -CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0); - -CajaPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0); -} - -CajaPlacesTreeView:hover { -} - -CajaPlacesTreeView:selected:hover { -} - /* Caja places combobox */ -CajaWindow .button.flat { +.caja-navigation-window .caja-side-pane button.flat { background-color: transparent; background-image: linear-gradient(to bottom, @button_gradient_color_a, @button_gradient_color_b); } -CajaWindow .button.flat:first-child { +.caja-navigation-window .caja-side-pane button.flat:first-child { transition: all 400ms ease-out; border-radius: 3px 0 0 3px; border-right-width: 0; @@ -77,7 +18,7 @@ CajaWindow .button.flat:first-child { border-image: url("borders/button.png") 3 4 4 3 / 3px 0px 4px 3px stretch; } -CajaWindow .button.flat:last-child { +.caja-navigation-window .caja-side-pane button.flat:last-child { transition: all 400ms ease-out; border-radius: 0 3px 3px 0; border-left-width: 0; @@ -85,14 +26,14 @@ CajaWindow .button.flat:last-child { border-image: url("borders/button.png") 3 3 4 4 / 3px 3px 4px 0px stretch; } -CajaWindow .button.flat:hover { +.caja-navigation-window .caja-side-pane button.flat:hover { background-color: transparent; background-image: linear-gradient(to bottom, @button_hover_gradient_color_a, @button_hover_gradient_color_b); } -CajaWindow .button.flat:hover:first-child { +.caja-navigation-window .caja-side-pane button.flat:hover:first-child { border-radius: 6px 0 0 6px; border-right-width: 0; background-color: transparent; @@ -102,7 +43,7 @@ CajaWindow .button.flat:hover:first-child { border-image: url("borders/button.png") 3 3 4 3 / 3px 0px 4px 3px stretch; } -CajaWindow .button.flat:hover:last-child { +.caja-navigation-window .caja-side-pane button.flat:hover:last-child { border-radius: 0 6px 6px 0; border-left-width: 0; background-color: transparent; @@ -114,9 +55,9 @@ CajaWindow .button.flat:hover:last-child { /* some overrides for button.flat */ /* zoom button */ -CajaWindow .primary-toolbar .button.flat, -CajaWindow .primary-toolbar .button.flat:first-child, -CajaWindow .primary-toolbar .button.flat:last-child { +.caja-navigation-window toolbar.primary-toolbar button.flat, +.caja-navigation-window toolbar.primary-toolbar button.flat:first-child, +.caja-navigation-window toolbar.primary-toolbar button.flat:last-child { transition: all 400ms ease-out; border-width: 3px; background-color: transparent; @@ -127,7 +68,7 @@ CajaWindow .primary-toolbar .button.flat:last-child { } /* zoom button */ -CajaWindow .primary-toolbar .button.flat:hover { +.caja-navigation-window toolbar.primary-toolbar button.flat:hover { border-width: 3px; background-color: transparent; background-image: linear-gradient(to bottom, @@ -137,44 +78,31 @@ CajaWindow .primary-toolbar .button.flat:hover { } /* ComboBox views */ -CajaWindow .toolbar GtkComboBox .button { - background-image: linear-gradient(to bottom, - shade (@theme_bg_color, 1.0), - shade (@theme_bg_color, 0.96)); - padding: 4px 4px; -} - -CajaWindow .toolbar GtkComboBox .button:hover { +.caja-navigation-window toolbar.primary-toolbar combobox button.combo { background-image: linear-gradient(to bottom, @button_gradient_color_a, @button_gradient_color_b); border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch; - padding: 4px 4px; + padding: 6px 4px; } -/* to avoid padding when executing toogle button */ -CajaLocationBar .entry { - padding: 4px; -} - -/* the small line between sidebar and view */ -CajaWindow GtkPaned.horizontal { - -GtkPaned-handle-size: 3px; - border-color: transparent; - background-color: @theme_bg_color; +.caja-navigation-window toolbar.primary-toolbar combobox button.combo:hover { + background-image: linear-gradient(to bottom, + @button_hover_gradient_color_a, + @button_hover_gradient_color_b); + border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch; + padding: 6px 4px; } -/* caja sidebar */ -CajaWindow FMTreeView .view, -CajaWindow CajaNotesViewer .view, -CajaWindow CajaPlacesSidebar .view, -CajaWindow CajaHistorySidebar .view, -CajaWindow CajaInformationPanel GtkVBox, -CajaWindow CajaEmblemSidebar GtkViewport { +/* 3.20 emblems are broken */ +/* places, treeview, history, information and notes */ +.caja-side-pane treeview.view, +.caja-side-pane textview.view text { background-color: shade (@theme_bg_color, 1.08); color: @theme_fg_color; } +.caja-side-pane treeview.view:selected:hover, CajaWindow CajaPlacesSidebar .view row:active:hover, CajaWindow CajaPlacesSidebar .view row:checked:hover, CajaWindow CajaPlacesSidebar .view row:selected:hover, @@ -187,46 +115,29 @@ CajaWindow FMTreeView .view row:selected:hover { color: shade (@theme_selected_fg_color, 1.00); } +.caja-side-pane treeview.view:hover, CajaWindow CajaPlacesSidebar .view row:hover, CajaWindow FMTreeView .view row:hover, CajaWindow CajaHistorySidebar .view row:hover { background-color: shade (@theme_selected_bg_color, 1.15); - color: shade (@theme_selected_bg_color, 0.35); + color: shade (@theme_selected_fg_color, 1.00); } +/* What is that? */ CajaWindow .rubberband, CajaWindow .view.rubberband { background-color: alpha (@theme_selected_bg_color, 0.35); } -CajaWindow CajaPlacesSidebar .frame { - border-right-width: 1px; - border-style: solid; - border-color: shade (@theme_bg_color, 0.90); - border-left: none; - border-top: none; - border-bottom: none; -} - /* moved eject button to left better for overlay scrollbars */ +.caja-side-pane treeview.view, CajaWindow CajaPlacesSidebar .view row { - padding: 0px 4px 0px 0px; -} - -CajaWindow CajaPlacesSidebar row:selected { - color: @theme_selected_fg_color; -} - -CajaWindow CajaPlacesSidebar row:backdrop:selected { - color: @theme_fg_color; - text-shadow: none; -} - -CajaWindow CajaPlacesSidebar row:hover { - background-color: shade (@theme_bg_color, 0.97); + padding: 1px 4px 1px 0px; } /* better for overlay scrollbars */ +.caja-side-pane treeview.view .vertical.scrollbar.overlay-indicator, +.caja-side-pane textview.view text .vertical.scrollbar.overlay-indicator, CajaWindow FMTreeView .vertical.scrollbar.overlay-indicator, CajaWindow CajaNotesViewer .vertical.scrollbar.overlay-indicator, CajaWindow CajaPlacesSidebar .vertical.scrollbar.overlay-indicator, @@ -235,21 +146,87 @@ CajaWindow CajaHistorySidebar .vertical.scrollbar.overlay-indicator { -GtkRange-slider-width: 11; } +.caja-side-pane notebook { + border-style: none; +} + +/* view and desktop mode */ .caja-canvas-item { border-radius: 3px; + color: @theme_fg_color; +} + +.caja-canvas-item:active, +.caja-canvas-item:selected { + color: @theme_selected_fg_color; +} + +/* view mode */ + +/* list view 3.20 */ +.caja-notebook treeview.view, +/* view and compact 3.20 */ +.caja-notebook scrolledwindow.frame { + background-color: @theme_base_color; +} + +/* rows in listview */ +.caja-notebook treeview.view:selected, +.caja-notebook treeview.view:selected:hover { + background-color: @theme_selected_bg_color; +} + +.caja-notebook treeview.view:hover { + background-color: shade (@theme_selected_bg_color, 1.55); + color: shade (@theme_selected_bg_color, 0.35); } -/* view */ +.caja-notebook .caja-canvas-item, CajaNavigationWindow.background .view.caja-canvas-item { color: @theme_fg_color; } +.caja-notebook .caja-canvas-item:active, +.caja-notebook .caja-canvas-item:selected, CajaNavigationWindow.background .view.caja-canvas-item:active, CajaNavigationWindow.background .view.caja-canvas-item:selected { color: @theme_selected_fg_color; } +.caja-notebook { + border-style: none; +} + +.caja-notebook frame { + border-width: 1px 1px 0 1px; +} + /* desktop mode */ +/* 3.20 */ +/* desktop */ +.caja-desktop.caja-canvas-item { + color: @theme_selected_fg_color; + text-shadow: 1px 1px alpha (#000000, 0.8); +} + +.caja-desktop.caja-canvas-item:selected { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; + text-shadow: none; +} + +.caja-desktop.caja-canvas-item:active, +.caja-desktop.caja-canvas-item:hover { + text-shadow: none; +} + +.caja-desktop EelEditableLabel.entry { + border-image: none; + border-width: 1px; + text-shadow: none; +} + +/* CajaDesktopWindow.background FMIconContainer.view EelEditableLabel.entry { border-image: none; border-width: 1px; @@ -267,23 +244,25 @@ CajaDesktopWindow.background .caja-canvas-item:selected { } CajaDesktopWindow.background .caja-canvas-item:active, -CajaDesktopWindow.background .caja-canvas-item:prelight, +CajaDesktopWindow.background .caja-canvas-item:hover, CajaDesktopWindow.background .caja-canvas-item:selected { text-shadow: none; } - +*/ /* inactive pane */ - +/* not implemented yet *//* .caja-inactive-pane .view { background-color: shade(@theme_base_color, 0.9); } +*/ /* Toolbar */ -CajaWindow .toolbar .button { +.caja-navigation-window toolbar button { border-image: none; } /* Misc */ +.caja-navigation-window notebook, CajaView.frame, CajaNotebook.notebook { border-right-width: 0; @@ -291,86 +270,82 @@ CajaNotebook.notebook { border-bottom-width: 0; } +.caja-navigation-window notebook tab, CajaNotebook.notebook tab.top, CajaNotebook.notebook tab.bottom { border-right-width: 1px; border-left-width: 1px; } +.caja-navigation-window notebook, CajaNotebook .frame { border-width: 1px 0 0 0; } /* close button styling */ /* surpress styling of close button */ +.caja-navigation-window notebook tab button.flat, +.caja-navigation-window notebook tab button.flat:hover, CajaWindow .notebook tab .button.flat, CajaWindow .notebook tab .button.flat:hover { border-color: transparent; background-color: transparent; background-image: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-image: none; } +.caja-navigation-window notebook tab, CajaWindow .notebook tab.top { - padding: 6px 3px 6px 0px; + padding: 4px 3px 4px 0px; } +/* do we have this style class? */ .caja-cluebar-label { font: normal; text-shadow: 0 1px shade (@cluebar_color, 1.06); } -CajaSearchBar .horizontal .entry { +/* to avoid padding when executing toogle button */ +.caja-search-bar entry, +.caja-location-entry, +CajaSearchBar .horizontal .entry, +CajaLocationBar .entry { padding: 4px; } -CajaTrashBar.info, -CajaXContentBar.info, -CajaSearchBar.info, -CajaQueryEditor.info { +.caja-navigation-window statusbar frame { + border-style: none; +} + +#caja-extra-view-widget { + background-color: shade (@theme_bg_color, 1.04); background-color: @cluebar_color; border-bottom-color: shade (@cluebar_color, 0.92); - border-radius: 0; + border-radius: 0px; border-style: solid; - border-width: 0px 0px 1px 0px; + border-width: 0px; + border-color: @borders; color: @theme_fg_color; } -CajaTrashBar .button, -CajaXContentBar .button, -CajaSearchBar .button, -CajaQueryEditor .button { - border-radius: 0; -} - /**************** * Mate-Panel * ****************/ /* first make all transparent */ -PanelToplevel.background.horizontal { +.mate-panel-menu-bar, +.mate-panel-menu-bar menubar, +#PanelApplet-window-menu-applet-button { background-color: transparent; -} - -WnckSelector.menubar, -PanelMenuBar.menubar, -WnckSelector GtkMenuItem, -PanelMenuBar GtkMenuItem, -MatePanelApplet GtkToggleButton.button { border-image: none; background-image: none; background-color: transparent; box-shadow: none; } -/* let's started */ -/* the panel bar itself */ -PanelToplevel.background.horizontal { - background-color: @theme_bg_color; -} - +/* let's start it */ .mate-panel-menu-bar { background-color: @theme_bg_color; background-image: none; @@ -386,18 +361,8 @@ PanelToplevel.background.horizontal { box-shadow: none; } -/* panel grip */ -PanelToplevel.background { - border-radius: 2px; -/* enable for making borders visible */ -/* box-shadow: inset 0px 1px shade (@theme_bg_color, 1.0), - inset 1px 0px shade (@theme_bg_color, 1.0), - inset -1px 0px shade (@theme_bg_color, 1.0), - inset 0px -1px shade (@theme_bg_color, 1.0); */ -} - /* hide buttons */ -PanelToplevel.background .button { +.mate-panel-menu-bar button { background: transparent; border-image: none; border-radius: 2px; @@ -406,8 +371,8 @@ PanelToplevel.background .button { box-shadow: none; } -PanelToplevel.background .button:hover, -PanelToplevel.background .button:hover:active { +.mate-panel-menu-bar button:hover, +.mate-panel-menu-bar button:hover:active { background-image: linear-gradient(to bottom, shade (@theme_selected_bg_color, 0.86), shade (@theme_selected_bg_color, 0.26)); @@ -417,11 +382,10 @@ PanelToplevel.background .button:hover:active { border-width: 0px; } -MatePanelApplet { +#PanelApplet { border-width: 0; } -MatePanelAppletFrameDBus PanelSeparator, PanelSeparator { border-width: 0; background-color: @theme_bg_color; @@ -429,7 +393,7 @@ PanelSeparator { text-shadow: none; } -/* the grid left from wnckpager and wncktasklist */ +/* the grid left from na-tray and wncktasklist */ MatePanelAppletFrameDBus { background-image: -gtk-scaled(url("assets/panel-grid.svg")); background-color: transparent; @@ -439,13 +403,13 @@ MatePanelAppletFrameDBus { /* main menu */ /* set normal menubar button */ -PanelMenuBar.menubar .menuitem { +.mate-panel-menu-bar menubar menuitem { transition: all 200ms ease-out; text-shadow: none; } /* set selected menubar button */ -PanelMenuBar.menubar .menuitem:hover { +.mate-panel-menu-bar menubar menuitem:hover { background-image: linear-gradient(to bottom, shade (@theme_selected_bg_color, 0.86), shade (@theme_selected_bg_color, 0.26)); @@ -456,22 +420,22 @@ PanelMenuBar.menubar .menuitem:hover { border-radius: 5px; } -/* set menubar menuitem separator */ -PanelMenuBar.menubar .menu .menuitem.separator { +/* set menubar menuitem separator , does not work */ +.mate-panel-menu-bar menubar menu menuitem separator { color: @menu_separator; - -GtkMenuItem-horizontal-padding: 0; +/* -GtkMenuItem-horizontal-padding: 0; deprecated */ } /* set normal menubar menuitem */ -PanelMenuBar.menubar .menu .menuitem { +.mate-panel-menu-bar menubar menu menuitem { transition: all 150ms ease-out; padding: 6px; } /* set selected menubar menuitem */ -PanelMenuBar.menubar .menu .menuitem:checked:hover, -PanelMenuBar.menubar .menu .menuitem:active:hover, -PanelMenuBar.menubar .menu .menuitem:hover { +.mate-panel-menu-bar menubar menu menuitem:checked:hover, +.mate-panel-menu-bar menubar menu menuitem:active:hover, +.mate-panel-menu-bar menubar menu menuitem:hover { background-image: linear-gradient(to bottom, shade (@theme_selected_bg_color, 1.0), shade (@theme_selected_bg_color, 0.85)); @@ -482,32 +446,14 @@ PanelMenuBar.menubar .menu .menuitem:hover { border-radius: 0px; } -/* mate menu */ - -/* Mate menu button hover */ -PanelMenuButton.button:hover { - color: shade (@theme_selected_bg_color, 1.00); -} - -/* Mate menu menuitem */ -PanelMenuButton .menu .menuitem { - padding: 6px; -} - -/* Mate menu menuitem separator */ -PanelMenuButton .menu .menuitem.separator { - color: @menu_separator; - -GtkMenuItem-horizontal-padding: 0; -} - -/* desktop-applet, clockapplet, drivemount, character-map, -dictionary */ -MatePanelApplet .button, -MatePanelApplet .button.flat { +/* all applets */ +.mate-panel-menu-bar #PanelApplet button, +.mate-panel-menu-bar #PanelApplet button.flat, +.mate-panel-menu-bar #PanelApplet button.toggle, +.mate-panel-menu-bar #PanelApplet button.flat.toggle { transition: all 400ms ease-out; background-image: none; background-color: transparent; -/* color: @theme_selected_fg_color;*/ border-image: none; border-style: solid; border-width: 0px; @@ -517,14 +463,18 @@ MatePanelApplet .button.flat { padding: 4px 4px 4px 4px; } -MatePanelApplet .button:checked, -MatePanelApplet .button:active, -MatePanelApplet .button:checked:hover, -MatePanelApplet .button:active:hover, -MatePanelApplet .button.flat:checked, -MatePanelApplet .button.flat:active, -MatePanelApplet .button.flat:checked:hover, -MatePanelApplet .button.flat:active:hover { +.mate-panel-menu-bar #PanelApplet button:checked, +.mate-panel-menu-bar #PanelApplet button:checked:hover, +.mate-panel-menu-bar #PanelApplet button:hover:active, +.mate-panel-menu-bar #PanelApplet button.flat:checked, +.mate-panel-menu-bar #PanelApplet button.flat:checked:hover, +.mate-panel-menu-bar #PanelApplet button.flat:hover:active, +.mate-panel-menu-bar #PanelApplet button.toggle:checked, +.mate-panel-menu-bar #PanelApplet button.toggle:checked:hover, +.mate-panel-menu-bar #PanelApplet button.toggle:hover:active, +.mate-panel-menu-bar #PanelApplet button.flat.toggle:checked, +.mate-panel-menu-bar #PanelApplet button.flat.toggle:checked:hover, +.mate-panel-menu-bar #PanelApplet button.flat.toggle:hover:active { background-image: linear-gradient(to bottom, shade (@theme_selected_bg_color, 0.86), shade (@theme_selected_bg_color, 0.26)); @@ -539,8 +489,10 @@ MatePanelApplet .button.flat:active:hover { padding: 4px 4px 4px 4px; } -MatePanelApplet .button:hover, -MatePanelApplet .button.flat:hover { +.mate-panel-menu-bar #PanelApplet button:hover, +.mate-panel-menu-bar #PanelApplet button.flat:hover, +.mate-panel-menu-bar #PanelApplet button.toggle:hover, +.mate-panel-menu-bar #PanelApplet button.flat.toggle:hover { background-image: linear-gradient(to bottom, @theme_bg_color, shade (@theme_selected_bg_color, 0.86)); @@ -555,87 +507,10 @@ MatePanelApplet .button.flat:hover { padding: 4px 4px 4px 4px; } -/*Wncklist */ -WnckTasklist .button { - transition: all 400ms ease-out; - background-image: linear-gradient(to bottom, - shade (@theme_bg_color, 1.0), - shade (@theme_bg_color, 0.96)); - background-color: transparent; -/* color: @theme_selected_fg_color;*/ - border-image: none; - border-style: solid; - border-width: 0px; - border-radius: 5px; - text-shadow: none; - -GtkWidget-window-dragging: true; -} - -WnckTasklist .button:checked:hover, -WnckTasklist .button:checked, -WnckTasklist .button:active:hover, -WnckTasklist .button:active { - background-image: linear-gradient(to bottom, - shade (@theme_selected_bg_color, 0.86), - shade (@theme_selected_bg_color, 0.26)); - background-color: transparent; - color: shade (@theme_selected_fg_color, 1.00); - border-image: none; - border-style: solid; - border-width: 0px; - border-radius: 5px; - text-shadow: none; - -GtkWidget-window-dragging: true; -} - -WnckTasklist .button:hover, -WnckTasklist .button.flat:hover { - background-image: linear-gradient(to bottom, - @theme_bg_color, - shade (@theme_selected_bg_color, 0.86)); - background-color: transparent; - color: shade (@theme_text_color, 1.0); - border-image: none; - border-style: solid; - border-width: 0px; - border-radius: 5px; - text-shadow: none; - -GtkWidget-window-dragging: true; -} - -/* set selected button WnckSelector */ -WnckSelector.menubar .menuitem:hover { - background-image: linear-gradient(to bottom, - shade (@theme_selected_bg_color, 0.86), - shade (@theme_selected_bg_color, 0.26)); - background-color: transparent; - border-style: solid; - border-width: 0px; - border-radius: 5px; -} - -/* set WnckSelector normal menuitem */ -WnckSelector.menubar .menu .menuitem { - background-color: @menu_bg_color; - background-image: none; - color: shade (@theme_fg_color, 1.00); - text-shadow: none; -} - -/* set WnckSelector selected menuitem */ -WnckSelector.menubar .menu .menuitem:hover { - background-color: transparent; - background-image: linear-gradient(to bottom, - shade (@theme_selected_bg_color, 1.0), - shade (@theme_selected_bg_color, 0.85)); - color: shade (@theme_selected_fg_color, 1.00); - text-shadow: none; - border-radius: 0px; -} - -/* set WnckSelector menuitem separator */WnckSelector.menubar .menu .menuitem.separator { +/* set WnckSelector menuitem separator seperators are broken */ +.mate-panel-menu-bar menubar menu menuitem separator { color: @menu_separator; - -GtkMenuItem-horizontal-padding: 0; +/* -GtkMenuItem-horizontal-padding: 0; */ } /* WnckPager */ @@ -659,9 +534,8 @@ WnckPager:hover { @theme_selected_bg_color); } -ClockBox, -.mate-panel-menu-bar.menubar, -MatePanelApplet > GtkMenuBar.menubar { +.mate-panel-menu-bar menubar, +MatePanelApplet > menubar { font: normal; } @@ -670,17 +544,23 @@ GtkTrayIcon.background { background-color: transparent; } -NaTrayApplet { +/* na-tray-applet */ +.mate-panel-menu-bar #PanelApplet { -NaTrayApplet-icon-padding: 3px; -NaTrayApplet-icon-size: 16; } +/* Classic icon style */ +.mate-panel-menu-bar { + -PanelMenuBar-icon-visible: true; +} + /* volume applet, brightness applet */ .mate-panel-applet-slider { background: transparent; } -.mate-panel-applet-slider .frame { +.mate-panel-applet-slider frame { background-color: @theme_bg_color; border-image: none; border-style: solid; @@ -689,13 +569,13 @@ NaTrayApplet { margin: 0px; } -.mate-panel-applet-slider .frame .frame{ +.mate-panel-applet-slider frame frame{ background-color:transparent; border-style: none; box-shadow: none; } -.mate-panel-applet-slider .frame .button { +.mate-panel-applet-slider frame button { color: @theme_fg_color; } @@ -721,57 +601,29 @@ TerminalWindow GtkNotebook.notebook tab.top, ****************/ /* pluma line numbers */ +.pluma-window textview, PlumaView { background-color: shade (@theme_bg_color, 1.07); } -/*FIXME normaly this isn't the right entry for adjusting -the sidebar entry hover color*/ -PlumaWindow .view row:hover { - background-color: shade (@theme_selected_bg_color, 1.15); - color: shade (@theme_selected_bg_color, 0.35); -} - /* Pluma status bar */ -PlumaStatusbar.horizontal.statusbar .frame.flat .flat.button { - border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch; - padding: 5px; +.pluma-window statusbar.horizontal frame { + border-style: none; } -PlumaWindow .button.flat:hover { - background-color: transparent; - background-image: linear-gradient(to bottom, - @button_gradient_color_a, - @button_gradient_color_b); +.pluma-window statusbar.horizontal frame button.flat.toggle, +PlumaStatusbar.horizontal.statusbar .frame.flat .flat.button { border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch; - padding: 2px 5px; -} - -PlumaCloseButton.button.flat, -PlumaCloseButton.button.flat:hover, -PlumaCloseButton:prelight.button.flat, -PlumaCloseButton:prelight.button.flat:hover { - padding: 1px; -} - -/* surpress styling of close button */ -PlumaWindow .notebook tab .button.flat, -PlumaWindow .notebook tab .button.flat:hover { - border-color: transparent; - background-color: transparent; - background-image: none; - box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0); - text-shadow: none; - icon-shadow: none; - border-image: none; - padding: 1px; + padding: 0px; } -PlumaWindow .notebook tab.top { - padding: 6px 0px 6px 6px; +.pluma-window statusbar.horizontal frame button.flat.toggle GtkArrow { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); + -GtkArrow-arrow-scaling: 1.0; /* deprecated, but ignored */ } /* Printpreview */ +.pluma-print-preview toolbar.horizontal, PlumaPrintPreview.vertical .toolbar.horizontal { background-image: linear-gradient(to bottom, shade (@theme_bg_color, 1.0), @@ -785,25 +637,44 @@ PlumaPrintPreview.vertical .toolbar.horizontal { padding: 0px; } +.pluma-print-preview toolbar.horizontal entry, PlumaPrintPreview.vertical .toolbar.horizontal GtkToolItem .horizontal .entry { padding: 4px 6px; } +.pluma-print-preview toolbar.horizontal button.flat.image-button, PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.image-button { padding: 0px; } +.pluma-print-preview toolbar.horizontal button.flat.text-button, PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.text-button { padding: 0px 16px; border-radius: 2px; } +.pluma-print-preview toolbar.horizontal toolbutton button.flat.text-button { + color: @theme_fg_color; + border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch; + background-image: linear-gradient(to bottom, + @button_gradient_color_a, + @button_gradient_color_b); +} + +.pluma-print-preview toolbar.horizontal toolbutton button.flat.text-button:hover { + color: @internal_element_prelight; + background-image: linear-gradient(to bottom, + @button_hover_gradient_color_a, + @button_hover_gradient_color_b); +} + +.pluma-print-preview scrolledwindow, PlumaPrintPreview.vertical GtkLayout { background-color: @theme_base_color; } /* sidebar file-browser */ -PlumaPanel.vertical { +.pluma-window paned.horizontal box.vertical { border-radius: 4px 4px 0px 0px; border-width: 1px 0px 0px 0px; border-style: solid; @@ -811,10 +682,16 @@ PlumaPanel.vertical { box-shadow: none; } +.pluma-window paned.horizontal box.vertical notebook.frame box.vertical, PlumaFileBrowserWidget.vertical { background-color: @theme_bg_color; } +.pluma-window paned.horizontal box.vertical box.horizontal button.flat { + padding: 0px ; +} + +.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal, PlumaFileBrowserWidget.vertical .toolbar.horizontal { background-image: linear-gradient(to bottom, shade (@theme_bg_color, 1.0), @@ -828,70 +705,47 @@ PlumaFileBrowserWidget.vertical .toolbar.horizontal { padding: 4px 0px; } +.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat, +.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.menu-button, PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat, PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.menu-button { padding: 4px 2px ; } +.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.image-button, PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.image-button { padding: 4px 3px ; } /* color of of expander arrow */ +.pluma-window paned.horizontal box.vertical notebook.frame box.vertical expander:hover, PlumaFileBrowserWidget.vertical GtkExpander:hover { color: @theme_fg_color; } -/*********************** - * Mate-Control-Center * - ***********************/ - -/* background */ -ShellWindow AppResizer .view { - background-color: @theme_base_color; -} - -/* button of sidebar */ -ShellWindow .button.flat { - border-image: none; - padding: 4px 1px; -} - -ShellWindow .button.flat:hover { - padding: 4px 1px; - -} - -/* button of applications */ -ShellWindow GtkScrolledWindow .button.flat { - padding: 4px 0px; - border-image: none; -} - -ShellWindow GtkScrolledWindow .button.flat:hover { - background-color: transparent; - background-image: linear-gradient(to bottom, - @button_hover_gradient_color_a, - @button_hover_gradient_color_b); - border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch; - padding: 4px 0px; -} - /********* * Atril * *********/ /* size of page entry */ +.atril-window .primary-toolbar toolbar toolitem box.horizontal entry, EvPageActionWidget .entry { padding: 2px; } +.atril-window .primary-toolbar toolbar button, +.atril-window .primary-toolbar toolbar button.flat, EvWindow .toolbar .button, EvWindow .toolbar .button.flat { - padding: 0px 4px; + padding: 5px; +} + +.atril-window .primary-toolbar toolbar button.combo { + padding: 6px; } /* atril and eom */ +dialog.background>box.vertical.dialog-vbox>box.vertical>scrolledwindow>viewport.frame, EggToolbarEditor.vertical GtkScrolledWindow .frame { background-color: shade (@theme_base_color, 1.0); border-color: @borders; @@ -904,27 +758,36 @@ EggToolbarEditor.vertical GtkScrolledWindow .frame { * Eom * *******/ +.eom-window .vertical .vertical .vertical .horizontal button.flat:first-child, EomThumbNav .button.flat:first-child { border-radius: 4px 0px 0px 4px; border-width: 1px 0px 1px 1px; } +.eom-window .vertical .vertical .vertical .horizontal button.flat:last-child, EomThumbNav .button.flat:last-child { border-radius: 0px 4px 4px 0px; border-width: 1px 1px 1px 0px; } +.eom-window .vertical .vertical .vertical .horizontal button.flat, EomThumbNav .button.flat { border-image: none; border-color: @unfocused_borders; } +.eom-window .vertical .vertical .vertical .horizontal button.flat:hover, EomThumbNav .button.flat:hover { border-image: none; border-color: @menu_combobox_border; } -EomThumbNav .button.flat:insensitive { +.eom-window .vertical .vertical .vertical .horizontal button.flatdisabled, +EomThumbNav .button.flat:disabled { border-color: transparent; } +.eom-window .vertical statusbar.horizontal frame { + border-style: none; +} + diff --git a/desktop-themes/Menta/gtk-3.0/other-applications.css b/desktop-themes/Menta/gtk-3.0/other-applications.css index d59e83ad..779216b8 100644 --- a/desktop-themes/Menta/gtk-3.0/other-applications.css +++ b/desktop-themes/Menta/gtk-3.0/other-applications.css @@ -2,80 +2,45 @@ * NEMO File manager * *********************/ -/* for breadcrumbs path bar */ - -.nemo-pathbar-button, -NemoPathbarButton { - background-image: -gtk-gradient(linear, left top, left bottom, - color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)), - color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)), - color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)), - color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90))); - border-color: #979797; - color: @theme_fg_color; - -NemoPathbarButton-border-radius: 3px; -} - -NemoPathbarButton:active { - background-image: -gtk-gradient(linear, left top, left bottom, - color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)), - color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)), - color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0))); -} - -NemoPathbarButton:hover { - background-image: -gtk-gradient(linear, left top, left bottom, - color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)), - color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)), - color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)), - color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85))); -} - -NemoPathbarButton:active:hover { - background-image: -gtk-gradient(linear, left top, left bottom, - color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)), - color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)), - color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25))); -} - /* workaround for broken first/last-child logic with linked buttons - in pathbar with gtk+-3.18 */ -NemoPathBar:dir(ltr).raised.linked .button.text-button, -NemoPathBar:dir(ltr).raised.linked .button.text-button:hover, -NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active, -NemoPathBar:dir(ltr).raised.linked .button.text-button:active, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active, -NemoPathBar:dir(ltr).raised.linked .button.text-button:first-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:first-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:first-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:active:first-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:first-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:first-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:first-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:last-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:last-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:last-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:active:last-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:last-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:last-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:last-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:only-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:only-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:only-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:active:only-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:only-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:only-child, -NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:only-child { - border-right-width: 1px; - border-left-width: 1px; - border-image-width: 3px 3px 4px 3px; - border-radius: 4px; + in pathbar since gtk+-3.18 */ +.nemo-window NemoPathBar.raised.linked button.text-button, +.nemo-window NemoPathBar.raised.linked button.text-button:hover, +.nemo-window NemoPathBar.raised.linked button.text-button:hover:active, +.nemo-window NemoPathBar.raised.linked button.text-button:active, +.nemo-window NemoPathBar.raised.linked button.text-button:checked, +.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover, +.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active, +.nemo-window NemoPathBar.raised.linked button.text-button:first-child, +.nemo-window NemoPathBar.raised.linked button.text-button:hover:first-child, +.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:first-child, +.nemo-window NemoPathBar.raised.linked button.text-button:active:first-child, +.nemo-window NemoPathBar.raised.linked button.text-button:checked:first-child, +.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:first-child, +.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:first-child, +.nemo-window NemoPathBar.raised.linked button.text-button:last-child, +.nemo-window NemoPathBar.raised.linked button.text-button:hover:last-child, +.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:last-child, +.nemo-window NemoPathBar.raised.linked button.text-button:active:last-child, +.nemo-window NemoPathBar.raised.linked button.text-button:checked:last-child, +.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:last-child, +.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:last-child, +.nemo-window NemoPathBar.raised.linked button.text-button:only-child, +.nemo-window NemoPathBar.raised.linked button.text-button:hover:only-child, +.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:only-child, +.nemo-window NemoPathBar.raised.linked button.text-button:active:only-child, +.nemo-window NemoPathBar.raised.linked button.text-button:checked:only-child, +.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:only-child, +.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:only-child { + border-right-width: 1px; + border-left-width: 1px; + border-image-width: 3px 3px 4px 3px; + border-radius: 4px; + border-style: solid; } /* For Places Sidebar diskfull indicators */ - +.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view, NemoPlacesTreeView { -NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65); -NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0); @@ -85,40 +50,39 @@ NemoPlacesTreeView { -NemoPlacesTreeView-disk-full-max-length: 70px; } +.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected, NemoPlacesTreeView:selected { -NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0); -NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0); } +.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:hover, NemoPlacesTreeView:hover { } +.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected:hover, NemoPlacesTreeView:selected:hover { } @define-color cluebar_color shade (@theme_base_color, 0.9); -NemoWindow * { - -GtkPaned-handle-size: 0; -} - -NemoWindow .view { +/* view */ +.nemo-window-pane notebook scrolledwindow { background-color: @theme_base_color; } -NemoWindow .rubberband, -NemoWindow .view.rubberband { +.nemo-window .rubberband, +.nemo-window .view.rubberband { background-color: alpha (@theme_selected_bg_color, 0.35); } /* sidebar */ - -NemoWindow .sidebar .view { +.nemo-window .sidebar .view { background-color: shade (@theme_bg_color, 1.08); color: @theme_fg_color; } -NemoWindow .sidebar .frame { +.nemo-window .sidebar scrolledwindow.frame { border-right-width: 1px; border-style: solid; border-color: shade (@theme_bg_color, 0.90); @@ -127,18 +91,21 @@ NemoWindow .sidebar .frame { border-bottom: none; } -NemoWindow .sidebar row:selected { +.nemo-window .sidebar treeview .cell:selected { + background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } -NemoWindow .sidebar row:backdrop:selected { - color: @theme_fg_color; - text-shadow: none; +.nemo-window .sidebar treeview .cell:hover { + background-color: shade (@theme_selected_bg_color, 1.15); + color: @theme_selected_fg_color; } -NemoWindow .sidebar row:hover { - background-color: shade (@theme_selected_bg_color, 1.15); - color: shade (@theme_selected_bg_color, 0.35); +.nemo-window .sidebar scrollbar.vertical.left trough { + border-width: 0px 0px 0px 1px; + border-radius: 0; + border-style: solid; + border-color: shade (@theme_bg_color, 0.84); } /* desktop mode */ @@ -160,53 +127,41 @@ NemoWindow .sidebar row:hover { } .nemo-desktop.nemo-canvas-item:active, -.nemo-desktop.nemo-canvas-item:prelight, +.nemo-desktop.nemo-canvas-item:hover, .nemo-desktop.nemo-canvas-item:selected { text-shadow: none; } /* inactive pane */ - -.nemo-inactive-pane .view { +/* bug in gtk+, .view writes no bg color in all browsers */ +.nemo-inactive-pane .view, +.nemo-inactive-pane scrolledwindow, +.nemo-inactive-pane scrolledwindow treeview { background-color: shade(@theme_base_color, 0.9); } -/* Toolbar */ -NemoToolbar .toolbar.primary-toolbar .button.image-button { +/* Primary Toolbar */ +.nemo-window toolbar.primary-toolbar.horizontal button.image-button { padding: 0px 8px; } -NemoToolbar .toolbar.primary-toolbar .button.text-button { +.nemo-window toolbar.primary-toolbar.horizontal button.text-button { padding: 0px 10px; } -/* Misc */ -NemoView.frame, -NemoNotebook.notebook { - border-right-width: 0; - border-left-width: 0; - border-bottom-width: 0; +/* statusbar */ +.nemo-window box.toolbar.horizontal { + padding: 0px; } -NemoNotebook.notebook tab.top, -NemoNotebook.notebook tab.bottom { - border-right-width: 1px; - border-left-width: 1px; -} - -NemoNotebook .frame { - border-width: 1px 0 0 0; -} +/* Misc */ .nemo-cluebar-label { font: normal; text-shadow: 0 1px shade (@cluebar_color, 1.06); } -NemoTrashBar.info, -NemoXContentBar.info, -NemoSearchBar.info, -NemoQueryEditor.info { +.nemo-window-pane infobar.info { background-color: @cluebar_color; border-bottom-color: shade (@cluebar_color, 0.92); border-radius: 0; @@ -215,56 +170,9 @@ NemoQueryEditor.info { color: @theme_fg_color; } -NemoTrashBar .button, -NemoXContentBar .button, -NemoSearchBar .button, -NemoQueryEditor .button { - border-radius: 0; -} - -/* Parole media player needs more testing! - hopefully do not set other stuff */ - -GtkPaned.horizontal .vertical GtkOverlay GtkRevealer.bottom .background.horizontal.osd { - background-color: @theme_bg_color; - color: @theme_fg_color; -} - -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat, -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:hover, -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active, -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked, -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active:hover, -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked:hover, -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button, -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:hover , -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active, -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked, -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active:hover, -GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked:hover, -GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:checked, -GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:active:hover { - border-style: none; - border-radius: 4px; - background-color: transparent; - background-image: none; - box-shadow: none; - padding: 4px 7px; - color: @button_active_text; -} - -GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:checked, -GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:active:hover { - background-image: linear-gradient(to bottom, - @button_active_gradient_color_a, - @button_active_gradient_color_b); - box-shadow: inset 1px 0 @inset_dark_color, - inset -1px 0 @inset_dark_color, - inset 1px 2px alpha(@theme_selected_bg_color, 0.1), - inset 1px 1px alpha(@theme_selected_bg_color, 0.1), - inset -1px -1px alpha(@theme_selected_bg_color, 0.2); - padding: 4px 7px; - border-radius: 3px; +.nemo-window-pane box.toolbar.primary-toolbar.vertical revealer button.radio.text-button { + padding: 6px; + border-style: solid; } /**************** @@ -319,6 +227,51 @@ GraniteWidgetsPopOver .entry { background-color: alpha (#000, 0.15); } +/* Parole media player needs more testing! + hopefully do not set other stuff */ + +GtkPaned.horizontal .vertical GtkOverlay GtkRevealer.bottom .background.horizontal.osd { + background-color: @theme_bg_color; + color: @theme_fg_color; +} + +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat, +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:hover, +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active, +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked, +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active:hover, +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked:hover, +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button, +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:hover , +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active, +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked, +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active:hover, +GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked:hover, +GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:checked, +GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:active:hover { + border-style: none; + border-radius: 4px; + background-color: transparent; + background-image: none; + box-shadow: none; + padding: 4px 7px; + color: @button_active_text; +} + +GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:checked, +GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:active:hover { + background-image: linear-gradient(to bottom, + @button_active_gradient_color_a, + @button_active_gradient_color_b); + box-shadow: inset 1px 0 @inset_dark_color, + inset -1px 0 @inset_dark_color, + inset 1px 2px alpha(@theme_selected_bg_color, 0.1), + inset 1px 1px alpha(@theme_selected_bg_color, 0.1), + inset -1px -1px alpha(@theme_selected_bg_color, 0.2); + padding: 4px 7px; + border-radius: 3px; +} + /**************** * Dconf-editor * ****************/ @@ -344,17 +297,10 @@ DConfWindow DConfKeyView.view { } DConfWindow DConfKeyView.view row:hover { - background-color: shade (@theme_selected_bg_color, 1.30); + background-color: shade (@theme_selected_bg_color, 1.55); color: shade (@theme_selected_bg_color, 0.35); } -/* the small line between sidebar and view */ -DConfWindow GtkPaned.horizontal { - -GtkPaned-handle-size: 3px; - border-color: transparent; - background-color: @theme_bg_color; -} - DConfKeyView.view row:selected, DConfKeyView.view row:selected:hover { color: @theme_selected_fg_color; @@ -377,6 +323,33 @@ DConfKeyView.view .spinbutton .button:last-child { border-radius: 0 2px 2px 0; } +/*********** + * Lightdm * + ***********/ + +#login_window.background.lightdm-gtk-greeter { + border-radius: 10px; +} + +#login_window.background.lightdm-gtk-greeter, +#login_window.background.lightdm-gtk-greeter box.vertical { + border-radius: 10px; + border-style: solid; + border-width: 2px; + border-color: black; +} + +#login_window.background.lightdm-gtk-greeter frame { + border-style: none; +} + +#login_window.background.lightdm-gtk-greeter #prompt_entry, +#login_window.background.lightdm-gtk-greeter button.combo, +#login_window.background.lightdm-gtk-greeter button.text-button, +#login_window.background.lightdm-gtk-greeter button.text-button.default { + padding: 8px 4px; +} + /***************** * Ubuntu styles * *****************/ @@ -395,8 +368,8 @@ OsScrollbar:active { background-color: shade (@theme_bg_color, 0.6); } -OsThumb:insensitive, -OsScrollbar:insensitive { +OsThumb:disabled, +OsScrollbar:disabled { background-color: shade (@theme_bg_color, 0.85); } diff --git a/desktop-themes/Menta/gtk-3.0/window-controls.css b/desktop-themes/Menta/gtk-3.0/window-controls.css index 3af5e0fe..fd975c4c 100644 --- a/desktop-themes/Menta/gtk-3.0/window-controls.css +++ b/desktop-themes/Menta/gtk-3.0/window-controls.css @@ -1,15 +1,15 @@ -.titlebar .right .titlebutton:nth-last-child(3), -.titlebar .right:dir(rtl) .titlebutton:nth-child(3), -.titlebar .left .titlebutton:nth-child(3), -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3), -.titlebar .right .titlebutton:nth-last-child(2), -.titlebar .right:dir(rtl) .titlebutton:nth-child(2), -.titlebar .left .titlebutton:nth-child(2), -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2), -.titlebar .right .titlebutton:last-child, -.titlebar .right:dir(rtl) .titlebutton:first-child, -.titlebar .left .titlebutton:first-child, -.titlebar .left:dir(rtl) .titlebutton:last-child { +headerbar.titlebar .right .titlebutton:nth-last-child(3), +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3), +headerbar.titlebar .left .titlebutton:nth-child(3), +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3), +headerbar.titlebar .right .titlebutton:nth-last-child(2), +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2), +headerbar.titlebar .left .titlebutton:nth-child(2), +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2), +headerbar.titlebar .right .titlebutton:last-child, +headerbar.titlebar .right:dir(rtl) .titlebutton:first-child, +headerbar.titlebar .left .titlebutton:first-child, +headerbar.titlebar .left:dir(rtl) .titlebutton:last-child { color: transparent; background-position: center; background-repeat: no-repeat; @@ -24,249 +24,259 @@ /* minimize */ -.titlebar .right .titlebutton:nth-last-child(3), -.titlebar .right:dir(rtl) .titlebutton:nth-child(3), -.titlebar .left .titlebutton:nth-child(3), -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) { +headerbar.titlebar .right .titlebutton:nth-last-child(3), +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3), +headerbar.titlebar .left .titlebutton:nth-child(3), +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3) { background-image: url('window-controls/minimize_focused_normal.png'); } -.titlebar .right .titlebutton:nth-last-child(3):hover, -.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover, -.titlebar .left .titlebutton:nth-child(3):hover, -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover { +headerbar.titlebar .right .titlebutton:nth-last-child(3):hover, +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):hover, +headerbar.titlebar .left .titlebutton:nth-child(3):hover, +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):hover { background-image: url('window-controls/minimize_focused_prelight.png'); } -.titlebar .right .titlebutton:nth-last-child(3):active, -.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active, -.titlebar .left .titlebutton:nth-child(3):active, -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active, -.titlebar .right .titlebutton:nth-last-child(3):checked, -.titlebar .right:dir(rtl) .titlebutton:nth-child(3):checked, -.titlebar .left .titlebutton:nth-child(3):checked, -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):checked { +headerbar.titlebar .right .titlebutton:nth-last-child(3):active, +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):active, +headerbar.titlebar .left .titlebutton:nth-child(3):active, +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):active, +headerbar.titlebar .right .titlebutton:nth-last-child(3):checked, +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):checked, +headerbar.titlebar .left .titlebutton:nth-child(3):checked, +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):checked { background-image: url('window-controls/minimize_focused_pressed.png'); } -.titlebar .right .titlebutton:nth-last-child(3):backdrop, -.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop, -.titlebar .left .titlebutton:nth-child(3):backdrop, -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop { +headerbar.titlebar .right .titlebutton:nth-last-child(3):backdrop, +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop, +headerbar.titlebar .left .titlebutton:nth-child(3):backdrop, +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop { background-image: url('window-controls/minimize_unfocused.png'); } -.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover, -.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover, -.titlebar .left .titlebutton:nth-child(3):backdrop:hover, -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover { +headerbar.titlebar .right .titlebutton:nth-last-child(3):backdrop:hover, +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(3):backdrop:hover, +headerbar.titlebar .left .titlebutton:nth-child(3):backdrop:hover, +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(3):backdrop:hover { background-image: url('window-controls/minimize_unfocused_prelight.png'); } /* maximize */ -.titlebar .right .titlebutton:nth-last-child(2), -.titlebar .right:dir(rtl) .titlebutton:nth-child(2), -.titlebar .left .titlebutton:nth-child(2), -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) { +headerbar.titlebar .right .titlebutton:nth-last-child(2), +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2), +headerbar.titlebar .left .titlebutton:nth-child(2), +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2) { background-image: url('window-controls/maximize_focused_normal.png'); } -.titlebar .right .titlebutton:nth-last-child(2):hover, -.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover, -.titlebar .left .titlebutton:nth-child(2):hover, -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover { +headerbar.titlebar .right .titlebutton:nth-last-child(2):hover, +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):hover, +headerbar.titlebar .left .titlebutton:nth-child(2):hover, +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):hover { background-image: url('window-controls/maximize_focused_prelight.png'); } -.titlebar .right .titlebutton:nth-last-child(2):active, -.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active, -.titlebar .left .titlebutton:nth-child(2):active, -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active, -.titlebar .right .titlebutton:nth-last-child(2):checked, -.titlebar .right:dir(rtl) .titlebutton:nth-child(2):checked, -.titlebar .left .titlebutton:nth-child(2):checked, -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):checked { +headerbar.titlebar .right .titlebutton:nth-last-child(2):active, +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):active, +headerbar.titlebar .left .titlebutton:nth-child(2):active, +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):active, +headerbar.titlebar .right .titlebutton:nth-last-child(2):checked, +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):checked, +headerbar.titlebar .left .titlebutton:nth-child(2):checked, +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):checked { background-image: url('window-controls/maximize_focused_pressed.png'); } -.titlebar .right .titlebutton:nth-last-child(2):backdrop, -.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop, -.titlebar .left .titlebutton:nth-child(2):backdrop, -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop { +headerbar.titlebar .right .titlebutton:nth-last-child(2):backdrop, +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop, +headerbar.titlebar .left .titlebutton:nth-child(2):backdrop, +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop { background-image: url('window-controls/maximize_unfocused.png'); } -.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover, -.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover, -.titlebar .left .titlebutton:nth-child(2):backdrop:hover, -.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover { +headerbar.titlebar .right .titlebutton:nth-last-child(2):backdrop:hover, +headerbar.titlebar .right:dir(rtl) .titlebutton:nth-child(2):backdrop:hover, +headerbar.titlebar .left .titlebutton:nth-child(2):backdrop:hover, +headerbar.titlebar .left:dir(rtl) .titlebutton:nth-last-child(2):backdrop:hover { background-image: url('window-controls/maximize_unfocused_prelight.png'); } /* close */ -.titlebar .right .titlebutton:last-child, -.titlebar .right:dir(rtl) .titlebutton:first-child, -.titlebar .left .titlebutton:first-child, -.titlebar .left:dir(rtl) .titlebutton:last-child { +headerbar.titlebar .right .titlebutton:last-child, +headerbar.titlebar .right:dir(rtl) .titlebutton:first-child, +headerbar.titlebar .left .titlebutton:first-child, +headerbar.titlebar .left:dir(rtl) .titlebutton:last-child { background-image: url('window-controls/close_focused_normal.png'); /*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */ } -.titlebar .right .titlebutton:last-child:hover, -.titlebar .right:dir(rtl) .titlebutton:first-child:hover, -.titlebar .left .titlebutton:first-child:hover, -.titlebar .left:dir(rtl) .titlebutton:last-child:hover { +headerbar.titlebar .right .titlebutton:last-child:hover, +headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover, +headerbar.titlebar .left .titlebutton:first-child:hover, +headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:hover { background-image: url('window-controls/close_focused_prelight.png'); } -.titlebar .right .titlebutton:last-child:active, -.titlebar .right:dir(rtl) .titlebutton:first-child:active, -.titlebar .left .titlebutton:first-child:active, -.titlebar .left:dir(rtl) .titlebutton:last-child:active, -.titlebar .right .titlebutton:last-child:checked, -.titlebar .right:dir(rtl) .titlebutton:first-child:checked, -.titlebar .left .titlebutton:first-child:checked, -.titlebar .left:dir(rtl) .titlebutton:last-child:checked { +headerbar.titlebar .right .titlebutton:last-child:active, +headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active, +headerbar.titlebar .left .titlebutton:first-child:active, +headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:active, +headerbar.titlebar .right .titlebutton:last-child:checked, +headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked, +headerbar.titlebar .left .titlebutton:first-child:checked, +headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:checked { background-image: url('window-controls/close_focused_pressed.png'); } -.titlebar .right .titlebutton:last-child:backdrop, -.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, -.titlebar .left .titlebutton:first-child:backdrop, -.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop { +headerbar.titlebar .right .titlebutton:last-child:backdrop, +headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, +headerbar.titlebar .left .titlebutton:first-child:backdrop, +headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop { background-image: url('window-controls/close_unfocused.png'); } -.titlebar .right .titlebutton:last-child:backdrop:hover, -.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, -.titlebar .left .titlebutton:first-child:backdrop:hover, -.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover { +headerbar.titlebar .right .titlebutton:last-child:backdrop:hover, +headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, +headerbar.titlebar .left .titlebutton:first-child:backdrop:hover, +headerbar.titlebar .left:dir(rtl) .titlebutton:last-child:backdrop:hover { background-image: url('window-controls/close_unfocused_prelight.png'); } /* Menu button when fallback kicks in (XFCE, Cinnamon etc.) */ -.titlebar .button.menu-button.titlebutton { +headerbar.titlebar .button.menu-button.titlebutton { background-image: url('window-controls/menu.png'); } -.titlebar .button.menu-button.titlebutton:hover { +headerbar.titlebar .button.menu-button.titlebutton:hover { background-image: url('window-controls/menu_prelight.png'); } -.titlebar .button.menu-button.titlebutton:active { +headerbar.titlebar .button.menu-button.titlebutton:active { background-image: url('window-controls/menu.png'); } -/* application adjustments */ - -NautilusWindow .titlebar .right:dir(rtl) .titlebutton:first-child, -NautilusWindow .titlebar .left .titlebutton:first-child, -NautilusWindow .titlebar .right:dir(rtl) .titlebutton:first-child:hover, -NautilusWindow .titlebar .left .titlebutton:first-child:hover, -NautilusWindow .titlebar .right:dir(rtl) .titlebutton:first-child:active, -NautilusWindow .titlebar .left .titlebutton:first-child:active, -NautilusWindow .titlebar .right:dir(rtl) .titlebutton:first-child:checked, -NautilusWindow .titlebar .left .titlebutton:first-child:checked, -NautilusWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, -NautilusWindow .titlebar .left .titlebutton:first-child:backdrop, -NautilusWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, -NautilusWindow .titlebar .left .titlebutton:first-child:backdrop:hover, -YelpWindow .titlebar .right:dir(rtl) .titlebutton:first-child, -YelpWindow .titlebar .left .titlebutton:first-child, -YelpWindow .titlebar .right:dir(rtl) .titlebutton:first-child:hover, -YelpWindow .titlebar .left .titlebutton:first-child:hover, -YelpWindow .titlebar .right:dir(rtl) .titlebutton:first-child:active, -YelpWindow .titlebar .left .titlebutton:first-child:active, -YelpWindow .titlebar .right:dir(rtl) .titlebutton:first-child:checked, -YelpWindow .titlebar .left .titlebutton:first-child:checked, -YelpWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, -YelpWindow .titlebar .left .titlebutton:first-child:backdrop, -YelpWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, -YelpWindow .titlebar .left .titlebutton:first-child:backdrop:hover, -MathWindow .titlebar .right:dir(rtl) .titlebutton:first-child, -MathWindow .titlebar .left .titlebutton:first-child, -MathWindow .titlebar .right:dir(rtl) .titlebutton:first-child:hover, -MathWindow .titlebar .left .titlebutton:first-child:hover, -MathWindow .titlebar .right:dir(rtl) .titlebutton:first-child:active, -MathWindow .titlebar .left .titlebutton:first-child:active, -MathWindow .titlebar .right:dir(rtl) .titlebutton:first-child:checked, -MathWindow .titlebar .left .titlebutton:first-child:checked, -MathWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, -MathWindow .titlebar .left .titlebutton:first-child:backdrop, -MathWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, -MathWindow .titlebar .left .titlebutton:first-child:backdrop:hover, -EogWindow .titlebar .right:dir(rtl) .titlebutton:first-child, -EogWindow .titlebar .left .titlebutton:first-child, -EogWindow .titlebar .right:dir(rtl) .titlebutton:first-child:hover, -EogWindow .titlebar .left .titlebutton:first-child:hover, -EogWindow .titlebar .right:dir(rtl) .titlebutton:first-child:active, -EogWindow .titlebar .left .titlebutton:first-child:active, -EogWindow .titlebar .right:dir(rtl) .titlebutton:first-child:checked, -EogWindow .titlebar .left .titlebutton:first-child:checked, -EogWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, -EogWindow .titlebar .left .titlebutton:first-child:backdrop, -EogWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, -EogWindow .titlebar .left .titlebutton:first-child:backdrop:hover, -EvWindow .titlebar .right:dir(rtl) .titlebutton:first-child, -EvWindow .titlebar .left .titlebutton:first-child, -EvWindow .titlebar .right:dir(rtl) .titlebutton:first-child:hover, -EvWindow .titlebar .left .titlebutton:first-child:hover, -EvWindow .titlebar .right:dir(rtl) .titlebutton:first-child:active, -EvWindow .titlebar .left .titlebutton:first-child:active, -EvWindow .titlebar .right:dir(rtl) .titlebutton:first-child:checked, -EvWindow .titlebar .left .titlebutton:first-child:checked, -EvWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, -EvWindow .titlebar .left .titlebutton:first-child:backdrop, -EvWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, -EvWindow .titlebar .left .titlebutton:first-child:backdrop:hover, -BaobabWindow .titlebar .right:dir(rtl) .titlebutton:first-child, -BaobabWindow .titlebar .left .titlebutton:first-child, -BaobabWindow .titlebar .right:dir(rtl) .titlebutton:first-child:hover, -BaobabWindow .titlebar .left .titlebutton:first-child:hover, -BaobabWindow .titlebar .right:dir(rtl) .titlebutton:first-child:active, -BaobabWindow .titlebar .left .titlebutton:first-child:active, -BaobabWindow .titlebar .right:dir(rtl) .titlebutton:first-child:checked, -BaobabWindow .titlebar .left .titlebutton:first-child:checked, -BaobabWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, -BaobabWindow .titlebar .left .titlebutton:first-child:backdrop, -BaobabWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, -BaobabWindow .titlebar .left .titlebutton:first-child:backdrop:hover, -BjbWindowBase .titlebar .right:dir(rtl) .titlebutton:first-child, -BjbWindowBase .titlebar .left .titlebutton:first-child, -BjbWindowBase .titlebar .right:dir(rtl) .titlebutton:first-child:hover, -BjbWindowBase .titlebar .left .titlebutton:first-child:hover, -BjbWindowBase .titlebar .right:dir(rtl) .titlebutton:first-child:active, -BjbWindowBase .titlebar .left .titlebutton:first-child:active, -BjbWindowBase .titlebar .right:dir(rtl) .titlebutton:first-child:checked, -BjbWindowBase .titlebar .left .titlebutton:first-child:checked, -BjbWindowBase .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, -BjbWindowBase .titlebar .left .titlebutton:first-child:backdrop, -BjbWindowBase .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, -BjbWindowBase .titlebar .left .titlebutton:first-child:backdrop:hover, -BoxesAppWindow .titlebar .right:dir(rtl) .titlebutton:first-child, -BoxesAppWindow .titlebar .left .titlebutton:first-child, -BoxesAppWindow .titlebar .right:dir(rtl) .titlebutton:first-child:hover, -BoxesAppWindow .titlebar .left .titlebutton:first-child:hover, -BoxesAppWindow .titlebar .right:dir(rtl) .titlebutton:first-child:active, -BoxesAppWindow .titlebar .left .titlebutton:first-child:active, -BoxesAppWindow .titlebar .right:dir(rtl) .titlebutton:first-child:checked, -BoxesAppWindow .titlebar .left .titlebutton:first-child:checked, -BoxesAppWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, -BoxesAppWindow .titlebar .left .titlebutton:first-child:backdrop, -BoxesAppWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, -BoxesAppWindow .titlebar .left .titlebutton:first-child:backdrop:hover, -ContactsWindow .titlebar .right:dir(rtl) .titlebutton:first-child, -ContactsWindow .titlebar .left .titlebutton:first-child, -ContactsWindow .titlebar .right:dir(rtl) .titlebutton:first-child:hover, -ContactsWindow .titlebar .left .titlebutton:first-child:hover, -ContactsWindow .titlebar .right:dir(rtl) .titlebutton:first-child:active, -ContactsWindow .titlebar .left .titlebutton:first-child:active, -ContactsWindow .titlebar .right:dir(rtl) .titlebutton:first-child:checked, -ContactsWindow .titlebar .left .titlebutton:first-child:checked, -ContactsWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, -ContactsWindow .titlebar .left .titlebutton:first-child:backdrop, -ContactsWindow .titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, -ContactsWindow .titlebar .left .titlebutton:first-child:backdrop:hover { +/* application adjustments *//* +NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child, +NautilusWindow headerbar.titlebar .left .titlebutton:first-child, +NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover, +NautilusWindow headerbar.titlebar .left .titlebutton:first-child:hover, +NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active, +NautilusWindow headerbar.titlebar .left .titlebutton:first-child:active, +NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked, +NautilusWindow headerbar.titlebar .left .titlebutton:first-child:checked, +NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, +NautilusWindow headerbar.titlebar .left .titlebutton:first-child:backdrop, +NautilusWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, +NautilusWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover, +YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child, +YelpWindow headerbar.titlebar .left .titlebutton:first-child, +YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover, +YelpWindow headerbar.titlebar .left .titlebutton:first-child:hover, +YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active, +YelpWindow headerbar.titlebar .left .titlebutton:first-child:active, +YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked, +YelpWindow headerbar.titlebar .left .titlebutton:first-child:checked, +YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, +YelpWindow headerbar.titlebar .left .titlebutton:first-child:backdrop, +YelpWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, +YelpWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover, +MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child, +MathWindow headerbar.titlebar .left .titlebutton:first-child, +MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover, +MathWindow headerbar.titlebar .left .titlebutton:first-child:hover, +MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active, +MathWindow headerbar.titlebar .left .titlebutton:first-child:active, +MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked, +MathWindow headerbar.titlebar .left .titlebutton:first-child:checked, +MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, +MathWindow headerbar.titlebar .left .titlebutton:first-child:backdrop, +MathWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, +MathWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover, +EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child, +EogWindow headerbar.titlebar .left .titlebutton:first-child, +EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover, +EogWindow headerbar.titlebar .left .titlebutton:first-child:hover, +EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active, +EogWindow headerbar.titlebar .left .titlebutton:first-child:active, +EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked, +EogWindow headerbar.titlebar .left .titlebutton:first-child:checked, +EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, +EogWindow headerbar.titlebar .left .titlebutton:first-child:backdrop, +EogWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, +EogWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover, +EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child, +EvWindow headerbar.titlebar .left .titlebutton:first-child, +EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover, +EvWindow headerbar.titlebar .left .titlebutton:first-child:hover, +EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active, +EvWindow headerbar.titlebar .left .titlebutton:first-child:active, +EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked, +EvWindow headerbar.titlebar .left .titlebutton:first-child:checked, +EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, +EvWindow headerbar.titlebar .left .titlebutton:first-child:backdrop, +EvWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, +EvWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover, +BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child, +BaobabWindow headerbar.titlebar .left .titlebutton:first-child, +BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover, +BaobabWindow headerbar.titlebar .left .titlebutton:first-child:hover, +BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active, +BaobabWindow headerbar.titlebar .left .titlebutton:first-child:active, +BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked, +BaobabWindow headerbar.titlebar .left .titlebutton:first-child:checked, +BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, +BaobabWindow headerbar.titlebar .left .titlebutton:first-child:backdrop, +BaobabWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, +BaobabWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover, +BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child, +BjbWindowBase headerbar.titlebar .left .titlebutton:first-child, +BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover, +BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:hover, +BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active, +BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:active, +BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked, +BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:checked, +BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, +BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:backdrop, +BjbWindowBase headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, +BjbWindowBase headerbar.titlebar .left .titlebutton:first-child:backdrop:hover, +BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child, +BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child, +BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover, +BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:hover, +BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active, +BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:active, +BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked, +BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:checked, +BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, +BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:backdrop, +BoxesAppWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, +BoxesAppWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover, +ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child, +ContactsWindow headerbar.titlebar .left .titlebutton:first-child, +ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:hover, +ContactsWindow headerbar.titlebar .left .titlebutton:first-child:hover, +ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:active, +ContactsWindow headerbar.titlebar .left .titlebutton:first-child:active, +ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:checked, +ContactsWindow headerbar.titlebar .left .titlebutton:first-child:checked, +ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop, +ContactsWindow headerbar.titlebar .left .titlebutton:first-child:backdrop, +ContactsWindow headerbar.titlebar .right:dir(rtl) .titlebutton:first-child:backdrop:hover, +ContactsWindow headerbar.titlebar .left .titlebutton:first-child:backdrop:hover { + background-image: none; +} +*/ +/* application adjustments gtk+-3.20 */ +headerbar.titlebar button.titlebutton.toggle.popup { background-image: none; } + +/* gtk+-3.20 */ +headerbar.titlebar button image { + color: transparent; +} + -- cgit v1.2.1