From eded329501e5ac1ae57da7a03d45734878cdf9d8 Mon Sep 17 00:00:00 2001 From: lukefromdc Date: Tue, 26 Jan 2016 01:50:35 -0500 Subject: Gtk+-3.20 Green-Submarine: port gtk-widget.css to GTK 3.20 --- .../Green-Submarine/gtk-3.0/gtk-widgets.css | 3813 ++++++++++---------- 1 file changed, 1814 insertions(+), 1999 deletions(-) (limited to 'desktop-themes') diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css index c48a2ce1..a9a9f385 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css @@ -7,9 +7,9 @@ * { padding: 0; background-clip: padding-box; - -GtkButton-child-displacement-x: 1; - -GtkButton-child-displacement-y: 1; -GtkButton-default-border: 0; +/* -GtkButton-child-displacement-x: 1; + -GtkButton-child-displacement-y: 1;*/ -GtkButton-image-spacing: 0; -GtkButton-interior-focus: true; -GtkButton-inner-border: 3; @@ -22,11 +22,9 @@ -GtkExpander-expander-size: 14; -GtkHTML-link-color: @link_color; -GtkIMHtml-hyperlink-color: @link_color; - -GtkMenu-horizontal-padding: 0; - -GtkMenu-vertical-padding: 0; +/* -GtkMenu-horizontal-padding: 0; + -GtkMenu-vertical-padding: 0; */ -GtkMenuBar-internal-padding: 0; - -GtkMenuItem-arrow-scaling: 0.7; - -GtkNotebook-tab-overlap: 1; -GtkPaned-handle-size: 1; -GtkProgressBar-min-horizontal-bar-height: 16; -GtkProgressBar-min-vertical-bar-width: 16; @@ -51,22 +49,20 @@ -GtkTreeView-expander-size: 12; /* arrow size in list/tree views */ -GtkTreeView-horizontal-separator: 4; -GtkTreeView-vertical-separator: 4; - -GtkWidget-focus-padding: 2; - -GtkWidget-focus-line-width: 0; -GtkWindow-resize-grip-default: true; -GtkWindow-resize-grip-width: 13; -GtkWindow-resize-grip-height: 13; - -GtkWidget-separator-width: 2px; - -GtkWidget-separator-height: 2px; - -GtkWidget-wide-separators: true; +/* -GtkWidget-separator-width: 2px; + -GtkWidget-separator-height: 2px; + -GtkWidget-wide-separators: true;*/ -WnckTasklist-fade-overlay-rect: 0; /* Highlight drag-drop destination */ - engine: none; + /*engine: none; This is now IGNORED */ outline-color: alpha(@theme_selected_bg_color, 0.3); outline-style: dashed; outline-offset: -3px; /* 2px */ outline-width: 0px; /* disable ugly focus-line */ - outline-radius: 2px; + -gtk-outline-radius: 2px; -gtk-icon-style: regular; /* no symbolic icons */ } @@ -74,7 +70,7 @@ * Base States * ***************/ -GtkWindow { +window { color: @theme_fg_color; } @@ -85,7 +81,7 @@ GtkWindow { .background:backdrop { text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; } /* Ugly hack to fix unexpected background colours (e.g. combo box arrow) @@ -99,17 +95,17 @@ GtkWindow { background-color: alpha(shade(@theme_selected_bg_color, 1.90), 0.015); } -*:hover:active:insensitive { +*:hover:active:disabled { } -*:active:insensitive { +*:active:disabled { } *:hover { background-color: alpha(shade(@menu_bg_color, 1.05), 0.0); } -*:hover:insensitive { +*:hover:disabled { } *:selected, @@ -118,7 +114,7 @@ GtkWindow { color: @theme_selected_fg_color; } -*:insensitive { +*:disabled { /* inherit the color from parent by default */ background-color: inherit; color: @insensitive_fg_color; @@ -134,7 +130,7 @@ GtkWindow { color: @theme_fg_color; } -.gtkstyle-fallback:prelight { +.gtkstyle-fallback:hover { background-color: shade(@theme_bg_color, 1.10); color: @theme_fg_color; } @@ -144,7 +140,7 @@ GtkWindow { color: @theme_fg_color; } -.gtkstyle-fallback:insensitive { +.gtkstyle-fallback:disabled { background-color: @insensitive_bg_color; color: @insensitive_fg_color; } @@ -155,16 +151,16 @@ GtkWindow { } /********* - * label * + * GtkLabel * *********/ -GtkLabel, -GtkLabel:insensitive { +label, +label:disabled { background-color: transparent; } -.tooltip, -.tooltip.background { +tooltip, +tooltip.background { padding: 4px 4px; color: shade(@theme_tooltip_fg_color, 0.90); border-width: 1px; @@ -176,16 +172,18 @@ GtkLabel:insensitive { box-shadow: 0 1px 5px shade (@theme_selected_bg_color, 1.3); } -.tooltip * { +tooltip * { background-color: transparent; padding: 4px 4px; } -.grip { +grip { background-color: transparent; background-image: url("assets/resize-grip.svg"); } +view.rubberband, +rubberband, .view.rubberband, .rubberband { background-color: alpha (@theme_selected_bg_color, 0.35); @@ -199,7 +197,7 @@ GtkLabel:insensitive { * separator * *************/ -.separator { +separator { border-width: 1px; border-style: solid; border-image: none; @@ -208,38 +206,37 @@ GtkLabel:insensitive { border-right-color: alpha (shade (@theme_bg_color, 1.26), 0.15); } -GtkTreeView.view.separator, -GtkTreeView.separator, -GtkTreeView.view.separator:hover, -GtkTreeView.separator:hover, -.separator, -.separator:prelight { +treeview.view.separator, +treeview.separator, +treeview.view.separator:hover, +treeview.separator:hover, +separator, +separator:hover { color: shade (@theme_bg_color, 0.92); border-color: mix(@theme_fg_color, @theme_bg_color, 0.95); border-image: none; } -.separator.horizontal { +separator.horizontal { border-width: 1px 0 1px 0; } -.separator.vertical { +separator.vertical { border-width: 0 1px 0 1px; } -GtkComboBox .separator { - -GtkWidget-wide-separators: true; +combobox .separator { -GtkWidget-horizontal-separator: 0; -GtkWidget-vertical-separator: 0; } -.button .separator, -.button.separator { +button separator, +button.separator { border-color: alpha (#000, 0.00); } -.button .separator:insensitive, -.button.separator:insensitive { +button .separator:disabled, +button.separator:disabled { border-color: alpha (#000, 0.00); } @@ -247,23 +244,24 @@ GtkComboBox .separator { color: shade (@sidebar_background, 0.95); } -.pane-separator:prelight, +.pane-separator:hover, .pane-separator:selected { color: shade (@sidebar_background, 0.95); } -GtkStatusbar { - padding: 5px; +statusbar { + padding: 0px; color: @theme_fg_color; - -GtkStatusbar-shadow-type: none; + -statusbar-shadow-type: none; font-size: smaller; } -GtkStatusbar .frame { +statusbar .frame { padding: 0px; border-width: 0; } +dnd, .dnd { border-width: 1px; border-style: solid; @@ -275,8 +273,8 @@ GtkStatusbar .frame { * Text Entries * ****************/ -.entry, -.combobox-entry .entry { +entry, +combobox-entry entry { /* Look out ! This is the background color of mate-control-center 'too' */ background-color: @theme_base_color; @@ -310,14 +308,14 @@ This is the background color of mate-control-center 'too' */ inset 0px -1px shade(@button_border, 1.05); } -.entry:focus { +entry:focus { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), inset 0px -1px shade(@selected_bg_color, 0.93); } -.entry:insensitive { +entry:disabled { color: @insensitive_fg_color; background-image: none; background-color: @insensitive_bg_color; @@ -331,13 +329,13 @@ This is the background color of mate-control-center 'too' */ inset 0px -1px @insensitive_border_color; } -.entry:selected, -.entry:selected:focus { +entry selection, +entry selection:focus { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } -.entry.progressbar { +entry.progressbar { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; border-width: 1px; @@ -348,12 +346,12 @@ This is the background color of mate-control-center 'too' */ * Symbolic images * *******************/ -.image { +image { color: @internal_element_color; } -.image:prelight { - color: @internal_element_prelight; +image:hover { + color: @internal_element_hover; } /**************** @@ -361,13 +359,17 @@ This is the background color of mate-control-center 'too' */ ****************/ /* progress component */ -.progressbar, -.toolbar .progressbar, -.entry.progressbar, -.progressbar row, -.progressbar row:hover, -.progressbar row:selected, -.progressbar row:selected:focus { +progressbar progress, +toolbar progressbar progress, +entry progressbar, +progressbar progress, +progressbar row:hover, +progressbar row:selected, +progressbar row:selected:focus { + border-width: 1px; /*set up border FIRST to avoid drawing failure in Synaptic */ + border-style: solid; + border-radius: 3px; + min-height: 16px; background-image: linear-gradient(to right, alpha (#000, 0.00), alpha (#000, 0.00) 48%, @@ -389,9 +391,6 @@ This is the background color of mate-control-center 'too' */ inset 1px 0px alpha(black, 0.03), inset -1px 0px alpha(black, 0.03), inset 0px -1px alpha(white, 0.10); - border-width: 1px; - border-style: solid; - border-radius: 3px; border-top-color: shade(@button_border_active, 0.80); border-left-color: shade(@button_border_active, 0.85); border-right-color: shade(@button_border_active, 0.85); @@ -401,7 +400,11 @@ This is the background color of mate-control-center 'too' */ text-shadow: none; } -.progressbar.vertical { +progressbar.vertical progress { + border-width: 1px; /*set up border FIRST to avoid drawing failure in Synaptic */ + border-style: solid; + border-radius: 3px; + min-width: 16px; background-image: linear-gradient(to top, alpha (#000, 0.00), alpha (#000, 0.00) 48%, @@ -423,9 +426,6 @@ This is the background color of mate-control-center 'too' */ inset 1px 0px alpha(black, 0.03), inset -1px 0px alpha(white, 0.10), inset 0px -1px alpha(black, 0.03); - border-width: 1px; - border-style: solid; - border-radius: 3px; border-top-color: shade(@button_border_active, 0.85); border-left-color: shade(@button_border_active, 0.80); border-right-color: shade(@button_border_active, 1.00); @@ -435,27 +435,28 @@ This is the background color of mate-control-center 'too' */ text-shadow: none; } -GtkProgressBar { - /* FIXME - Not working 3.14 */ - -GtkProgressBar-min-horizontal-bar-height: 16; - -GtkProgressBar-min-vertical-bar-width: 16; +progressbar { + /* Deprecated and ignored in gtk 3.20, use css properties min-width/min-height instead + -progressbar-min-horizontal-bar-height: 16; + -progressbar-min-vertical-bar-width: 16; */ border-radius: 2px; padding: 0 0 1px 0; text-shadow: none; } /* through component */ -.trough row { +progressbar trough { padding: 0px; text-shadow: none; border-radius: 2px; padding: 0 0 1px 0; } -.trough, -.toolbar .trough, -.trough row, -.trough row:hover { +progressbar trough, +toolbarprogressbar trough, +trough row, +trough row:hover { + min-height: 16px; background-image: -gtk-gradient (linear, left top, left bottom, from (alpha (#000, 0.18)), @@ -470,7 +471,8 @@ GtkProgressBar { text-shadow: none; } -.trough.vertical { +progressbar.vertical trough { + min-width: 16px; background-image: -gtk-gradient (linear, left top, right top, from (alpha (#000, 0.18)), @@ -481,8 +483,8 @@ GtkProgressBar { text-shadow: none; } -.trough row:selected, -.trough row:selected:focus { +trough row:selected, +trough row:selected:focus { background-image: -gtk-gradient (linear, left top, left bottom, from (mix (@trough_bg_color_a, @theme_selected_bg_color, 0.25)), @@ -490,21 +492,21 @@ GtkProgressBar { } /* level bars as used for password quality or remaining power */ -GtkLevelBar { - -GtkLevelBar-min-block-width: 34; - -GtkLevelBar-min-block-height: 3; +levelbar { + -levelbar-min-block-width: 34; + -levelbar-min-block-height: 3; } -GtkLevelBar.vertical { - -GtkLevelBar-min-block-width: 3; - -GtkLevelBar-min-block-height: 34; +levelbar.vertical { + -levelbar-min-block-width: 3; + -levelbar-min-block-height: 34; } -.level-bar.trough { +level-bar trough { padding: 2px; } -.level-bar.fill-block { +level-bar.fill-block { border-width: 1px; border-style: solid; border-color: @button_border_active; @@ -516,16 +518,16 @@ GtkLevelBar.vertical { to (shade (@button_bg_active, 1.20))); } -.level-bar.indicator-continuous.fill-block { +level-bar.indicator-continuous.fill-block { padding: 2px; border-radius: 2px; } -.level-bar.indicator-discrete.fill-block.horizontal { +level-bar.indicator-discrete.fill-block.horizontal { margin: 0 1px; } -.level-bar.indicator-discrete.fill-block.vertical { +level-bar.indicator-discrete.fill-block.vertical { margin: 1px 0; } @@ -533,24 +535,24 @@ GtkLevelBar.vertical { uncomment when :nth-child will be working on the widget -.level-bar.indicator-discrete.fill-block.horizontal:first-child { + level-bar.indicator-discrete.fill-block.horizontal:first-child { border-radius: 2px 0 0 2px; } -.level-bar.indicator-discrete.fill-block.horizontal:last-child { + level-bar.indicator-discrete.fill-block.horizontal:last-child { border-radius: 0 2px 2px 0; } -.level-bar.indicator-discrete.fill-block.vertical:first-child { + level-bar.indicator-discrete.fill-block.vertical:first-child { border-radius: 2px 2px 0 0; } -.level-bar.indicator-discrete.fill-block.vertical:last-child { + level-bar.indicator-discrete.fill-block.vertical:last-child { border-radius: 0 0 2px 2px; } */ -.level-bar.fill-block.level-high { +level-bar.fill-block.level-high { border-color: shade(@success_color, 0.85); background-image: linear-gradient(to bottom, shade(@success_color, 1.2), @@ -558,7 +560,7 @@ GtkLevelBar.vertical { shade(@success_color, 0.95)); } -.level-bar.fill-block.level-low { +level-bar.fill-block.level-low { border-color: shade(@warning_bg_color, 0.80); background-image: linear-gradient(to bottom, shade(@warning_bg_color, 1.3), @@ -566,13 +568,13 @@ GtkLevelBar.vertical { shade(@warning_bg_color, 0.90)); } -.level-bar.fill-block.empty-fill-block { +level-bar.fill-block.empty-fill-block { background-color: transparent; background-image: none; border-color: alpha(@theme_fg_color, 0.1); } -.level-bar.fill-block.empty-fill-block:backdrop { +level-bar.fill-block.empty-fill-block:backdrop { border-color: transparent; background-color: transparent; } @@ -581,16 +583,15 @@ GtkLevelBar.vertical { * GtkScale * ************/ -.scale { +scale { -GtkScale-slider-length: 16; -GtkRange-slider-width: 16; -GtkRange-trough-border: 0; - -GtkWidget-focus-line-width: 0; } -.scale.slider, -.scale.slider:hover, -.scale.slider:insensitive { +scale slider, +scale slider:hover, +scale slider:disabled { border-width: 1px; border-radius: 8px; border-style: none; @@ -600,17 +601,17 @@ GtkLevelBar.vertical { background-position: center; } -.scale.slider.fine-tune:active, -.scale.slider.fine-tune:hover:active, -.scale.slider.fine-tune.horizontal:active, -.scale.slider.fine-tune.horizontal:hover:active { +scale slider.fine-tune:active, +scale slider.fine-tune:hover:active, +scale slider.fine-tune.horizontal:active, +scale slider.fine-tune.horizontal:hover:active { background-size: 98%; background-repeat: no-repeat; background-position: center; } -.toolbar .scale.trough, -.scale.trough { +toolbar scale trough, +scale trough { border-radius: 8px; border-style: solid; border-width: 1px; @@ -624,35 +625,35 @@ GtkLevelBar.vertical { inset -1px -1px alpha(#000, 0.08); } -.scale.trough { +scale trough { margin: 6px 0; } -.scale.trough.vertical { +scale.vertical trough { margin: 0 6px; } -.scale.trough, -.scale.trough.vertical { +scale trough, +scale.vertical trough { border-color: @scale_border_b; } -.scale.trough.highlight, -.scale.trough.highlight.vertical { +scale trough.highlight, +scale.vertical trough.highlight { border-style: none; } -.scale.trough, -.scale.trough.vertical { +scale trough, +scale.vertical trough { border-color: @scale_border_b; } -.scale.trough.highlight, -.scale.trough.highlight.vertical { +scale trough.highlight, +scale.vertical trough.highlight { border-color: @scale_highlight_border; } -.scale.trough:insensitive { +scale trough:disabled { background-image: -gtk-gradient (linear, left top, left bottom, @@ -661,24 +662,24 @@ GtkLevelBar.vertical { border-style: none; } -.scale.progressbar { + scale.progressbar { background-color: @scale_progress_fill; border-width: 1px; border-radius: 3px; border-style: none; } -.scale:insensitive, -.vertical.scale:insensitive { +scale:disabled, +.vertical scale:disabled { background-color: transparent; } -.scale.mark { +scale .mark { color: mix(@theme_bg_color, @theme_text_color, 0.56); } -.menubar .menuitem .scale.highlight.left, -.scale.highlight.left { +menubar menuitem scale.highlight.left, +scale.highlight.left { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@scale_fill, 0.90)), @@ -692,8 +693,8 @@ GtkLevelBar.vertical { text-shadow: none; } -.menubar .menuitem .scale.highlight.bottom, -.scale.highlight.bottom { +menubar menuitem scale.highlight.bottom, +scale.highlight.bottom { background-image: -gtk-gradient (linear, left top, right top, from (shade (@scale_fill, 0.90)), @@ -707,7 +708,7 @@ GtkLevelBar.vertical { text-shadow: none; } -.scale.highlight.left:insensitive { +scale.highlight.left:disabled { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 0.85)), to (shade (@theme_bg_color, 0.85))); @@ -715,7 +716,7 @@ GtkLevelBar.vertical { inset -1px -1px alpha(#000, 0.02); } -.scale.highlight.bottom:insensitive { +scale.highlight.bottom:disabled { background-image: -gtk-gradient (linear, left top, right top, from (shade (@theme_bg_color, 0.85)), to (shade (@theme_bg_color, 0.85))); @@ -726,8 +727,8 @@ GtkLevelBar.vertical { /********** * Frames * **********/ - -.frame { +.frame, +frame { padding: 2px; border-width: 1px; border-radius: 4px; @@ -740,8 +741,9 @@ GtkLevelBar.vertical { color: mix(@theme_selected_bg_color, @theme_fg_color, 0.70); } -/* only render frames in a GtkScrolledWindow */ -GtkScrolledWindow.frame { +/* only render frames in a scrolledwindow */ +scrolledwindow.frame, +scrolledwindow>frame { border-width: 1px; border-radius: 0; border-style: solid; @@ -753,15 +755,15 @@ GtkScrolledWindow.frame { * Buttons * ***********/ -.button.menuitem.menubar { +button menuitem menubar { padding: 4px 8px; } -.button { +button { padding: 4px; } -.button { +button { transition: all 400ms ease-out; -GtkButton-image-spacing: 4; -GtkButton-interior-focus: true; @@ -796,14 +798,14 @@ GtkScrolledWindow.frame { text-shadow: 0px 1px @theme_shadow_color; } -.button.default { +button.default { transition: all 400ms ease-out; text-shadow: none; color: @theme_fg_color; } /* ie. mate-control-center */ -.button.flat { +button.flat { transition: all 400ms ease-out; padding: 0px; border-color: transparent; @@ -811,18 +813,18 @@ GtkScrolledWindow.frame { 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; } /* ie. controls gnome-mplayer, virtual-manager */ -.button.flat.image-button, -.button.flat.image-button:hover, -GtkVolumeButton.button.flat { +button.flat.image-button, +button.flat.image-button:hover, +volumebutton button.flat { padding: 4px; } -.button:hover { +button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_gradient1, 1.03)), @@ -835,11 +837,11 @@ GtkVolumeButton.button.flat { inset 0px -1px shade(@selected_bg_color, 0.93); } -.button:hover:active, -.button:focus:hover:active, -.button:checked, -.button:checked:hover, -.button:checked:hover:active { +button:hover:active, +button:focus:hover:active, +button:checked, +button:checked:hover, +button:checked:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), @@ -853,8 +855,8 @@ GtkVolumeButton.button.flat { inset 0px -1px shade(@selected_bg_color, 0.93); } -.button:focus, -.button.default { +button:focus, +button.default { border-top-color: alpha(@focused_entry_outer, 0.95); border-right-color: alpha(@focused_entry_outer, 1.00); border-left-color: alpha(@focused_entry_outer, 1.00); @@ -865,103 +867,105 @@ GtkVolumeButton.button.flat { inset 0px -1px shade(@selected_bg_color, 0.93); } -.button *:hover:active, -.button *:checked, -.button *:checked:hover, -.button *:checked:hover:active { +button *:hover:active, +button *:checked, +button *:checked:hover, +button *:checked:hover:active { color: @theme_selected_fg_color; text-shadow: 1px 1px @theme_selected_shadow_color; } -.button:insensitive { +button:disabled { background-image: none; background-color: @insensitive_bg_color; - border-color: alpha (#000, 0.00); - border-bottom-color: alpha (#000, 0.00); + color: @insensitive_fg_color; + border-color: transparent; + border-bottom-color: transparent; border-image: none; - box-shadow: inset 0px 1px @insensitive_border_color, + /* Puts borders on Caja toobar buttons, disable */ + /* box-shadow: inset 0px 1px @insensitive_border_color, inset 1px 0px @insensitive_border_color, inset -1px 0px @insensitive_border_color, - inset 0px -1px @insensitive_border_color; + inset 0px -1px @insensitive_border_color;*/ } -.button *:insensitive { +button *:disabled { color: @insensitive_fg_color; text-shadow: none; } -.toolbar.vertical .image-button.flat.button { +toolbar.vertical .image-button.flat button { padding: 5px; } -.button.text-button, -.button.text-button:hover, -GtkFileChooserButton .button { +button.text-button, +button.text-button:hover, +GtkFileChooserButton button { padding: 5px 4px; } -GtkComboBox GtkToggleButton.button, -GtkComboBox GtkToggleButton.button:hover { +combobox GtkToggleButton button, +combobox GtkToggleButton button:hover { padding: 4px; } -GtkFontButton.button, -GtkColorButton.button { +GtkFontButton button, +GtkColorButton button { padding: 6px 4px; } -.path-bar .button, -.path-bar .button GtkImage, -.path-bar .button GtkLabel { +path-bar button, +path-bar button image, +path-bar button label { padding: 2px; } -.path-bar .button { +path-bar button { border-width: 1px 0px 1px 1px; } -.path-bar .button:hover:checked { +path-bar button:hover:checked { border-left-width: 1px; } /* linked path-bar buttons */ -.path-bar.linked .button:dir(ltr), -.path-bar.linked .button:dir(ltr):hover, -.path-bar.linked .button:dir(ltr):hover:active, -.path-bar.linked .button:dir(ltr):checked, -.path-bar.linked .button:dir(ltr):checked:hover, -.path-bar.linked .button:dir(ltr):checked:hover:active { +path-bar.linked button:dir(ltr), +path-bar.linked button:dir(ltr):hover, +path-bar.linked button:dir(ltr):hover:active, +path-bar.linked button:dir(ltr):checked, +path-bar.linked button:dir(ltr):checked:hover, +path-bar.linked button:dir(ltr):checked:hover:active { border-radius: 0px; border-width: 1px 0px 1px 0px; } -.path-bar.linked .button:dir(ltr):first-child, -.path-bar.linked .button:dir(ltr):hover:first-child, -.path-bar.linked .button:dir(ltr):hover:active:first-child, -.path-bar.linked .button:dir(ltr):checked:first-child, -.path-bar.linked .button:dir(ltr):checked:hover:first-child, -.path-bar.linked .button:dir(ltr):checked:hover:active:first-child { +path-bar.linked button:dir(ltr):first-child, +path-bar.linked button:dir(ltr):hover:first-child, +path-bar.linked button:dir(ltr):hover:active:first-child, +path-bar.linked button:dir(ltr):checked:first-child, +path-bar.linked button:dir(ltr):checked:hover:first-child, +path-bar.linked button:dir(ltr):checked:hover:active:first-child { border-radius: 6px 0px 0px 6px; border-width: 1px 0px 1px 1px; } -.path-bar.linked .button:dir(ltr):last-child, -.path-bar.linked .button:dir(ltr):hover:last-child, -.path-bar.linked .button:dir(ltr):hover:active:last-child, -.path-bar.linked .button:dir(ltr):checked:last-child, -.path-bar.linked .button:dir(ltr):checked:hover:last-child, -.path-bar.linked .button:dir(ltr):checked:hover:active:last-child { +path-bar.linked button:dir(ltr):last-child, +path-bar.linked button:dir(ltr):hover:last-child, +path-bar.linked button:dir(ltr):hover:active:last-child, +path-bar.linked button:dir(ltr):checked:last-child, +path-bar.linked button:dir(ltr):checked:hover:last-child, +path-bar.linked button:dir(ltr):checked:hover:active:last-child { border-radius: 0px 6px 6px 0px; border-width: 1px 1px 1px 0px; } -.path-bar.linked .button:dir(ltr):only-child, -.path-bar.linked .button:dir(ltr):hover:only-child, -.path-bar.linked .button:dir(ltr):hover:active:only-child, -.path-bar.linked .button:dir(ltr):checked:only-child, -.path-bar.linked .button:dir(ltr):checked:hover:only-child, -.path-bar.linked .button:dir(ltr):checked:hover:active:only-child { +path-bar.linked button:dir(ltr):only-child, +path-bar.linked button:dir(ltr):hover:only-child, +path-bar.linked button:dir(ltr):hover:active:only-child, +path-bar.linked button:dir(ltr):checked:only-child, +path-bar.linked button:dir(ltr):checked:hover:only-child, +path-bar.linked button:dir(ltr):checked:hover:active:only-child { border-radius: 6px; border-width: 1px; } @@ -969,55 +973,58 @@ GtkColorButton.button { /***************************/ /* Linked toolbars-buttons */ /***************************/ +/* This puts borders on almost ALL toolbar buttons in GTK 3.20-FIXME or disable + when not active of hover*/ /* Middle toolbar-button */ -.toolbar.menubar .linked .button, -.toolbar.menubar .linked .button:focus, -.toolbar.menubar .linked .button:hover, -.toolbar.menubar .linked .button:hover:active, -.toolbar.menubar .linked .button:checked, -.toolbar.menubar .linked .button:checked:focus, -.toolbar.menubar .linked .button:checked:hover, -.toolbar.menubar .linked .button:checked:hover:active, -.toolbar.menubar .linked .button:insensitive, -.toolbar .button.raised.linked, -.toolbar .button.raised.linked:focus, -.toolbar .button.raised.linked:hover, -.toolbar .button.raised.linked:hover:active, -.toolbar .button.raised.linked:checked, -.toolbar .button.raised.linked:checked:focus, -.toolbar .button.raised.linked:checked:hover, -.toolbar .button.raised.linked:checked:hover:active, -.toolbar .button.raised.linked:insensitive, -.toolbar .raised.linked .button, -.toolbar .raised.linked .button:focus, -.toolbar .raised.linked .button:hover, -.toolbar .raised.linked .button:hover:active, -.toolbar .raised.linked .button:checked, -.toolbar .raised.linked .button:checked:focus, -.toolbar .raised.linked .button:checked:hover, -.toolbar .raised.linked .button:checked:hover:active, -.toolbar .raised.linked .button:insensitive, -.primary-toolbar .linked .entry, -.primary-toolbar .linked .entry:insensitive, -.primary-toolbar .linked .button, -.primary-toolbar .linked .button:focus, -.primary-toolbar .linked .button:hover, -.primary-toolbar .linked .button:hover:active, -.primary-toolbar .linked .button:checked, -.primary-toolbar .linked .button:checked:focus, -.primary-toolbar .linked .button:checked:hover, -.primary-toolbar .linked .button:checked:hover:active, -.primary-toolbar .linked .button:insensitive { + +toolbar menubar .linked button, +toolbar menubar .linked button:focus, +toolbar menubar .linked button:hover, +toolbar menubar .linked button:hover:active, +toolbar menubar .linked button:checked, +toolbar menubar .linked button:checked:focus, +toolbar menubar .linked button:checked:hover, +toolbar menubar .linked button:checked:hover:active, +toolbar menubar .linked button:disabled, +toolbar button.raised.linked, +toolbar button.raised.linked:focus, +toolbar button.raised.linked:hover, +toolbar button.raised.linked:hover:active, +toolbar button.raised.linked:checked, +toolbar button.raised.linked:checked:focus, +toolbar button.raised.linked:checked:hover, +toolbar button.raised.linked:checked:hover:active, +toolbar button.raised.linked:disabled, +toolbar .raised.linked button, +toolbar .raised.linked button:focus, +toolbar .raised.linked button:hover, +toolbar .raised.linked button:hover:active, +toolbar .raised.linked button:checked, +toolbar .raised.linked button:checked:focus, +toolbar .raised.linked button:checked:hover, +toolbar .raised.linked button:checked:hover:active, +toolbar .raised.linked button:disabled, +primary-toolbar .linked entry, +primary-toolbar .linked entry:disabled, +primary-toolbar .linked button, +primary-toolbar .linked button:focus, +primary-toolbar .linked button:hover, +primary-toolbar .linked button:hover:active, +primary-toolbar .linked button:checked, +primary-toolbar .linked button:checked:focus, +primary-toolbar .linked button:checked:hover, +primary-toolbar .linked button:checked:hover:active, +primary-toolbar .linked button:disabled { padding: 2px 4px 4px 2px; border-radius: 0px; border-width: 1px 0px 1px 0px; } /* Middle toolbar-button hover */ -.toolbar.menubar .linked .button:hover, -.toolbar .raised.linked .button:hover, -.primary-toolbar .linked .button:hover { +toolbar menubar .linked button:hover, +toolbar .raised.linked button:hover, +primary-toolbar .linked button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -1029,26 +1036,26 @@ GtkColorButton.button { } /* Middle toolbar-button active */ -.toolbar.menubar .linked .button:hover:active, -.toolbar.menubar .linked .button:checked, -.toolbar.menubar .linked .button:checked:focus, -.toolbar.menubar .linked .button:checked:hover, -.toolbar.menubar .linked .button:checked:hover:active, -.toolbar .button.raised.linked:hover:active, -.toolbar .button.raised.linked:checked, -.toolbar .button.raised.linked:checked:focus, -.toolbar .button.raised.linked:checked:hover, -.toolbar .button.raised.linked:checked:hover:active, -.toolbar .raised.linked .button:hover:active, -.toolbar .raised.linked .button:checked, -.toolbar .raised.linked .button:checked:focus, -.toolbar .raised.linked .button:checked:hover, -.toolbar .raised.linked .button:checked:hover:active, -.primary-toolbar .linked .button:hover:active, -.primary-toolbar .linked .button:checked, -.primary-toolbar .linked .button:checked:focus, -.primary-toolbar .linked .button:checked:hover, -.primary-toolbar .linked .button:checked:hover:active { +toolbar menubar .linked button:hover:active, +toolbar menubar .linked button:checked, +toolbar menubar .linked button:checked:focus, +toolbar menubar .linked button:checked:hover, +toolbar menubar .linked button:checked:hover:active, +toolbar button.raised.linked:hover:active, +toolbar button.raised.linked:checked, +toolbar button.raised.linked:checked:focus, +toolbar button.raised.linked:checked:hover, +toolbar button.raised.linked:checked:hover:active, +toolbar .raised.linked button:hover:active, +toolbar .raised.linked button:checked, +toolbar .raised.linked button:checked:focus, +toolbar .raised.linked button:checked:hover, +toolbar .raised.linked button:checked:hover:active, +primary-toolbar .linked button:hover:active, +primary-toolbar .linked button:checked, +primary-toolbar .linked button:checked:focus, +primary-toolbar .linked button:checked:hover, +primary-toolbar .linked button:checked:hover:active { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), @@ -1056,11 +1063,11 @@ GtkColorButton.button { } /* Middle toolbar-button insensitive */ -.toolbar.menubar .linked .button:insensitive, -.toolbar .button.raised.linked:insensitive, -.toolbar .raised.linked .button:insensitive, -.primary-toolbar .linked .button:insensitive, -.primary-toolbar .linked .entry:insensitive { +toolbar menubar .linked button:disabled, +toolbar button.raised.linked:disabled, +toolbar .raised.linked button:disabled, +primary-toolbar .linked button:disabled, +primary-toolbar .linked entry:disabled { /* remove outer */ border-color: alpha (#fff, 0.00); /* Remove right border */ @@ -1070,53 +1077,54 @@ GtkColorButton.button { } /* Leftmost toolbars-button */ -.toolbar.menubar .linked .button:first-child, -.toolbar.menubar .linked .button:focus:first-child, -.toolbar.menubar .linked .button:hover:first-child, -.toolbar.menubar .linked .button:hover:active:first-child, -.toolbar.menubar .linked .button:checked:first-child, -.toolbar.menubar .linked .button:checked:focus:first-child, -.toolbar.menubar .linked .button:checked:hover:first-child, -.toolbar.menubar .linked .button:checked:hover:active:first-child, -.toolbar.menubar .linked .button:insensitive:first-child, -.toolbar .button.raised.linked:first-child, -.toolbar .button.raised.linked:focus:first-child, -.toolbar .button.raised.linked:hover:first-child, -.toolbar .button.raised.linked:hover:active:first-child, -.toolbar .button.raised.linked:checked:first-child, -.toolbar .button.raised.linked:checked:focus:first-child, -.toolbar .button.raised.linked:checked:hover:first-child, -.toolbar .button.raised.linked:checked:hover:active:first-child, -.toolbar .button.raised.linked:insensitive:first-child, -.toolbar .raised.linked .button:first-child, -.toolbar .raised.linked .button:focus:first-child, -.toolbar .raised.linked .button:hover:first-child, -.toolbar .raised.linked .button:hover:active:first-child, -.toolbar .raised.linked .button:checked:first-child, -.toolbar .raised.linked .button:checked:focus:first-child, -.toolbar .raised.linked .button:checked:hover:first-child, -.toolbar .raised.linked .button:checked:hover:active:first-child, -.toolbar .raised.linked .button:insensitive:first-child, -.primary-toolbar .linked .entry:first-child, -.primary-toolbar .linked .button:first-child, -.primary-toolbar .linked .button:focus:first-child, -.primary-toolbar .linked .button:hover:first-child, -.primary-toolbar .linked .button:hover:active:first-child, -.primary-toolbar .linked .button:checked:first-child, -.primary-toolbar .linked .button:checked:focus:first-child, -.primary-toolbar .linked .button:checked:hover:first-child, -.primary-toolbar .linked .button:checked:hover:active:first-child, -.primary-toolbar .linked .button:insensitive:first-child, -.primary-toolbar .linked .entry:insensitive:first-child { +/* +toolbar menubar .linked button:first-child, +toolbar menubar .linked button:focus:first-child, +toolbar menubar .linked button:hover:first-child, +toolbar menubar .linked button:hover:active:first-child, +toolbar menubar .linked button:checked:first-child, +toolbar menubar .linked button:checked:focus:first-child, +toolbar menubar .linked button:checked:hover:first-child, +toolbar menubar .linked button:checked:hover:active:first-child, +toolbar menubar .linked button:disabled:first-child, +toolbar button.raised.linked:first-child, +toolbar button.raised.linked:focus:first-child, +toolbar button.raised.linked:hover:first-child, +toolbar button.raised.linked:hover:active:first-child, +toolbar button.raised.linked:checked:first-child, +toolbar button.raised.linked:checked:focus:first-child, +toolbar button.raised.linked:checked:hover:first-child, +toolbar button.raised.linked:checked:hover:active:first-child, +toolbar button.raised.linked:disabled:first-child, +toolbar .raised.linked button:first-child, +toolbar .raised.linked button:focus:first-child, +toolbar .raised.linked button:hover:first-child, +toolbar .raised.linked button:hover:active:first-child, +toolbar .raised.linked button:checked:first-child, +toolbar .raised.linked button:checked:focus:first-child, +toolbar .raised.linked button:checked:hover:first-child, +toolbar .raised.linked button:checked:hover:active:first-child, +toolbar .raised.linked button:disabled:first-child, +primary-toolbar .linked entry:first-child, +primary-toolbar .linked button:first-child, +primary-toolbar .linked button:focus:first-child, +primary-toolbar .linked button:hover:first-child, +primary-toolbar .linked button:hover:active:first-child, +primary-toolbar .linked button:checked:first-child, +primary-toolbar .linked button:checked:focus:first-child, +primary-toolbar .linked button:checked:hover:first-child, +primary-toolbar .linked button:checked:hover:active:first-child, +primary-toolbar .linked button:disabled:first-child, +primary-toolbar .linked entry:disabled:first-child { padding: 2px 4px 4px 2px; border-radius: 6px 0px 0px 6px; border-width: 1px 0px 1px 1px; } - +*/ /* Leftmost toolbars-button hover */ -.toolbar.menubar .linked .button:hover:first-child, -.toolbar .raised.linked .button:hover:first-child, -.primary-toolbar .linked .button:hover:first-child { +toolbar menubar .linked button:hover:first-child, +toolbar .raised.linked button:hover:first-child, +primary-toolbar .linked button:hover:first-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -1128,26 +1136,26 @@ GtkColorButton.button { } /* Leftmost toolbars-button active */ -.toolbar.menubar .linked .button:hover:active:first-child, -.toolbar.menubar .linked .button:checked:first-child, -.toolbar.menubar .linked .button:checked:focus:first-child, -.toolbar.menubar .linked .button:checked:hover:first-child, -.toolbar.menubar .linked .button:checked:hover:active:first-child, -.toolbar .button.raised.linked:hover:active:first-child, -.toolbar .button.raised.linked:checked:first-child, -.toolbar .button.raised.linked:checked:focus:first-child, -.toolbar .button.raised.linked:checked:hover:first-child, -.toolbar .button.raised.linked:checked:hover:active:first-child, -.toolbar .raised.linked .button:hover:active:first-child, -.toolbar .raised.linked .button:checked:first-child, -.toolbar .raised.linked .button:checked:focus:first-child, -.toolbar .raised.linked .button:checked:hover:first-child, -.toolbar .raised.linked .button:checked:hover:active:first-child, -.primary-toolbar .linked .button:hover:active:first-child, -.primary-toolbar .linked .button:checked:first-child, -.primary-toolbar .linked .button:checked:focus:first-child, -.primary-toolbar .linked .button:checked:hover:first-child, -.primary-toolbar .linked .button:checked:hover:active:first-child { +toolbar menubar .linked button:hover:active:first-child, +toolbar menubar .linked button:checked:first-child, +toolbar menubar .linked button:checked:focus:first-child, +toolbar menubar .linked button:checked:hover:first-child, +toolbar menubar .linked button:checked:hover:active:first-child, +toolbar button.raised.linked:hover:active:first-child, +toolbar button.raised.linked:checked:first-child, +toolbar button.raised.linked:checked:focus:first-child, +toolbar button.raised.linked:checked:hover:first-child, +toolbar button.raised.linked:checked:hover:active:first-child, +toolbar .raised.linked button:hover:active:first-child, +toolbar .raised.linked button:checked:first-child, +toolbar .raised.linked button:checked:focus:first-child, +toolbar .raised.linked button:checked:hover:first-child, +toolbar .raised.linked button:checked:hover:active:first-child, +primary-toolbar .linked button:hover:active:first-child, +primary-toolbar .linked button:checked:first-child, +primary-toolbar .linked button:checked:focus:first-child, +primary-toolbar .linked button:checked:hover:first-child, +primary-toolbar .linked button:checked:hover:active:first-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), @@ -1155,11 +1163,11 @@ GtkColorButton.button { } /* Leftmost toolbars-button insensitive */ -.toolbar.menubar .linked .button:insensitive:first-child, -.toolbar .button.raised.linked:insensitive:first-child, -.toolbar .raised.linked .button:insensitive:first-child, -.primary-toolbar .linked .button:insensitive:first-child, -.primary-toolbar .linked .entry:insensitive:first-child { +toolbar menubar .linked button:disabled:first-child, +toolbar button.raised.linked:disabled:first-child, +toolbar .raised.linked button:disabled:first-child, +primary-toolbar .linked button:disabled:first-child, +primary-toolbar .linked entry:disabled:first-child { /* remove outer */ border-color: alpha (#fff, 0.00); /* Remove right border */ @@ -1169,53 +1177,53 @@ GtkColorButton.button { } /* Rightmost toolbar-button */ -.toolbar.menubar .linked .button:last-child, -.toolbar.menubar .linked .button:focus:last-child, -.toolbar.menubar .linked .button:hover:last-child, -.toolbar.menubar .linked .button:hover:active:last-child, -.toolbar.menubar .linked .button:checked:last-child, -.toolbar.menubar .linked .button:checked:focus:last-child, -.toolbar.menubar .linked .button:checked:hover:last-child, -.toolbar.menubar .linked .button:checked:hover:active:last-child, -.toolbar.menubar .linked .button:insensitive:last-child, -.toolbar .button.raised.linked:last-child, -.toolbar .button.raised.linked:focus:last-child, -.toolbar .button.raised.linked:hover:last-child, -.toolbar .button.raised.linked:hover:active:last-child, -.toolbar .button.raised.linked:checked:last-child, -.toolbar .button.raised.linked:checked:focus:last-child, -.toolbar .button.raised.linked:checked:hover:last-child, -.toolbar .button.raised.linked:checked:hover:active:last-child, -.toolbar .button.raised.linked:insensitive:last-child, -.toolbar .raised.linked .button:last-child, -.toolbar .raised.linked .button:focus:last-child, -.toolbar .raised.linked .button:hover:last-child, -.toolbar .raised.linked .button:hover:active:last-child, -.toolbar .raised.linked .button:checked:last-child, -.toolbar .raised.linked .button:checked:focus:last-child, -.toolbar .raised.linked .button:checked:hover:last-child, -.toolbar .raised.linked .button:checked:hover:active:last-child, -.toolbar .raised.linked .button:insensitive:last-child, -.primary-toolbar .linked .entry:last-child, -.primary-toolbar .linked .button:last-child, -.primary-toolbar .linked .button:focus:last-child, -.primary-toolbar .linked .button:hover:last-child, -.primary-toolbar .linked .button:hover:active:last-child, -.primary-toolbar .linked .button:checked:last-child, -.primary-toolbar .linked .button:checked:focus:last-child, -.primary-toolbar .linked .button:checked:hover:last-child, -.primary-toolbar .linked .button:checked:hover:active:last-child, -.primary-toolbar .linked .button:insensitive:last-child, -.primary-toolbar .linked .entry:insensitive:last-child { +/*toolbar menubar .linked button:last-child,*/ +toolbar menubar .linked button:focus:last-child, +toolbar menubar .linked button:hover:last-child, +toolbar menubar .linked button:hover:active:last-child, +toolbar menubar .linked button:checked:last-child, +toolbar menubar .linked button:checked:focus:last-child, +toolbar menubar .linked button:checked:hover:last-child, +toolbar menubar .linked button:checked:hover:active:last-child, +toolbar menubar .linked button:disabled:last-child, +toolbar button.raised.linked:last-child, +toolbar button.raised.linked:focus:last-child, +toolbar button.raised.linked:hover:last-child, +toolbar button.raised.linked:hover:active:last-child, +toolbar button.raised.linked:checked:last-child, +toolbar button.raised.linked:checked:focus:last-child, +toolbar button.raised.linked:checked:hover:last-child, +toolbar button.raised.linked:checked:hover:active:last-child, +toolbar button.raised.linked:disabled:last-child, +/*toolbar .raised.linked button:last-child,*/ +toolbar .raised.linked button:focus:last-child, +toolbar .raised.linked button:hover:last-child, +toolbar .raised.linked button:hover:active:last-child, +toolbar .raised.linked button:checked:last-child, +toolbar .raised.linked button:checked:focus:last-child, +toolbar .raised.linked button:checked:hover:last-child, +toolbar .raised.linked button:checked:hover:active:last-child, +toolbar .raised.linked button:disabled:last-child, +/*primary-toolbar .linked entry:last-child,*/ +/*primary-toolbar .linked button:last-child,*/ +primary-toolbar .linked button:focus:last-child, +primary-toolbar .linked button:hover:last-child, +primary-toolbar .linked button:hover:active:last-child, +primary-toolbar .linked button:checked:last-child, +primary-toolbar .linked button:checked:focus:last-child, +primary-toolbar .linked button:checked:hover:last-child, +primary-toolbar .linked button:checked:hover:active:last-child, +primary-toolbar .linked button:disabled:last-child, +primary-toolbar .linked entry:disabled:last-child { padding: 2px 4px 4px 2px; border-radius: 0px 6px 6px 0px; border-width: 1px 1px 1px 0px; } /* Rightmost toolbars-button hover */ -.toolbar.menubar .linked .button:hover:last-child, -.toolbar .raised.linked .button:hover:last-child, -.primary-toolbar .linked .button:hover:last-child { +toolbar menubar .linked button:hover:last-child, +toolbar .raised.linked button:hover:last-child, +primary-toolbar .linked button:hover:last-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -1227,26 +1235,26 @@ GtkColorButton.button { } /* Rightmost toolbar-button active */ -.toolbar.menubar .linked .button:hover:active:last-child, -.toolbar.menubar .linked .button:checked:last-child, -.toolbar.menubar .linked .button:checked:focus:last-child, -.toolbar.menubar .linked .button:checked:hover:last-child, -.toolbar.menubar .linked .button:checked:hover:active:last-child, -.toolbar .button.raised.linked:hover:active:last-child, -.toolbar .button.raised.linked:checked:last-child, -.toolbar .button.raised.linked:checked:focus:last-child, -.toolbar .button.raised.linked:checked:hover:last-child, -.toolbar .button.raised.linked:checked:hover:active:last-child, -.toolbar .raised.linked .button:hover:active:last-child, -.toolbar .raised.linked .button:checked:last-child, -.toolbar .raised.linked .button:checked:focus:last-child, -.toolbar .raised.linked .button:checked:hover:last-child, -.toolbar .raised.linked .button:checked:hover:active:last-child, -.primary-toolbar .linked .button:hover:active:last-child, -.primary-toolbar .linked .button:checked:last-child, -.primary-toolbar .linked .button:checked:focus:last-child, -.primary-toolbar .linked .button:checked:hover:last-child, -.primary-toolbar .linked .button:checked:hover:active:last-child { +toolbar menubar .linked button:hover:active:last-child, +toolbar menubar .linked button:checked:last-child, +toolbar menubar .linked button:checked:focus:last-child, +toolbar menubar .linked button:checked:hover:last-child, +toolbar menubar .linked button:checked:hover:active:last-child, +toolbar button.raised.linked:hover:active:last-child, +toolbar button.raised.linked:checked:last-child, +toolbar button.raised.linked:checked:focus:last-child, +toolbar button.raised.linked:checked:hover:last-child, +toolbar button.raised.linked:checked:hover:active:last-child, +toolbar .raised.linked button:hover:active:last-child, +toolbar .raised.linked button:checked:last-child, +toolbar .raised.linked button:checked:focus:last-child, +toolbar .raised.linked button:checked:hover:last-child, +toolbar .raised.linked button:checked:hover:active:last-child, +primary-toolbar .linked button:hover:active:last-child, +primary-toolbar .linked button:checked:last-child, +primary-toolbar .linked button:checked:focus:last-child, +primary-toolbar .linked button:checked:hover:last-child, +primary-toolbar .linked button:checked:hover:active:last-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), @@ -1254,11 +1262,11 @@ GtkColorButton.button { } /* Rightmost toolbar-button insensitive */ -.toolbar.menubar .linked .button:insensitive:last-child, -.toolbar .button.raised.linked:insensitive:last-child, -.toolbar .raised.linked .button:insensitive:last-child, -.primary-toolbar .linked .button:insensitive:last-child, -.primary-toolbar .linked .entry:insensitive:last-child { +toolbar menubar .linked button:disabled:last-child, +toolbar button.raised.linked:disabled:last-child, +toolbar .raised.linked button:disabled:last-child, +primary-toolbar .linked button:disabled:last-child, +primary-toolbar .linked entry:disabled:last-child { border-color: alpha (#fff, 0.00); /* Quita outer */ box-shadow: inset 0px 1px shade(@theme_button_border_dark, 1.10), inset 1px 0px shade(@theme_button_border_dark, 1.05), @@ -1267,49 +1275,50 @@ GtkColorButton.button { } /* Linked single toolbar-button */ -.toolbar.menubar .linked .button:only-child, -.toolbar.menubar .linked .button:hover:only-child, -.toolbar.menubar .linked .button:hover:active:only-child, -.toolbar.menubar .linked .button:checked:only-child, -.toolbar.menubar .linked .button:checked:focus:only-child, -.toolbar.menubar .linked .button:checked:hover:only-child, -.toolbar.menubar .linked .button:checked:hover:active:only-child, -.toolbar.menubar .linked .button:insensitive:only-child, -.toolbar .button.raised.linked:only-child, -.toolbar .button.raised.linked:hover:only-child, -.toolbar .button.raised.linked:hover:active:only-child, -.toolbar .button.raised.linked:checked:only-child, -.toolbar .button.raised.linked:checked:focus:only-child, -.toolbar .button.raised.linked:checked:hover:only-child, -.toolbar .button.raised.linked:checked:hover:active:only-child, -.toolbar .button.raised.linked:insensitive:only-child, -.toolbar .raised.linked .button:only-child, -.toolbar .raised.linked .button:hover:only-child, -.toolbar .raised.linked .button:hover:active:only-child, -.toolbar .raised.linked .button:checked:only-child, -.toolbar .raised.linked .button:checked:focus:only-child, -.toolbar .raised.linked .button:checked:hover:only-child, -.toolbar .raised.linked .button:checked:hover:active:only-child, -.toolbar .raised.linked .button:insensitive:only-child, -.primary-toolbar .linked .entry:only-child, -.primary-toolbar .linked .button:only-child, -.primary-toolbar .linked .button:hover:only-child, -.primary-toolbar .linked .button:hover:active:only-child, -.primary-toolbar .linked .button:checked:only-child, -.primary-toolbar .linked .button:checked:focus:only-child, -.primary-toolbar .linked .button:checked:hover:only-child, -.primary-toolbar .linked .button:checked:hover:active:only-child, -.primary-toolbar .linked .entry:insensitive:only-child, -.primary-toolbar .linked .button:insensitive:only-child { + +/*toolbar menubar .linked button:only-child,*/ +toolbar menubar .linked button:hover:only-child, +toolbar menubar .linked button:hover:active:only-child, +toolbar menubar .linked button:checked:only-child, +toolbar menubar .linked button:checked:focus:only-child, +toolbar menubar .linked button:checked:hover:only-child, +toolbar menubar .linked button:checked:hover:active:only-child, +toolbar menubar .linked button:disabled:only-child, +/*toolbar button.raised.linked:only-child,*/ +toolbar button.raised.linked:hover:only-child, +toolbar button.raised.linked:hover:active:only-child, +toolbar button.raised.linked:checked:only-child, +toolbar button.raised.linked:checked:focus:only-child, +toolbar button.raised.linked:checked:hover:only-child, +toolbar button.raised.linked:checked:hover:active:only-child, +toolbar button.raised.linked:disabled:only-child, +toolbar .raised.linked button:only-child, +toolbar .raised.linked button:hover:only-child, +toolbar .raised.linked button:hover:active:only-child, +toolbar .raised.linked button:checked:only-child, +toolbar .raised.linked button:checked:focus:only-child, +toolbar .raised.linked button:checked:hover:only-child, +toolbar .raised.linked button:checked:hover:active:only-child, +toolbar .raised.linked button:disabled:only-child, +/*primary-toolbar .linked entry:only-child, */ +/*primary-toolbar .linked button:only-child, */ +primary-toolbar .linked button:hover:only-child, +primary-toolbar .linked button:hover:active:only-child, +primary-toolbar .linked button:checked:only-child, +primary-toolbar .linked button:checked:focus:only-child, +primary-toolbar .linked button:checked:hover:only-child, +primary-toolbar .linked button:checked:hover:active:only-child, +primary-toolbar .linked entry:disabled:only-child, +primary-toolbar .linked button:disabled:only-child { border-width: 1px; border-radius: 6px; padding: 2px 4px 4px 2px; } /* Linked single toolbar-button hover */ -.toolbar .raised.linked .button:hover:only-child, -.toolbar.menubar .linked .button:hover:only-child, -.primary-toolbar .linked .button:hover:only-child { +toolbar .raised.linked button:hover:only-child, +toolbar menubar .linked button:hover:only-child, +primary-toolbar .linked button:hover:only-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -1321,26 +1330,26 @@ GtkColorButton.button { } /* Linked single toolbar-button active */ -.toolbar.menubar .linked .button:hover:active:only-child, -.toolbar.menubar .linked .button:checked:only-child, -.toolbar.menubar .linked .button:checked:focus:only-child, -.toolbar.menubar .linked .button:checked:hover:only-child, -.toolbar.menubar .linked .button:checked:hover:active:only-child, -.toolbar .button.raised.linked:hover:active:only-child, -.toolbar .button.raised.linked:checked:only-child, -.toolbar .button.raised.linked:checked:focus:only-child, -.toolbar .button.raised.linked:checked:hover:only-child, -.toolbar .button.raised.linked:checked:hover:active:only-child, -.toolbar .raised.linked .button:hover:active:only-child, -.toolbar .raised.linked .button:checked:only-child, -.toolbar .raised.linked .button:checked:focus:only-child, -.toolbar .raised.linked .button:checked:hover:only-child, -.toolbar .raised.linked .button:checked:hover:active:only-child, -.primary-toolbar .linked .button:hover:active:only-child, -.primary-toolbar .linked .button:checked:only-child, -.primary-toolbar .linked .button:checked:focus:only-child, -.primary-toolbar .linked .button:checked:hover:only-child, -.primary-toolbar .linked .button:checked:hover:active:only-child { +toolbar menubar .linked button:hover:active:only-child, +toolbar menubar .linked button:checked:only-child, +toolbar menubar .linked button:checked:focus:only-child, +toolbar menubar .linked button:checked:hover:only-child, +toolbar menubar .linked button:checked:hover:active:only-child, +toolbar button.raised.linked:hover:active:only-child, +toolbar button.raised.linked:checked:only-child, +toolbar button.raised.linked:checked:focus:only-child, +toolbar button.raised.linked:checked:hover:only-child, +toolbar button.raised.linked:checked:hover:active:only-child, +toolbar .raised.linked button:hover:active:only-child, +toolbar .raised.linked button:checked:only-child, +toolbar .raised.linked button:checked:focus:only-child, +toolbar .raised.linked button:checked:hover:only-child, +toolbar .raised.linked button:checked:hover:active:only-child, +primary-toolbar .linked button:hover:active:only-child, +primary-toolbar .linked button:checked:only-child, +primary-toolbar .linked button:checked:focus:only-child, +primary-toolbar .linked button:checked:hover:only-child, +primary-toolbar .linked button:checked:hover:active:only-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), @@ -1348,11 +1357,11 @@ GtkColorButton.button { } /* Linked single toolbar-button insensitive */ -.toolbar.menubar .linked .button:insensitive:only-child, -.toolbar .button.raised.linked:insensitive:only-child, -.toolbar .raised.linked .button:insensitive:only-child, -.primary-toolbar .linked .entry:insensitive:only-child, -.primary-toolbar .linked .button:insensitive:only-child { +toolbar menubar .linked button:disabled:only-child, +toolbar button.raised.linked:disabled:only-child, +toolbar .raised.linked button:disabled:only-child, +primary-toolbar .linked entry:disabled:only-child, +primary-toolbar .linked button:disabled:only-child { border-color: alpha (#fff, 0.00); /* Quita outer */ box-shadow: inset 0px 1px shade(@theme_button_border_dark, 1.10), inset 1px 0px shade(@theme_button_border_dark, 1.05), @@ -1361,102 +1370,102 @@ GtkColorButton.button { } /* nth-child for linked areas */ -.toolbar .raised.linked.button, -.toolbar .raised.linked.button:hover:active, -.toolbar .raised.linked.button:checked, -.toolbar .raised.linked.button:checked:hover, -.toolbar .raised.linked.button:checked:hover:active, -.toolbar .raised.linked .button, -.toolbar .raised.linked .button:hover:active, -.toolbar .raised.linked .button:checked, -.toolbar .raised.linked .button:checked:hover, -.toolbar .raised.linked .button:checked:hover:active { -} - -.toolbar .raised.linked.button:nth-child(first) , -.toolbar .raised.linked.button:hover:active:nth-child(first), -.toolbar .raised.linked.button:checked:nth-child(first), -.toolbar .raised.linked.button:checked:hover:nth-child(first), -.toolbar .raised.linked:nth-child(first) .button, -.toolbar .raised.linked:nth-child(first) .button:hover:active, -.toolbar .raised.linked:nth-child(first) .button:checked, -.toolbar .raised.linked:nth-child(first) .button:checked:hover { -} - -.toolbar .raised.linked.button:nth-child(last), -.toolbar .raised.linked.button:hover:active:nth-child(last), -.toolbar .raised.linked.button:checked:nth-child(last), -.toolbar .raised.linked.button:checked:hover:nth-child(last), -.toolbar .raised.linked:nth-child(last) .button, -.toolbar .raised.linked:nth-child(last) .button:hover:active, -.toolbar .raised.linked:nth-child(last) .button:checked, -.toolbar .raised.linked:nth-child(last) .button:checked:hover { +/*toolbar .raised.linked button, */ +toolbar .raised.linked button:hover:active, +toolbar .raised.linked button:checked, +toolbar .raised.linked button:checked:hover, +toolbar .raised.linked button:checked:hover:active, +toolbar .raised.linked button, +toolbar .raised.linked button:hover:active, +toolbar .raised.linked button:checked, +toolbar .raised.linked button:checked:hover, +toolbar .raised.linked button:checked:hover:active { +} + +/*toolbar .raised.linked button:nth-child(first) , */ +toolbar .raised.linked button:hover:active:nth-child(first), +toolbar .raised.linked button:checked:nth-child(first), +toolbar .raised.linked button:checked:hover:nth-child(first), +toolbar .raised.linked:nth-child(first) button, +toolbar .raised.linked:nth-child(first) button:hover:active, +toolbar .raised.linked:nth-child(first) button:checked, +toolbar .raised.linked:nth-child(first) button:checked:hover { +} + +/*toolbar .raised.linked button:nth-child(last), */ +toolbar .raised.linked button:hover:active:nth-child(last), +toolbar .raised.linked button:checked:nth-child(last), +toolbar .raised.linked button:checked:hover:nth-child(last), +toolbar .raised.linked:nth-child(last) button, +toolbar .raised.linked:nth-child(last) button:hover:active, +toolbar .raised.linked:nth-child(last) button:checked, +toolbar .raised.linked:nth-child(last) button:checked:hover { } /***************************/ /* Linked standard buttons */ /***************************/ -.linked .entry, -.linked > GtkComboBox > .button, -.linked > GtkComboBox > .button:focus -.linked > GtkComboBox > .button:checked, -.linked > GtkComboBox > .button:hover, -.linked > GtkComboBox > .button:focus:hover, -.linked > GtkComboBox > .button:insensitive, -.linked .button, -.linked .button:focus, -.linked .button:checked, -.linked .button:hover, -.linked .button:focus:hover, -.linked .button:hover:active, -.linked .button:checked:hover, -.linked .button:checked:hover:active, -.linked .button:insensitive { +/*.linked entry, +.linked > combobox > button,*/ +.linked > combobox > button:focus +.linked > combobox > button:checked, +.linked > combobox > button:hover, +.linked > combobox > button:focus:hover, +.linked > combobox > button:disabled, +/*.linked button,*/ +.linked button:focus, +.linked button:checked, +.linked button:hover, +.linked button:focus:hover, +.linked button:hover:active, +.linked button:checked:hover, +.linked button:checked:hover:active, +.linked button:disabled { padding-left: 5px; padding-right: 5px; border-width: 1px 1px 2px 1px; border-radius: 6px; } -.linked .entry { +.linked entry { padding: 5px 4px; } -.linked > GtkComboBox > .button, -.linked > GtkComboBox > .button:focus, -.linked > GtkComboBox > .button:hover, -.linked > GtkComboBox > .button:checked, -.linked > GtkComboBox > .button:focus:hover, -.linked > GtkComboBox > .button:insensitive { +.linked > combobox > button, +.linked > combobox > button:focus, +.linked > combobox > button:hover, +.linked > combobox > button:checked, +.linked > combobox > button:focus:hover, +.linked > combobox > button:disabled { padding: 5px 6px; } -.linked .button, -.linked .button:focus, -.linked .button:hover, -.linked .button:checked, -.linked .button:focus:active, -.linked .button:focus:hover:active, -.linked .button:hover:active, -.linked .button:checked:hover, -.linked .button:checked:hover:active, -.linked .button:insensitive { +.linked button, +.linked button:focus, +.linked button:hover, +.linked button:checked, +.linked button:focus:active, +.linked button:focus:hover:active, +.linked button:hover:active, +.linked button:checked:hover, +.linked button:checked:hover:active, +.linked button:disabled { padding: 4px; } -.linked > GtkComboBox > .button:insensitive, -.linked .button:insensitive { +.linked > combobox > button:disabled, +.linked button:disabled { background-color: @insensitive_bg_color; border-color: alpha (#000, 0.00); border-bottom-color: alpha (#000, 0.00); color: @insensitive_fg_color; } -.linked > GtkComboBox > .button, -.linked > GtkComboBox > .button:focus, -.linked .button, -.linked .button:focus { +.linked > combobox > button, +.linked > combobox > button:focus, +.linked button, +.linked button:focus { background-image: -gtk-gradient (linear, left top, left bottom, from (@button_gradient1), @@ -1466,11 +1475,11 @@ GtkColorButton.button { } -.linked > GtkComboBox > .button:hover, -.linked > GtkComboBox > .button:focus:hover, -.linked .button:hover, -.linked .button:focus:hover, -.linked .button:checked:hover { +.linked > combobox > button:hover, +.linked > combobox > button:focus:hover, +.linked button:hover, +.linked button:focus:hover, +.linked button:checked:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_gradient1, 1.03)), @@ -1479,10 +1488,10 @@ GtkColorButton.button { to (shade(@button_gradient4, 1.01))); } -.linked > GtkComboBox > .button:checked, -.linked > GtkComboBox > .button:checked:hover:active, -.linked .button:checked, -.linked .button:checked:hover:active { +.linked > combobox > button:checked, +.linked > combobox > button:checked:hover:active, +.linked button:checked, +.linked button:checked:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), @@ -1492,20 +1501,20 @@ GtkColorButton.button { } /* default button */ -.linked .button.default, -.linked .button.default:focus, -.linked .button.default:first-child, -.linked .button.default:focus:first-child { +.linked button.default, +.linked button.default:focus, +.linked button.default:first-child, +.linked button.default:focus:first-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.3), inset 1px 0px shade(@selected_bg_color, 1.3), inset -1px 0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0), inset 0px -1px shade(@selected_bg_color, 1.3); } -.linked .button.default:last-child, -.linked .button.default:focus:last-child, -.linked .button.default:only-child, -.linked .button.default:focus:only-child { +.linked button.default:last-child, +.linked button.default:focus:last-child, +.linked button.default:only-child, +.linked button.default:focus:only-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), @@ -1513,11 +1522,12 @@ GtkColorButton.button { } /* Middle button */ -.linked .entry, -.linked > GtkComboBox > .button:last-child, -.linked > GtkComboBox > .button:focus:last-child, -.linked .button, -.linked .button:focus { +/* +.linked entry, +.linked > combobox > button:last-child, +.linked > combobox > button:focus:last-child, +.linked button, +.linked button:focus { box-shadow: inset 0px 1px alpha(shade(@button_border, 1.00), 0.70), inset 1px 0px alpha(shade(@button_border, 0.94), 0.80), inset -1px 0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0), @@ -1526,14 +1536,14 @@ GtkColorButton.button { border-left-width: 0px; border-radius: 0; } - +*/ /* Middle Button active */ -.linked > GtkComboBox > .button:checked:last-child, -.linked > GtkComboBox > .button:checked:hover:active:last-child, -.linked .button:focus:active, -.linked .button:hover:active, -.linked .button:checked, -.linked .button:checked:hover:active { +.linked > combobox > button:checked:last-child, +.linked > combobox > button:checked:hover:active:last-child, +.linked button:focus:active, +.linked button:hover:active, +.linked button:checked, +.linked button:checked:hover:active { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0), @@ -1544,10 +1554,10 @@ GtkColorButton.button { } /* Middle button hover */ -.linked > GtkComboBox > .button:hover:last-child, -.linked > GtkComboBox > .button:focus:hover:last-child, -.linked .button:hover, -.linked .button:checked:hover { +.linked > combobox > button:hover:last-child, +.linked > combobox > button:focus:hover:last-child, +.linked button:hover, +.linked button:checked:hover { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0), @@ -1558,8 +1568,8 @@ GtkColorButton.button { } /* Middle button insensitive */ -.linked > GtkComboBox > .button:insensitive:last-child, -.linked .button:insensitive { +.linked > combobox > button:disabled:last-child, +.linked button:disabled { box-shadow: inset 0px 1px @insensitive_border_color, inset 1px 0px @insensitive_border_color, inset -1px 0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0), @@ -1570,11 +1580,12 @@ GtkColorButton.button { } /* Leftmost button */ -.linked .entry:first-child, -.linked > GtkComboBox:first-child > .button:last-child, -.linked > GtkComboBox:first-child > .button:focus:last-child, -.linked .button:first-child, -.linked .button:focus:first-child { +/* +.linked entry:first-child, +.linked > combobox:first-child > button:last-child, +.linked > combobox:first-child > button:focus:last-child, +.linked button:first-child, +.linked button:focus:first-child { box-shadow: inset 0px 1px alpha(shade(@button_border, 1.00), 0.70), inset 1px 0px alpha(shade(@button_border, 0.94), 0.80), inset -1px 0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0), @@ -1582,14 +1593,14 @@ GtkColorButton.button { border-radius: 6px 0 0 6px; border-right-width: 0; } - +*/ /* Leftmost button active */ -.linked > GtkComboBox:first-child > .button:checked:first-child:last-child, -.linked > GtkComboBox:first-child > .button:checked:hover:active:last-child, -.linked .button:focus:active:first-child, -.linked .button:hover:active:first-child, -.linked .button:checked:first-child, -.linked .button:checked:hover:active:first-child { +.linked > combobox:first-child > button:checked:first-child:last-child, +.linked > combobox:first-child > button:checked:hover:active:last-child, +.linked button:focus:active:first-child, +.linked button:hover:active:first-child, +.linked button:checked:first-child, +.linked button:checked:hover:active:first-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0), @@ -1599,10 +1610,10 @@ GtkColorButton.button { } /* Leftmost button hover */ -.linked > GtkComboBox:first-child > .button:hover:last-child, -.linked > GtkComboBox:first-child > .button:hover:focus:last-child, -.linked .button:hover:first-child, -.linked .button:checked:hover:first-child { +.linked > combobox:first-child > button:hover:last-child, +.linked > combobox:first-child > button:hover:focus:last-child, +.linked button:hover:first-child, +.linked button:checked:hover:first-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0), @@ -1612,8 +1623,8 @@ GtkColorButton.button { } /* Leftmost button insensitive */ -.linked > GtkComboBox:first-child > .button:insensitive:last-child, -.linked .button:insensitive:first-child { +.linked > combobox:first-child > button:disabled:last-child, +.linked button:disabled:first-child { box-shadow: inset 0px 1px @insensitive_border_color, inset 1px 0px @insensitive_border_color, inset -1px 0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0), @@ -1623,11 +1634,12 @@ GtkColorButton.button { } /* Rightmost button */ -.linked .entry:last-child, -.linked > GtkComboBox:last-child > .button:last-child, -.linked > GtkComboBox:last-child > .button:focus:last-child, -.linked .button:last-child, -.linked .button:focus:last-child { +/* +.linked entry:last-child, +.linked > combobox:last-child > button:last-child, +.linked > combobox:last-child > button:focus:last-child, +.linked button:last-child, +.linked button:focus:last-child { box-shadow: inset 0px 1px alpha(shade(@button_border, 1.00), 0.70), inset 1px 0px alpha(shade(@button_border, 0.94), 0.80), inset -1px 0px alpha(shade(@button_border, 0.94), 0.80), @@ -1635,14 +1647,14 @@ GtkColorButton.button { border-radius: 0 6px 6px 0; border-left-width: 0; } - +*/ /* Rightmost button active */ -.linked > GtkComboBox:last-child > .button:checked:last-child, -.linked > GtkComboBox:last-child > .button:checked:hover:active:last-child, -.linked .button:focus:active:last-child, -.linked .button:hover:active:last-child, -.linked .button:checked:last-child, -.linked .button:checked:hover:active:last-child { +.linked > combobox:last-child > button:checked:last-child, +.linked > combobox:last-child > button:checked:hover:active:last-child, +.linked button:focus:active:last-child, +.linked button:hover:active:last-child, +.linked button:checked:last-child, +.linked button:checked:hover:active:last-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), @@ -1652,10 +1664,10 @@ GtkColorButton.button { } /* Rightmost button hover */ -.linked > GtkComboBox:last-child > .button:hover:last-child, -.linked > GtkComboBox:last-child > .button:hover:focus:last-child, -.linked .button:hover:last-child, -.linked .button:checked:hover:last-child { +.linked > combobox:last-child > button:hover:last-child, +.linked > combobox:last-child > button:hover:focus:last-child, +.linked button:hover:last-child, +.linked button:checked:hover:last-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), @@ -1665,8 +1677,8 @@ GtkColorButton.button { } /* Rightmost button insensitive */ -.linked > GtkComboBox:last-child > .button:insensitive:last-child, -.linked .button:insensitive:last-child { +.linked > combobox:last-child > button:disabled:last-child, +.linked button:disabled:last-child { box-shadow: inset 0px 1px @insensitive_border_color, inset 1px 0px @insensitive_border_color, inset -1px 0px @insensitive_border_color, @@ -1676,23 +1688,23 @@ GtkColorButton.button { } /* Linked single button */ -.linked .entry:only-child, -.linked > GtkComboBox:only-child > .button:last-child, -.linked > GtkComboBox:only-child > .button:focus:last-child, -.linked .button:only-child, -.linked .button:focus:only-child { +.linked entry:only-child, +.linked > combobox:only-child > button:last-child, +.linked > combobox:only-child > button:focus:last-child, +.linked button:only-child, +.linked button:focus:only-child { border-radius: 6px; } -.linked > GtkComboBox:only-child > .button:hover:last-child, -.linked > GtkComboBox:only-child > .button:checked:last-child, -.linked > GtkComboBox:only-child > .button:focus:hover:last-child, -.linked .button:hover:only-child, -.linked .button:hover:active:only-child, -.linked .button:focus:active:only-child, -.linked .button:checked:only-child, -.linked .button:checked:hover:only-child, -.linked .button:checked:hover:active:only-child { +.linked > combobox:only-child > button:hover:last-child, +.linked > combobox:only-child > button:checked:last-child, +.linked > combobox:only-child > button:focus:hover:last-child, +.linked button:hover:only-child, +.linked button:hover:active:only-child, +.linked button:focus:active:only-child, +.linked button:checked:only-child, +.linked button:checked:hover:only-child, +.linked button:checked:hover:active:only-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), @@ -1701,8 +1713,8 @@ GtkColorButton.button { } /* Linked single button insensitive */ -.linked > GtkComboBox:only-child > .button:insensitive:last-child, -.linked .button:insensitive:only-child { +.linked > combobox:only-child > button:disabled:last-child, +.linked button:disabled:only-child { box-shadow: inset 0px 1px @insensitive_border_color, inset 1px 0px @insensitive_border_color, inset -1px 0px @insensitive_border_color, @@ -1712,10 +1724,10 @@ GtkColorButton.button { /* vertical */ /* Middle button */ -.vertical.linked > GtkComboBox > .button:last-child, -.vertical.linked > GtkComboBox > .button:focus:last-child, -.vertical.linked .button, -.vertical.linked .button:focus { +.vertical.linked > combobox > button:last-child, +.vertical.linked > combobox > button:focus:last-child, +.vertical.linked button, +.vertical.linked button:focus { box-shadow: inset 0px 1px alpha(shade(@button_border, 1.00), 0.90), inset 1px 0px alpha(shade(@button_border, 0.94), 0.90), inset -1px 0px alpha(shade(@button_border, 0.88), 0.90), @@ -1724,16 +1736,16 @@ GtkColorButton.button { border-width: 0px 1px 1px 1px; } -.vertical.linked > GtkComboBox > .button:hover:last-child, -.vertical.linked > GtkComboBox > .button:focus:hover:last-child, -.vertical.linked > GtkComboBox > .button:checked:last-child, -.vertical.linked .button:hover, -.vertical.linked .button:checked, -.vertical.linked .button:focus:hover, -.vertical.linked .button:focus:hover:active, -.vertical.linked .button:hover:active, -.vertical.linked .button:checked:active, -.vertical.linked .button:checked:hover:active { +.vertical.linked > combobox > button:hover:last-child, +.vertical.linked > combobox > button:focus:hover:last-child, +.vertical.linked > combobox > button:checked:last-child, +.vertical.linked button:hover, +.vertical.linked button:checked, +.vertical.linked button:focus:hover, +.vertical.linked button:focus:hover:active, +.vertical.linked button:hover:active, +.vertical.linked button:checked:active, +.vertical.linked button:checked:hover:active { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), @@ -1742,8 +1754,8 @@ GtkColorButton.button { border-width: 0px 1px 1px 1px; } -.vertical.linked > GtkComboBox > .button:insensitive:last-child, -.vertical.linked .button:insensitive { +.vertical.linked > combobox > button:disabled:last-child, +.vertical.linked button:disabled { box-shadow: inset 0px 1px @insensitive_border_color, inset 1px 0px @insensitive_border_color, inset -1px 0px @insensitive_border_color, @@ -1754,10 +1766,10 @@ GtkColorButton.button { /* Top button */ -.vertical.linked > GtkComboBox:first-child > .button:last-child, -.vertical.linked > GtkComboBox:first-child > .button:focus:last-child, -.vertical.linked .button:first-child, -.vertical.linked .button:focus:first-child { +.vertical.linked > combobox:first-child > button:last-child, +.vertical.linked > combobox:first-child > button:focus:last-child, +.vertical.linked button:first-child, +.vertical.linked button:focus:first-child { box-shadow: inset 0px 1px alpha(shade(@button_border, 1.00), 0.70), inset 1px 0px alpha(shade(@button_border, 0.94), 0.90), inset -1px 0px alpha(shade(@button_border, 0.88), 0.90); @@ -1765,16 +1777,16 @@ GtkColorButton.button { border-width: 1px 1px 1px 1px; } -.vertical.linked > GtkComboBox:first-child > .button:hover:last-child, -.vertical.linked > GtkComboBox:first-child > .button:focus:hover:last-child, -.vertical.linked > GtkComboBox:first-child > .button:checked:last-child, -.vertical.linked .button:hover:first-child, -.vertical.linked .button:checked:first-child, -.vertical.linked .button:focus:hover:first-child, -.vertical.linked .button:focus:hover:active:first-child, -.vertical.linked .button:hover:active:first-child, -.vertical.linked .button:checked:active:first-child, -.vertical.linked .button:checked:hover:active:first-child { +.vertical.linked > combobox:first-child > button:hover:last-child, +.vertical.linked > combobox:first-child > button:focus:hover:last-child, +.vertical.linked > combobox:first-child > button:checked:last-child, +.vertical.linked button:hover:first-child, +.vertical.linked button:checked:first-child, +.vertical.linked button:focus:hover:first-child, +.vertical.linked button:focus:hover:active:first-child, +.vertical.linked button:hover:active:first-child, +.vertical.linked button:checked:active:first-child, +.vertical.linked button:checked:hover:active:first-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.3), inset 1px 0px shade(@selected_bg_color, 1.05), inset -1px 0px shade(@selected_bg_color, 0.93); @@ -1782,8 +1794,8 @@ GtkColorButton.button { border-width: 1px 1px 1px 1px; } -.vertical.linked > GtkComboBox:first-child > .button:insensitive:last-child, -.vertical.linked .button:insensitive:first-child { +.vertical.linked > combobox:first-child > button:disabled:last-child, +.vertical.linked button:disabled:first-child { box-shadow: inset 0px 1px @insensitive_border_color, inset 1px 0px @insensitive_border_color, inset -1px 0px @insensitive_border_color; @@ -1793,10 +1805,10 @@ GtkColorButton.button { /* Bottom button */ -.vertical.linked > GtkComboBox:last-child > .button:last-child, -.vertical.linked > GtkComboBox:last-child > .button:focus:last-child, -.vertical.linked .button:last-child, -.vertical.linked .button:focus:last-child { +.vertical.linked > combobox:last-child > button:last-child, +.vertical.linked > combobox:last-child > button:focus:last-child, +.vertical.linked button:last-child, +.vertical.linked button:focus:last-child { box-shadow: inset 1px 0px alpha(shade(@button_border, 0.94), 0.90), inset -1px 0px alpha(shade(@button_border, 0.94), 0.90), inset 0px -1px alpha(shade(@button_border, 0.88), 0.70); @@ -1804,16 +1816,16 @@ GtkColorButton.button { border-width: 0px 1px 1px 1px; } -.vertical.linked > GtkComboBox:last-child > .button:hover:last-child, -.vertical.linked > GtkComboBox:last-child > .button:focus:hover:last-child, -.vertical.linked > GtkComboBox:last-child > .button:checked:last-child, -.vertical.linked .button:hover:last-child, -.vertical.linked .button:checked:last-child, -.vertical.linked .button:focus:hover:last-child, -.vertical.linked .button:focus:hover:active:last-child, -.vertical.linked .button:hover:active:last-child, -.vertical.linked .button:checked:active:last-child, -.vertical.linked .button:checked:hover:active:last-child { +.vertical.linked > combobox:last-child > button:hover:last-child, +.vertical.linked > combobox:last-child > button:focus:hover:last-child, +.vertical.linked > combobox:last-child > button:checked:last-child, +.vertical.linked button:hover:last-child, +.vertical.linked button:checked:last-child, +.vertical.linked button:focus:hover:last-child, +.vertical.linked button:focus:hover:active:last-child, +.vertical.linked button:hover:active:last-child, +.vertical.linked button:checked:active:last-child, +.vertical.linked button:checked:hover:active:last-child { box-shadow: inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), inset 0px -1px shade(@selected_bg_color, 0.93); @@ -1821,8 +1833,8 @@ GtkColorButton.button { border-width: 0px 1px 1px 1px; } -.vertical.linked > GtkComboBox:last-child > .button:insensitive:last-child, -.vertical.linked .button:insensitive:last-child { +.vertical.linked > combobox:last-child > button:disabled:last-child, +.vertical.linked button:disabled:last-child { box-shadow: inset 1px 0px @insensitive_border_color, inset -1px 0px @insensitive_border_color, inset 0px -1px @insensitive_border_color; @@ -1832,10 +1844,10 @@ GtkColorButton.button { /* Single button */ -.vertical.linked > GtkComboBox:only-child > .button:last-child, -.vertical.linked > GtkComboBox:only-child > .button:focus:last-child, -.vertical.linked .button:only-child, -.vertical.linked .button:focus:only-child { +.vertical.linked > combobox:only-child > button:last-child, +.vertical.linked > combobox:only-child > button:focus:last-child, +.vertical.linked button:only-child, +.vertical.linked button:focus:only-child { box-shadow: inset 0px 1px alpha(shade(@button_border, 0.94), 0.90), inset 1px 0px alpha(shade(@button_border, 0.94), 0.90), inset -1px 0px alpha(shade(@button_border, 0.94), 0.90), @@ -1844,16 +1856,16 @@ GtkColorButton.button { border-width: 1px; } -.vertical.linked > GtkComboBox:only-child > .button:hover:last-child, -.vertical.linked > GtkComboBox:only-child > .button:focus:hover:last-child, -.vertical.linked > GtkComboBox:only-child > .button:checked:last-child, -.vertical.linked .button:hover:only-child, -.vertical.linked .button:checked:only-child, -.vertical.linked .button:focus:hover:only-child, -.vertical.linked .button:focus:hover:active:only-child, -.vertical.linked .button:hover:active:only-child, -.vertical.linked .button:checked:active:only-child, -.vertical.linked .button:checked:hover:active:only-child { +.vertical.linked > combobox:only-child > button:hover:last-child, +.vertical.linked > combobox:only-child > button:focus:hover:last-child, +.vertical.linked > combobox:only-child > button:checked:last-child, +.vertical.linked button:hover:only-child, +.vertical.linked button:checked:only-child, +.vertical.linked button:focus:hover:only-child, +.vertical.linked button:focus:hover:active:only-child, +.vertical.linked button:hover:active:only-child, +.vertical.linked button:checked:active:only-child, +.vertical.linked button:checked:hover:active:only-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), @@ -1862,8 +1874,8 @@ GtkColorButton.button { border-width: 1px; } -.vertical.linked > GtkComboBox:only-child > .button:insensitive:last-child, -.vertical.linked .button:insensitive:only-child { +.vertical.linked > combobox:only-child > button:disabled:last-child, +.vertical.linked button:disabled:only-child { box-shadow: inset 0px 1px @insensitive_border_color, inset 1px 0px @insensitive_border_color, inset -1px 0px @insensitive_border_color, @@ -1877,12 +1889,12 @@ GtkColorButton.button { /*************************/ /* Middle button */ -.inline-toolbar.toolbar .button, -.inline-toolbar.toolbar .button:checked, -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton > .button, -.inline-toolbar.toolbar GtkToolButton > .button:checked, -.inline-toolbar.toolbar GtkToolButton > .button:insensitive { +.inline-toolbar toolbar button, +.inline-toolbar toolbar button:checked, +.inline-toolbar toolbar button:disabled, +.inline-toolbar toolbar GtkToolButton > button, +.inline-toolbar toolbar GtkToolButton > button:checked, +.inline-toolbar toolbar GtkToolButton > button:disabled { /* outer */ border-width: 0px; border-right-width: 0px; @@ -1896,11 +1908,11 @@ GtkColorButton.button { inset 0px -1px alpha(#fff, 0.05); } -.inline-toolbar.toolbar .button:hover:active, -.inline-toolbar.toolbar .button:checked, -.inline-toolbar.toolbar .button:checked:hover, -.inline-toolbar.toolbar .button:checked:hover:active, -.inline-toolbar.toolbar GtkToolButton > .button:checked { +.inline-toolbar toolbar button:hover:active, +.inline-toolbar toolbar button:checked, +.inline-toolbar toolbar button:checked:hover, +.inline-toolbar toolbar button:checked:hover:active, +.inline-toolbar toolbar GtkToolButton > button:checked { background-color: transparent; box-shadow: inset 0px 1px alpha(#000, 0.05), inset 2px 0px alpha(#000, 0.03), @@ -1909,18 +1921,18 @@ GtkColorButton.button { inset 0px -1px alpha(#000, 0.02); } -.inline-toolbar.toolbar .button:insensitive, -.inline-toolbar.toolbar GtkToolButton > .button:insensitive { +.inline-toolbar toolbar button:disabled, +.inline-toolbar toolbar GtkToolButton > button:disabled { box-shadow: inset 1px 0px shade(@button_border, 1.10); } /* Leftmost button */ -.inline-toolbar.toolbar .button:first-child, -.inline-toolbar.toolbar .button:checked:first-child, -.inline-toolbar.toolbar .button:insensitive:first-child, -.inline-toolbar.toolbar GtkToolButton:first-child > .button, -.inline-toolbar.toolbar GtkToolButton:first-child > .button:checked, -.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive { +.inline-toolbar toolbar button:first-child, +.inline-toolbar toolbar button:checked:first-child, +.inline-toolbar toolbar button:disabled:first-child, +.inline-toolbar toolbar GtkToolButton:first-child > button, +.inline-toolbar toolbar GtkToolButton:first-child > button:checked, +.inline-toolbar toolbar GtkToolButton:first-child > button:disabled { border-width: 0px; border-radius: 0px; box-shadow: inset 0px 1px alpha(#fff, 0.09), @@ -1929,11 +1941,11 @@ GtkColorButton.button { inset 0px -1px alpha(#fff, 0.05); } -.inline-toolbar.toolbar .button:hover:active:first-child, -.inline-toolbar.toolbar .button:checked:first-child, -.inline-toolbar.toolbar .button:checked:hover:first-child, -.inline-toolbar.toolbar .button:checked:hover:active:first-child, -.inline-toolbar.toolbar GtkToolButton:first-child > .button:checked { +.inline-toolbar toolbar button:hover:active:first-child, +.inline-toolbar toolbar button:checked:first-child, +.inline-toolbar toolbar button:checked:hover:first-child, +.inline-toolbar toolbar button:checked:hover:active:first-child, +.inline-toolbar toolbar GtkToolButton:first-child > button:checked { background-color: transparent; box-shadow: inset 0px 1px alpha(#000, 0.05), @@ -1942,18 +1954,18 @@ GtkColorButton.button { inset 0px -1px alpha(#000, 0.02); } -.inline-toolbar.toolbar .button:insensitive:first-child, -.inline-toolbar.toolbar GtkToolButton:first-child > .button:insensitive { +.inline-toolbar toolbar button:disabled:first-child, +.inline-toolbar toolbar GtkToolButton:first-child > button:disabled { box-shadow: none; } /* Rightmost button */ -.inline-toolbar.toolbar .button:last-child, -.inline-toolbar.toolbar .button:checked:last-child, -.inline-toolbar.toolbar .button:insensitive:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive { +.inline-toolbar toolbar button:last-child, +.inline-toolbar toolbar button:checked:last-child, +.inline-toolbar toolbar button:disabled:last-child, +.inline-toolbar toolbar GtkToolButton:last-child > button, +.inline-toolbar toolbar GtkToolButton:last-child > button:checked, +.inline-toolbar toolbar GtkToolButton:last-child > button:disabled { border-width: 0px; border-radius: 0px; box-shadow: inset 0px 1px alpha(#fff, 0.09), @@ -1964,11 +1976,11 @@ GtkColorButton.button { inset 0px -1px alpha(#fff, 0.05); } -.inline-toolbar.toolbar .button:hover:active:last-child, -.inline-toolbar.toolbar .button:checked:last-child, -.inline-toolbar.toolbar .button:checked:hover:last-child, -.inline-toolbar.toolbar .button:checked:hover:active:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:checked { +.inline-toolbar toolbar button:hover:active:last-child, +.inline-toolbar toolbar button:checked:last-child, +.inline-toolbar toolbar button:checked:hover:last-child, +.inline-toolbar toolbar button:checked:hover:active:last-child, +.inline-toolbar toolbar GtkToolButton:last-child > button:checked { background-color: transparent; box-shadow: inset 0px 1px alpha(#000, 0.05), inset 2px 0px alpha(#000, 0.03), @@ -1978,19 +1990,19 @@ GtkColorButton.button { inset 0px -1px alpha(#000, 0.02); } -.inline-toolbar.toolbar .button:insensitive:last-child, -.inline-toolbar.toolbar GtkToolButton:last-child > .button:insensitive { +.inline-toolbar toolbar button:disabled:last-child, +.inline-toolbar toolbar GtkToolButton:last-child > button:disabled { box-shadow: inset 1px 0px shade(@button_border, 1.10), inset -1px 0px shade(@button_border, 1.10); } /* Single button */ -.inline-toolbar.toolbar .button:only-child, -.inline-toolbar.toolbar .button:checked:only-child, -.inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child > .button, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive { +.inline-toolbar toolbar button:only-child, +.inline-toolbar toolbar button:checked:only-child, +.inline-toolbar toolbar button:disabled:only-child, +.inline-toolbar toolbar GtkToolButton:only-child > button, +.inline-toolbar toolbar GtkToolButton:only-child > button:checked, +.inline-toolbar toolbar GtkToolButton:only-child > button:disabled { border-radius: 0px; border-width: 0px; box-shadow: inset 0px 1px alpha(#fff, 0.09), @@ -1999,11 +2011,11 @@ GtkColorButton.button { inset 1px 0px shade(@button_border, 1.10); } -.inline-toolbar.toolbar .button:hover:active:only-child, -.inline-toolbar.toolbar .button:checked:only-child, -.inline-toolbar.toolbar .button:checked:hover:only-child, -.inline-toolbar.toolbar .button:checked:hover:active:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:checked { +.inline-toolbar toolbar button:hover:active:only-child, +.inline-toolbar toolbar button:checked:only-child, +.inline-toolbar toolbar button:checked:hover:only-child, +.inline-toolbar toolbar button:checked:hover:active:only-child, +.inline-toolbar toolbar GtkToolButton:only-child > button:checked { background-color: transparent; box-shadow: inset 0px 1px alpha(#000, 0.05), inset -1px 0px alpha(#000, 0.03), @@ -2011,8 +2023,8 @@ GtkColorButton.button { inset 1px 0px shade(@button_border, 0.80); } -.inline-toolbar.toolbar .button:insensitive:only-child, -.inline-toolbar.toolbar GtkToolButton:only-child > .button:insensitive { +.inline-toolbar toolbar button:disabled:only-child, +.inline-toolbar toolbar GtkToolButton:only-child > button:disabled { box-shadow: inset 1px 0px shade(@button_border, 1.10); } @@ -2020,29 +2032,32 @@ GtkColorButton.button { * ComboBoxes * **************/ -GtkComboBox { +combobox { padding: 0px; - -GtkWidget-focus-padding: 0; - -GtkWidget-focus-line-width: 0; - -GtkComboBox-arrow-scaling: 0.5; - -GtkComboBox-shadow-type: none; + -combobox-arrow-scaling: 0.5; + -combobox-shadow-type: none; } -GtkComboBox .cell { +combobox .cell { /* color combobox read-only */ color: @theme_fg_color; text-shadow: 0 1px @theme_shadow_color; } -GtkComboBox .separator { +combobox menu .cell { + /* light text on dark combobox menu */ + color: @theme_bg_color; + text-shadow: 0 1px @theme_shadow_color; +} + +combobox .separator { /* always disable separators */ - -GtkWidget-wide-separators: true; -GtkWidget-horizontal-separator: 0; -GtkWidget-vertical-separator: 0; } -GtkComboBox .entry, -GtkComboBox .entry:nth-child(first) { +combobox entry, +combobox entry:nth-child(first) { border-width: 2px 0px 2px 2px; /* remove right-outer */ border-radius: 4px 0px 0px 4px; /* remove right-border */ @@ -2057,7 +2072,7 @@ GtkComboBox .entry:nth-child(first) { } -GtkComboBox .entry:focus { +combobox entry:focus { border-width: 2px 0px 2px 2px; /* remove right-outer */ /* border */ box-shadow: inset 0px 3px alpha(#000, 0.03), @@ -2071,35 +2086,35 @@ GtkComboBox .entry:focus { } /* for RTL languages */ -GtkComboBox .entry:nth-child(last) { +combobox entry:nth-child(last) { border-width: 2px 2px 2px 0px; border-radius: 0px 5px 5px 0px; border-image-width: 2px 2px 2px 0px; } -GtkComboBox .button { +combobox button { color: @internal_element_color; padding: 2px 3px 2px 6px; } -GtkComboBox .button *:prelight { +combobox button *:hover { color: @theme_text_color; } -.toolbar GtkComboBox .cell { +toolbar combobox .cell { /* color combobox read-only */ color: shade(@toolbar_fg_color, 0.94); text-shadow: 0 1px @toolbar_shadow_color; } -.primary-toolbar GtkComboBox .cell { +.primary-toolbar combobox .cell { /* color combobox read-only */ color: shade(@theme_fg_dark_color, 0.94); text-shadow: 0 1px @theme_shadow_dark_color; } -.toolbar GtkComboBox .entry, -.toolbar GtkComboBox .entry:focus { +toolbar combobox entry, +toolbar combobox entry:focus { border-width: 1px 0px 1px 1px; /* remove rightr */ border-top-color: shade(@toolbar_gradient_base, 0.60); border-left-color: shade(@toolbar_gradient_base, 0.70); @@ -2111,7 +2126,7 @@ GtkComboBox .button *:prelight { inset -1px 0px alpha(#000, 0.05); } -.toolbar GtkComboBox.combobox-entry .button { +toolbar combobox.combobox-entry button { background-image: -gtk-gradient (linear, left top, left bottom, from (alpha(#fff, 0.04)), @@ -2122,7 +2137,7 @@ GtkComboBox .button *:prelight { border-bottom-color: alpha (#000, 0.25); } -.toolbar GtkComboBox.combobox-entry .button:checked { +toolbar combobox.combobox-entry button:checked { background-image: -gtk-gradient (linear, left top, left bottom, from (alpha(#000, 0.20)), @@ -2140,16 +2155,16 @@ GtkComboBox .button *:prelight { inset 0px -1px alpha(#fff, 0.01); } -.toolbar GtkComboBox.combobox-entry .button, -.toolbar GtkComboBox.combobox-entry .button:hover, -.toolbar GtkComboBox.combobox-entry .button:checked, -.toolbar GtkComboBox.combobox-entry .button:insensitive, -.toolbar GtkComboBox.combobox-entry .button:nth-child(last), -.primary-toolbar GtkComboBox.combobox-entry .button, -.primary-toolbar GtkComboBox.combobox-entry .button:hover, -.primary-toolbar GtkComboBox.combobox-entry .button:checked, -.primary-toolbar GtkComboBox.combobox-entry .button:insensitive, -.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(last) { +toolbar combobox.combobox-entry button, +toolbar combobox.combobox-entry button:hover, +toolbar combobox.combobox-entry button:checked, +toolbar combobox.combobox-entry button:disabled, +toolbar combobox.combobox-entry button:nth-child(last), +.primary-toolbar combobox.combobox-entry button, +.primary-toolbar combobox.combobox-entry button:hover, +.primary-toolbar combobox.combobox-entry button:checked, +.primary-toolbar combobox.combobox-entry button:disabled, +.primary-toolbar combobox.combobox-entry button:nth-child(last) { border-top-left-radius: 0px; border-bottom-left-radius: 0px; border-top-right-radius: 4px; @@ -2158,11 +2173,11 @@ GtkComboBox .button *:prelight { padding: 2px 3px; } -GtkComboBox.combobox-entry .button, -GtkComboBox.combobox-entry .button:hover, -GtkComboBox.combobox-entry .button:checked, -GtkComboBox.combobox-entry .button:insensitive, -GtkComboBox.combobox-entry .button:nth-child(last) { +combobox.combobox-entry button, +combobox.combobox-entry button:hover, +combobox.combobox-entry button:checked, +combobox.combobox-entry button:disabled, +combobox.combobox-entry button:nth-child(last) { border-color: transparent; border-top-left-radius: 0px; border-bottom-left-radius: 0px; @@ -2172,7 +2187,7 @@ GtkComboBox.combobox-entry .button:nth-child(last) { padding: 2px 3px; } -GtkComboBox.combobox-entry .button:hover { +combobox.combobox-entry button:hover { border-top-left-radius: 0px; border-bottom-left-radius: 0px; border-top-right-radius: 5px; @@ -2186,25 +2201,25 @@ GtkComboBox.combobox-entry .button:hover { } /* for RTL languages */ -GtkComboBox.combobox-entry .button:nth-child(first) { +combobox.combobox-entry button:nth-child(first) { border-width: 2px 0px 2px 2px; border-radius: 4px 0px 0px 4px; } -.primary-toolbar GtkComboBox.combobox-entry .button:nth-child(first) { +.primary-toolbar combobox.combobox-entry button:nth-child(first) { border-width: 1px 0px 1px 1px; border-radius: 4px 0px 0px 4px; } -GtkComboBox.combobox-entry .button *:checked, -GtkComboBox.combobox-entry .button *:prelight { - color: @internal_element_prelight; +combobox.combobox-entry button *:checked, +combobox.combobox-entry button *:hover { + color: @internal_element_hover; } -.toolbar GtkComboBox.combobox-entry .button *:checked, -.toolbar GtkComboBox.combobox-entry .button *:prelight, -.primary-toolbar GtkComboBox.combobox-entry .button *:checked, -.primary-toolbar GtkComboBox.combobox-entry .button *:prelight { + toolbar combobox.combobox-entry button *:checked, + toolbar combobox.combobox-entry button *:hover, +.primary-toolbar combobox.combobox-entry button *:checked, +.primary-toolbar combobox.combobox-entry button *:hover { color: @theme_text_dark_color; } @@ -2212,13 +2227,13 @@ GtkComboBox.combobox-entry .button *:prelight { * Toolbars * ************/ -.toolbar * { + toolbar * { background-image: none; background-color: alpha (@theme_base_color, 0.0); } GtkHandleBox, -.toolbar { + toolbar { padding: 2px 4px; background-color: @toolbar_gradient_base; background-image: -gtk-gradient (linear, @@ -2232,7 +2247,7 @@ GtkHandleBox, color: @toolbar_fg_color; } -.toolbar.vertical { + toolbar.vertical { border-radius: 4px 0 0 4px; padding: 2px; } @@ -2241,7 +2256,7 @@ GtkHandleBox, * Menubar Toolbars * ********************/ -.toolbar.menubar { + toolbar menubar { padding: 2px 4px 5px 3px; background-image: -gtk-gradient (linear, left top, left bottom, @@ -2265,7 +2280,7 @@ GtkHandleBox, * hint on the containing vbox, so we need to handle both these cases here. */ -.primary-toolbar.toolbar { +.primary-toolbar toolbar { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@theme_bg_dark_color, 1.00)), @@ -2282,7 +2297,7 @@ GtkHandleBox, color: @theme_fg_dark_color; } -.primary-toolbar.toolbar:insensitive { +.primary-toolbar toolbar:disabled { background-image: none; background-color: shade (@theme_bg_dark_color, 0.97); border-image: none; @@ -2291,24 +2306,24 @@ GtkHandleBox, } /* primary toolbar buttons */ -.toolbar .button, -.primary-toolbar.toolbar .button { - -GtkWidget-focus-line-width: 0; + toolbar button, +.primary-toolbar toolbar button { border-image: none; border-style: solid; border-radius: 6px; + border-width: 1px; border-color: transparent; box-shadow: none; background-image: none; background-color: alpha (@theme_base_color, 0.0); } -.toolbar .button { +toolbar button label{ color: shade(@toolbar_fg_color, 1.00); text-shadow: 0px 1px @toolbar_shadow_color; } -.toolbar GtkComboBox .button { +toolbar combobox button { /* color combobox read-only */ color: shade(@toolbar_fg_color, 1.00); text-shadow: 0px 1px @toolbar_shadow_color; @@ -2326,38 +2341,37 @@ GtkHandleBox, inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); } -.toolbar GtkComboBox .button:hover { + toolbar combobox button:hover { border-radius: 5px } -.primary-toolbar.toolbar .button { +.primary-toolbar toolbar button { color: @theme_fg_dark_color; text-shadow: 0px 1px @theme_shadow_dark_color; } -.primary-toolbar .linked .button:focus { +.primary-toolbar .linked button:focus { box-shadow: none; } -.toolbar .button:insensitive, -.primary-toolbar.toolbar .button:insensitive { + toolbar button:disabled, +.primary-toolbar toolbar button:disabled { background-image: none; background-color: alpha (@theme_base_color, 0.0); border-color: transparent; - /* -GtkWidget-focus-line-width: 0; */ } -.toolbar .button *:insensitive { + toolbar button *:disabled { color: mix(@toolbar_gradient_base, @toolbar_fg_color, 0.60); text-shadow: none; } -.primary-toolbar.toolbar .button *:insensitive { +.primary-toolbar toolbar button *:disabled { color: mix(@theme_bg_dark_color, @theme_fg_dark_color, 0.60); text-shadow: none; } -.toolbar .button:hover { + toolbar button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -2368,11 +2382,11 @@ GtkHandleBox, inset 0px -1px shade(@selected_bg_color, 0.93); } -.toolbar .button:hover:active, -.toolbar .button:checked, -.toolbar .button:checked:focus, -.toolbar .button:checked:hover, -.toolbar .button:checked:hover:active { + toolbar button:hover:active, + toolbar button:checked, + toolbar button:checked:focus, + toolbar button:checked:hover, + toolbar button:checked:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -2386,12 +2400,12 @@ GtkHandleBox, inset 0px -1px shade(@selected_bg_color, 0.93); } -.primary-toolbar.toolbar .button:hover, -.primary-toolbar.toolbar .button:hover:active, -.primary-toolbar.toolbar .button:checked, -.primary-toolbar.toolbar .button:checked:focus, -.primary-toolbar.toolbar .button:checked:hover, -.primary-toolbar.toolbar .button:checked:hover:active { +.primary-toolbar toolbar button:hover, +.primary-toolbar toolbar button:hover:active, +.primary-toolbar toolbar button:checked, +.primary-toolbar toolbar button:checked:focus, +.primary-toolbar toolbar button:checked:hover, +.primary-toolbar toolbar button:checked:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -2405,50 +2419,50 @@ GtkHandleBox, inset 0px -1px shade(@selected_bg_color, 0.93); } -.toolbar .button *:hover, -.toolbar .button *:active, -.toolbar .button *:checked { + toolbar button *:hover, + toolbar button *:active, + toolbar button *:checked { /* edge */ color: shade(@toolbar_fg_color, 0.90); text-shadow: 0px 1px @toolbar_shadow_color; } -/* arrangement epiphany (toolbar.menubar) */ -.primary-toolbar.toolbar .button *:hover, -.primary-toolbar.toolbar .button *:active, -.primary-toolbar.toolbar .button *:hover:active, -.primary-toolbar.toolbar .button *:active:active, -.primary-toolbar.toolbar .button *:checked, -.primary-toolbar.toolbar .button *:checked:hover, -.primary-toolbar.toolbar .button *:checked:checked { +/* arrangement epiphany (toolbar menubar) */ +.primary-toolbar toolbar button *:hover, +.primary-toolbar toolbar button *:active, +.primary-toolbar toolbar button *:hover:active, +.primary-toolbar toolbar button *:active:active, +.primary-toolbar toolbar button *:checked, +.primary-toolbar toolbar button *:checked:hover, +.primary-toolbar toolbar button *:checked:checked { color: @theme_text_dark_color; text-shadow: 0px 1px @theme_shadow_dark_color; } -.toolbar .button:active:insensitive, -.toolbar .button:checked:insensitive, -.primary-toolbar.toolbar .button:checked:insensitive { + toolbar button:active:disabled, + toolbar button:checked:disabled, +.primary-toolbar toolbar button:checked:disabled { background-image: none; background-color: alpha (@theme_base_color, 0.0); border-color: transparent; - icon-shadow: none; + -gtk-icon-shadow: none; text-shadow: none; } -.toolbar GtkLabel { + toolbar label { color: shade(@theme_fg_color, 1.10); text-shadow: 0px 1px @theme_shadow_color; } -.toolbar.menubar GtkLabel, -.primary-toolbar.toolbar GtkLabel { + toolbar menubar label, +.primary-toolbar toolbar label { color: @theme_fg_dark_color; text-shadow: 0px 1px @theme_shadow_dark_color; } -.toolbar GtkSeparatorToolItem, -.toolbar .separator, -.toolbar .separator:insensitive { + toolbar GtkSeparatorToolItem, + toolbar .separator, + toolbar .separator:disabled { border-color: alpha (#000, 0.24); border-bottom-color: alpha (#fff, 0.08); border-right-color: alpha (#fff, 0.08); @@ -2458,26 +2472,26 @@ GtkHandleBox, primary toolbar raised buttons *************************************/ -.toolbar .raised .button, -.toolbar .raised.button { + toolbar .raised button, + toolbar .raised button { padding: 2px; } -.toolbar.menubar .button { + toolbar menubar button { padding: 2px 2px; } -.toolbar.menubar .linked .button { + toolbar menubar .linked button { padding: 3px 4px; } -.toolbar.menubar .button { + toolbar menubar button { padding: 2px 4px; } -.toolbar.menubar .button, -.toolbar .raised .button, -.toolbar .raised.button { + toolbar menubar button, + toolbar .raised button, + toolbar .raised button { background-image: -gtk-gradient (linear, left top, left bottom, from (@button_raised_gradient_color_a), @@ -2486,25 +2500,24 @@ GtkHandleBox, /* outer */ border-color: transparent; /* border and inset */ - -GtkWidget-focus-line-width: 0; color: shade(@theme_fg_dark_color, 1.00); } -.toolbar .button.raised.linked:insensitive, -.toolbar .raised.linked .button:insensitive, -.toolbar .button.raised.linked:insensitive:active, -.toolbar .raised.linked .button:insensitive:active, -.toolbar .button.raised.linked:insensitive:checked, -.toolbar .raised.linked .button:insensitive:checked, -.toolbar.menubar .button:insensitive, -.toolbar.menubar .button:insensitive:active, -.toolbar.menubar .button:insensitive:checked, -.toolbar .raised .button:insensitive, -.toolbar .raised.button:insensitive, -.toolbar .raised .button:insensitive:active, -.toolbar .raised.button:insensitive:active, -.toolbar .raised .button:insensitive:checked, -.toolbar .raised.button:insensitive:checked { +toolbar button.raised.linked:disabled, +toolbar .raised.linked button:disabled, +toolbar button.raised.linked:disabled:active, +toolbar .raised.linked button:disabled:active, +toolbar button.raised.linked:disabled:checked, +toolbar .raised.linked button:disabled:checked, +toolbar menubar button:disabled, +toolbar menubar button:disabled:active, +toolbar menubar button:disabled:checked, +toolbar .raised button:disabled, +toolbar .raised button:disabled, +toolbar .raised button:disabled:active, +toolbar .raised button:disabled:active, +toolbar .raised button:disabled:checked, +toolbar .raised button:disabled:checked { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_raised_gradient_color_a, 0.88)), @@ -2514,9 +2527,9 @@ GtkHandleBox, color: mix(@theme_bg_dark_color, @theme_fg_dark_color, 0.50); } -.toolbar.menubar .button:hover, -.toolbar .raised .button:hover, -.toolbar .raised.button:hover { + toolbar menubar button:hover, + toolbar .raised button:hover, + toolbar .raised button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -2532,13 +2545,13 @@ GtkHandleBox, color: shade(@theme_fg_dark_color, 1.00); } -.toolbar .raised .button:hover:active, -.toolbar .raised.button:hover:active, -.toolbar.menubar .button:checked, -.toolbar .raised .button:checked, -.toolbar .raised .button:checked:hover, -.toolbar .raised.button:checked:hover, -.toolbar .raised.button:checked { +toolbar .raised button:hover:active, +toolbar .raised button:hover:active, +toolbar menubar button:checked, +toolbar .raised button:checked, +toolbar .raised button:checked:hover, +toolbar .raised button:checked:hover, +toolbar .raised button:checked { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -2554,40 +2567,40 @@ GtkHandleBox, } /* setup shadows */ -.toolbar .raised .button GtkLabel, -.toolbar .raised.button GtkLabel { +toolbar .raised button label, +toolbar .raised button label { color: @theme_fg_dark_color; text-shadow: 0px 1px @theme_shadow_dark_color; } -.toolbar .raised .button, -.toolbar .raised.button { - icon-shadow: 1px 1px @theme_shadow_dark_color; +toolbar .raised button, +toolbar .raised button { + -gtk-icon-shadow: 1px 1px @theme_shadow_dark_color; } -.toolbar.menubar .button *:hover, -.toolbar .raised .button *:hover, -.toolbar .raised.button *:hover, -.toolbar .raised .button *:hover:active, -.toolbar .raised.button *:hover:active, -.toolbar.menubar .button *:checked, -.toolbar .raised .button *:checked, -.toolbar .raised.button *:checked, -.toolbar .raised .button *:checked:hover, -.toolbar .raised.button *:checked:hover { +toolbar menubar button *:hover, +toolbar .raised button *:hover, +toolbar .raised button *:hover, +toolbar .raised button *:hover:active, +toolbar .raised button *:hover:active, +toolbar menubar button *:checked, +toolbar .raised button *:checked, +toolbar .raised button *:checked, +toolbar .raised button *:checked:hover, +toolbar .raised button *:checked:hover { color: @theme_text_dark_color; text-shadow: 0px 1px @theme_shadow_dark_color; } -.toolbar.menubar .button *:insensitive, -.toolbar .raised .button *:insensitive, -.toolbar .raised.button *:insensitive { - icon-shadow: none; +toolbar menubar button *:disabled, +toolbar .raised button *:disabled, +toolbar .raised button *:disabled { + -gtk-icon-shadow: none; text-shadow: none; color: mix(@theme_bg_dark_color, @theme_fg_dark_color, 0.50); } -.toolbar .entry { +toolbar entry { padding: 4px 4px 4px 6px; color: shade(@toolbar_fg_color, 1.0); background-image: -gtk-gradient (linear, @@ -2597,12 +2610,12 @@ GtkHandleBox, to (shade(@toolbar_gradient_base, 1.15))); } -.toolbar .entry, -.toolbar.menubar .entry, -.toolbar .raised .entry, -.toolbar .raised.entry, -.primary-toolbar .toolbar .entry, -.primary-toolbar.toolbar .entry { +toolbar entry, +toolbar menubar entry, +toolbar .raised entry, +toolbar .raised entry, +primary-toolbar toolbar entry, +primary-toolbar toolbar entry { padding: 4px 4px 4px 6px; color: @entry_text_dark_color; background-image: -gtk-gradient (linear, @@ -2630,11 +2643,11 @@ GtkHandleBox, inset 0px -1px shade(@theme_entry_border_dark, 1.10); } -.toolbar .entry:focus, -.toolbar.menubar .entry:focus, -.toolbar .raised .entry:focus, -.toolbar .raised.entry:focus, -.primary-toolbar.toolbar .entry:focus { +toolbar entry:focus, +toolbar menubar entry:focus, +toolbar .raised entry:focus, +toolbar .raised entry:focus, +primary-toolbar toolbar entry:focus { /* outer */ border-top-color: @focused_dark_entry_outer; border-right-color: alpha(@focused_dark_entry_outer, 0.90); @@ -2652,17 +2665,17 @@ GtkHandleBox, inset 0px -1px shade(@focused_dark_entry_border, 1.00); } -.toolbar .entry:selected, -.toolbar.menubar .entry:selected, -.toolbar .raised .entry:selected, -.toolbar .raised.entry:selected, -.primary-toolbar.toolbar .entry:selected { +toolbar entry selection, +toolbar menubar entry selection, +toolbar .raised entry selection, +toolbar .raised entry selection, +primary-toolbar toolbar entry selection { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } /* progressbars on primary toolbar entries are special */ -.primary-toolbar.toolbar .entry.progressbar { +primary-toolbar toolbar entry progressbar progress { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@button_bg_active, 1.35)), @@ -2682,7 +2695,7 @@ GtkHandleBox, * Buttons + dialog open * ****************************/ -.inline-toolbar.toolbar { +.inline-toolbar toolbar { -GtkToolbar-button-relief: normal; padding: 0px; background-color: alpha(@button_base, 0.0); @@ -2706,7 +2719,7 @@ GtkHandleBox, inset 0px -1px alpha(#fff, 0.05); } -.inline-toolbar.toolbar .button { +.inline-toolbar toolbar button { padding: 2px 6px; background-image: -gtk-gradient (linear, left top, left bottom, @@ -2720,13 +2733,13 @@ GtkHandleBox, box-shadow: none; color: @theme_fg_color; text-shadow: 0 1px @theme_shadow_color; - icon-shadow: 1px 1px @theme_shadow_color; + -gtk-icon-shadow: 1px 1px @theme_shadow_color; } -.inline-toolbar.toolbar .button:hover:active, -.inline-toolbar.toolbar .button:checked, -.inline-toolbar.toolbar .button:checked:hover, -.inline-toolbar.toolbar .button:checked:hover:active { +.inline-toolbar toolbar button:hover:active, +.inline-toolbar toolbar button:checked, +.inline-toolbar toolbar button:checked:hover, +.inline-toolbar toolbar button:checked:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_base, 0.50)), @@ -2740,7 +2753,7 @@ GtkHandleBox, inset 0px -1px shade(@button_border, 0.78); } -.inline-toolbar.toolbar .button:hover { +.inline-toolbar toolbar button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_base, 1.03)), @@ -2750,60 +2763,60 @@ GtkHandleBox, color: @theme_text_color; } -.inline-toolbar.toolbar .button:insensitive { +.inline-toolbar toolbar button:disabled { box-shadow: none; background-color: mix(@button_base, @theme_fg_color, 0.10); background-image: none; } -.inline-toolbar.toolbar .button *:insensitive { +.inline-toolbar toolbar button *:disabled { color: @insensitive_fg_color; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; } -.inline-toolbar.toolbar .button *:hover { +.inline-toolbar toolbar button *:hover { color: @theme_text_color; text-shadow: 0 1px @theme_shadow_color; - icon-shadow: 1px 1px @theme_shadow_color; + -gtk-icon-shadow: 1px 1px @theme_shadow_color; } -.inline-toolbar.toolbar .button *:active, -.inline-toolbar.toolbar .button *:checked { +.inline-toolbar toolbar button *:active, +.inline-toolbar toolbar button *:checked { color: @theme_selected_fg_color; text-shadow: 0 1px @theme_selected_shadow_color; - icon-shadow: 1px 1px @theme_selected_shadow_color; + -gtk-icon-shadow: 1px 1px @theme_selected_shadow_color; } /* Stack switcher */ -.stack-switcher > .button > GtkLabel, -.header-bar .stack-switcher > .button.titlebutton > GtkLabel, -.titlebar .stack-switcher > .button.titlebutton > GtkLabel, -GtkCalendar.header .stack-switcher > .button.titlebutton > GtkLabel { +.stack-switcher > button > label, + headerbar .stack-switcher > button.titlebutton > label, +.titlebar .stack-switcher > button.titlebutton > label, +calendar.header .stack-switcher > button.titlebutton > label { padding-left: 6px; padding-right: 6px; } -.stack-switcher > .button > GtkImage, -.header-bar .stack-switcher > .button.titlebutton > GtkImage, -.titlebar .stack-switcher > .button.titlebutton > GtkImage, -GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage { +stack-switcher > button > image, +header-bar stack-switcher > button.titlebutton > image, +titlebar stack-switcher > button.titlebutton > image, +calendar.header .stack-switcher > button.titlebutton > image { padding-left: 6px; padding-right: 6px; padding-top: 3px; padding-bottom: 3px; } -.stack-switcher > .button.text-button, -.stack-switcher > .button.image-button, -.header-bar .stack-switcher > .titlebutton.button, -.titlebar .stack-switcher > .titlebutton.button, -GtkCalendar.header .stack-switcher > .titlebutton.button { +.stack-switcher > button.text-button, +.stack-switcher > button.image-button, + headerbar .stack-switcher > .titlebutton button, +.titlebar .stack-switcher > .titlebutton button, +calendar.header .stack-switcher > .titlebutton button { padding: 4px 2px; } -.stack-switcher > .button.needs-attention > GtkLabel, -.stack-switcher > .button.needs-attention > GtkImage { +.stack-switcher > button.needs-attention > label, +.stack-switcher > button.needs-attention > image { animation: needs_attention 150ms ease-in; background-color: @theme_bg_color; /* FIXME: ? */ background-size: 6px 6px, 6px 6px; @@ -2811,18 +2824,18 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { background-position: right 3px, right 4px; } -.stack-switcher > .button.needs-attention > GtkLabel:backdrop, -.stack-switcher > .button.needs-attention > GtkImage:backdrop { +.stack-switcher > button.needs-attention > label:backdrop, +.stack-switcher > button.needs-attention > image:backdrop { background-size: 6px 6px, 0 0; } -.stack-switcher > .button.needs-attention > GtkLabel:dir(rtl), -.stack-switcher > .button.needs-attention > GtkImage:dir(rtl) { +.stack-switcher > button.needs-attention > label:dir(rtl), +.stack-switcher > button.needs-attention > image:dir(rtl) { background-position: left 3px, left 4px; } -.stack-switcher > .button.needs-attention:checked > GtkLabel, -.stack-switcher > .button.needs-attention:checked > GtkImage { +.stack-switcher > button.needs-attention:checked > label, +.stack-switcher > button.needs-attention:checked > image { animation: none; background-image: none; } @@ -2831,11 +2844,11 @@ GtkCalendar.header .stack-switcher > .titlebutton.button { * GtkActionBar * ****************/ -GtkActionBar .frame.action-bar .horizontal.linked.stack-switcher .button.image-button { +actionbar .frame.action-bar .horizontal.linked.stack-switcher button.image-button { padding: 4px 2px; } -GtkActionBar .frame.action-bar .button.image-button { +actionbar .frame.action-bar button.image-button { padding: 8px; } @@ -2843,11 +2856,11 @@ GtkActionBar .frame.action-bar .button.image-button { * GtkSpinButton * *****************/ -.horizontal.entry.spinbutton { +.horizontal entry spinbutton { padding: 4px 5px; } -.spinbutton .button { +spinbutton button { color: @internal_element_color; border-width: 0; border-radius: 0; @@ -2857,31 +2870,31 @@ GtkActionBar .frame.action-bar .button.image-button { background-image: none; } -.spinbutton .button:insensitive, -.spinbutton .button:insensitive:last-child, -.spinbutton .button:insensitive:first-child, -.spinbutton .button:insensitive:only-child, -.spinbutton .vertical .button:insensitive, -.spinbutton .vertical .button:insensitive:last-child, -.spinbutton .vertical .button:insensitive:first-child, -.spinbutton .vertical .button:insensitive:only-child { +spinbutton button:disabled, +spinbutton button:disabled:last-child, +spinbutton button:disabled:first-child, +spinbutton button:disabled:only-child, +spinbutton .vertical button:disabled, +spinbutton .vertical button:disabled:last-child, +spinbutton .vertical button:disabled:first-child, +spinbutton .vertical button:disabled:only-child { color: @internal_element_insensitive; box-shadow: inset 1px 0px shade(@insensitive_border_color, 0.97); border-color: @insensitive_border_color; } -.spinbutton .button, -.spinbutton .button:hover, -.spinbutton .button:focus, -.spinbutton .button:checked { +spinbutton button, +spinbutton button:hover, +spinbutton button:focus, +spinbutton button:checked { border-radius: 0px 0px 0px 0px; - color: @internal_element_prelight; + color: @internal_element_hover; box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset 0px -1px shade(@selected_bg_color, 0.93); } -.spinbutton .button:hover { +spinbutton button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_gradient1, 1.03)), @@ -2890,7 +2903,7 @@ GtkActionBar .frame.action-bar .button.image-button { to (shade(@button_gradient4, 1.01))); } -.spinbutton .button:checked { +spinbutton button:checked { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), @@ -2899,81 +2912,81 @@ GtkActionBar .frame.action-bar .button.image-button { to (shade (@theme_bg_color, 0.80))); } -.spinbutton .button, -.spinbutton .button:hover, -.spinbutton .button:checked, -.spinbutton .button:insensitive { +spinbutton button, +spinbutton button:hover, +spinbutton button:checked, +spinbutton button:disabled { border-radius: 0px 0 0 0px; border-image: none; padding: 6px 3px; } -.spinbutton .button:first-child, -.spinbutton .button:hover:first-child, -.spinbutton .button:checked:first-child { +spinbutton button:first-child, +spinbutton button:hover:first-child, +spinbutton button:checked:first-child { border-radius: 3px 0 0 3px; border-image: none; padding: 6px 3px; } -.spinbutton .button:last-child, -.spinbutton .button:hover:last-child, -.spinbutton .button:checked:last-child { +spinbutton button:last-child, +spinbutton button:hover:last-child, +spinbutton button:checked:last-child { border-radius: 0 3px 3px 0; border-image: none; padding: 6px 3px; } -.spinbutton .button:first-child, -.spinbutton .button:hover:first-child, -.spinbutton .button:checked:first-child, -.spinbutton .button:last-child, -.spinbutton .button:hover:last-child, -.spinbutton .button:checked:last-child { +spinbutton button:first-child, +spinbutton button:hover:first-child, +spinbutton button:checked:first-child, +spinbutton button:last-child, +spinbutton button:hover:last-child, +spinbutton button:checked:last-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), inset 0px -1px shade(@selected_bg_color, 0.93); } -.spinbutton .button:dir(rtl) { +spinbutton button:dir(rtl) { box-shadow: inset -1px 0 @inset_dark_color; } -.spinbutton.vertical .button { +spinbutton.vertical button { padding: 4px; - icon-shadow: 0 1px @button_text_shadow; + -gtk-icon-shadow: 0 1px @button_text_shadow; } -.spinbutton.vertical .button, -.spinbutton.vertical .button:hover { +spinbutton.vertical button, +spinbutton.vertical button:hover { color: @theme_fg_color; } -.spinbutton.vertical .button:insensitive { +spinbutton.vertical button:disabled { color: @insensitive_fg_color; } -.spinbutton.vertical .button:checked { +spinbutton.vertical button:checked { color: @theme_fg_color; - icon-shadow: 0 1px @button_active_text_shadow; + -gtk-icon-shadow: 0 1px @button_active_text_shadow; } -/* :insensitive:insensitive to override the dark overriden style for +/* :disabled:disabled 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:disabled:disabled { + -gtk-icon-shadow: none; } /* :active:active to override the dark overriden style for normal spinbutton buttons, yeah we lack !important */ -.spinbutton.vertical .button, -.spinbutton.vertical .button:active:active, -.spinbutton.vertical .button:checked:checked { +spinbutton.vertical button, +spinbutton.vertical button:active:active, +spinbutton.vertical button:checked:checked { box-shadow: none; } -.spinbutton.vertical .button:first-child { +spinbutton.vertical button:first-child { padding: 6px 4px; border-image-width: 3px 3px 0 3px; border-width: 1px 1px 0 1px; @@ -2988,18 +3001,18 @@ GtkActionBar .frame.action-bar .button.image-button { inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); } -.spinbutton.vertical .button:hover:first-child, -.spinbutton.vertical .button:checked:first-child { +spinbutton.vertical button:hover:first-child, +spinbutton.vertical button:checked:first-child { border-radius: 4px 4px 0px 0; border-image: none; - color: @internal_element_prelight; + color: @internal_element_hover; box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), inset 0px -1px shade(@selected_bg_color, 0.93); } -.spinbutton.vertical .button:last-child { +spinbutton.vertical button:last-child { padding: 6px 4px; border-image-width: 0 3px 4px 3px; border-width: 0px 1px 1px 1px; @@ -3014,18 +3027,18 @@ GtkActionBar .frame.action-bar .button.image-button { inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); } -.spinbutton.vertical .button:hover:last-child, -.spinbutton.vertical .button:checked:last-child { +spinbutton.vertical button:hover:last-child, +spinbutton.vertical button:checked:last-child { border-radius: 0px 0px 4px 4px; border-image: none; - color: @internal_element_prelight; + color: @internal_element_hover; box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), inset 0px -1px shade(@selected_bg_color, 0.93); } -.spinbutton.vertical.entry { +spinbutton.vertical entry { border-image: none; border-color: alpha(@borders, 0.1); border-width: 0 0px 0 0px; @@ -3040,43 +3053,43 @@ GtkActionBar .frame.action-bar .button.image-button { inset -1px 0px alpha(shade(@button_border, 0.94), 0.80); } -.spinbutton.vertical.entry:insensitive { +spinbutton.vertical entry:disabled { padding: 4px 1px 4px 1px; border-color: alpha(@borders, 0.1); box-shadow: inset 1px 0px alpha(@borders, 0.4), inset -1px 0px alpha(@borders, 0.4); } -.spinbutton.vertical.entry:focus { +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; } /* volume button */ -GtkGrid .button, -GtkGrid .button.flat { +grid button, +grid button.flat { transition: all 600ms ease-out; } -GtkGrid .button, -GtkGrid .button.flat, -GtkGrid .button:hover, -GtkGrid .button:insensitive, -GtkGrid .button.flat:hover, -GtkGrid .button.flat:insensitive { +grid button, +grid button.flat, +grid button:hover, +grid button:disabled, +grid button.flat:hover, +grid button.flat:disabled { padding: 5px 4px; border-radius: 6px; border-color: transparent; background-color: transparent; } -GtkFlowBox .grid-child { +flowbox .grid-child { padding: 3px; border-radius: 3px; } -GtkFlowBox .grid-child:selected { +flowbox .grid-child:selected { outline-offset: -2px; } @@ -3087,10 +3100,10 @@ GtkFlowBox .grid-child:selected { color: @link_color; } -GtkLinkButton, -GtkLinkButton:hover, -GtkLinkButton.button.flat, -GtkLinkButton.button.flat:hover { +linkbutton, +linkbutton:hover, +linkbutton button.flat, +linkbutton button.flat:hover { padding: 4px; border-color: transparent; } @@ -3100,132 +3113,129 @@ GtkLinkButton.button.flat:hover { * tabs * *****************/ -.notebook { +notebook { padding: 0; background-clip: border-box; background-color: shade (@theme_bg_color, 1.1); border-style: solid; border-color: @notebook_border; border-width: 1px; - -GtkNotebook-initial-gap: 0; + /* -GtkNotebook-initial-gap: 0; -GtkNotebook-arrow-spacing: 0; -GtkNotebook-tab-curvature: 0; - -GtkNotebook-tab-overlap: 1; - -GtkNotebook-has-tab-gap: false; + -GtkNotebook-has-tab-gap: false;*/ /* FIXME, why this doesn't work? */ - -GtkNotebook-arrow-scaling: 0.3; - -GtkWidget-focus-padding: 0; - -GtkWidget-focus-line-width: 0; + /*-GtkNotebook-arrow-scaling: 0.3; it's deprecated for sure */ } -.notebook :hover { - -gtk-image-effect: highlight; +notebook:hover { + /*-gtk-image-effect: highlight; INVALID*/ color: @theme_fg_color; } -.notebook.frame.top { +notebook.frame.top { border-top: 0px; border-radius: 0px 0px 4px 4px; } -.notebook.frame.bottom { +notebook.frame.bottom { border-bottom: 0px; border-radius: 4px 4px 0px 0px; } -.notebook.frame.left { +notebook.frame.left { border-left: 0px; border-radius: 0px 4px 4px 0px; } -.notebook.frame.right { +notebook.frame.right { border-right: 0px; border-radius: 4px 0px 0px 4px; } -.notebook.header { +notebook header { background-image: linear-gradient(to bottom, shade(@theme_bg_color, 0.86), shade(@theme_bg_color, 1.05)); border-radius: 0px; } -.notebook.header.top { +notebook header.top { border-width: 0px 0px 1px 0px; } -.notebook.header.bottom { +notebook header.bottom { border-width: 1px 0px 0px 0px; } -.notebook.header.left { +notebook header.left { border-width: 1px 1px 0px 0px; } -.notebook.header.right { +notebook header.right { border-width: 0px 0px 0px 1px; } /* tabs in view areas, ie. pluma-, caja-tabs */ -GtkPaned.horizontal .notebook.header.top { +paned.horizontal notebook header.top { border-width: 0px; } -.notebook.header.frame.top { +notebook header.frame.top { border-radius: 4px 4px 0px 0px; } -.notebook.header.frame.bottom { +notebook header.frame.bottom { border-radius: 0px 0px 4px 4px; } -.notebook.header.frame.left { +notebook header.frame.left { border-radius: 4px 0px 0px 4px; } -.notebook.header.frame.right { +notebook header.frame.right { border-radius: 0px 4px 4px 0px; } -.notebook tab { +notebook tab { + border-style:solid; /*keep tabs from jumping on hover */ border-color: transparent; - border-width: 0px; + border-width: 1px; background-image: none; background-color: transparent; } -.notebook tab GtkLabel { +notebook tab label { color: mix (@theme_fg_color, @theme_bg_color, 0.40); font-weight: normal; } - -.notebook .prelight-page, -.notebook .prelight-page GtkLabel { +notebook .hover-page, +notebook .hover-page label { color: mix (@theme_fg_color, @theme_bg_color, 0.15); } -.notebook .active-page, -.notebook tab .active-page GtkLabel { +notebook .active-page, +notebook tab .active-page label { color: @theme_fg_color; } /* horizontal tabs */ -.notebook tab.top, -.notebook tab.bottom { +notebook header.top tab, +notebook header.bottom tab{ padding: 5px 20px 6px; } -GtkPaned.horizontal .notebook tab.top { +paned.horizontal notebook header.top tab { padding: 5px 4px; } -.notebook tab.top { +notebook header.top tab { border-width: 1px 1px 0 1px; } -.notebook tab.top:active, -.notebook tab.top:active:hover { +notebook header.top tab:active, +notebook header.top tab:active:hover { background-image: linear-gradient(to bottom, shade(@theme_bg_color, 1.18), shade(@theme_bg_color, 1.1)); @@ -3236,7 +3246,7 @@ GtkPaned.horizontal .notebook tab.top { box-shadow: none; } -.notebook tab.top:hover { +notebook header.top tab:hover { background-image: linear-gradient(to bottom, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); @@ -3247,12 +3257,12 @@ GtkPaned.horizontal .notebook tab.top { box-shadow: none; } -.notebook tab.top:active { +notebook header.top tab:active { border-bottom-color: @notebook_active_tab_border; } -.notebook tab.bottom:active, -.notebook tab.bottom:hover:active { +notebook header.bottom tab:active, +notebook header.bottom tab:hover:active { background-image: linear-gradient(to top, shade(@theme_bg_color, 1.18), shade(@theme_bg_color, 1.1)); @@ -3263,7 +3273,7 @@ GtkPaned.horizontal .notebook tab.top { box-shadow: none; } -.notebook tab.bottom:hover { +notebook header.bottom tab:hover { background-image: linear-gradient(to top, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); @@ -3276,13 +3286,13 @@ GtkPaned.horizontal .notebook tab.top { /* vertical tabs */ -.notebook tab.left, -.notebook tab.right { +notebook header.left tab, +notebook header.right tab{ padding: 5px 20px; } -.notebook tab.left:active, -.notebook tab.left:hover:active { +notebook header.left tab:active, +notebook header.left tab:hover:active { background-image: linear-gradient(to right, shade(@theme_bg_color, 1.18), shade(@theme_bg_color, 1.1)); @@ -3292,7 +3302,7 @@ GtkPaned.horizontal .notebook tab.top { border-radius: 4px 0px 0px 4px; } -.notebook tab.left:hover { +notebook header.left tab:hover { background-image: linear-gradient(to right, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); @@ -3301,9 +3311,9 @@ GtkPaned.horizontal .notebook tab.top { border-color: @notebook_border; border-radius: 4px 0px 0px 4px; } - -.notebook tab.right:active, -.notebook tab.right:hover:active { + +notebook header.right tab:active, +notebook header.right tab:hover:active { background-image: linear-gradient(to left, shade(@theme_bg_color, 1.18), shade(@theme_bg_color, 1.1)); @@ -3313,7 +3323,7 @@ GtkPaned.horizontal .notebook tab.top { border-radius: 0px 4px 4px 0px; } -.notebook tab.right:hover { +notebook header.right tab:hover { background-image: linear-gradient(to left, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); @@ -3323,7 +3333,7 @@ GtkPaned.horizontal .notebook tab.top { border-radius: 0px 4px 4px 0px; } -.notebook tab.reorderable-page:hover { +notebook tab.reorderable-page:hover { background-image: linear-gradient(to bottom, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); @@ -3332,7 +3342,7 @@ GtkPaned.horizontal .notebook tab.top { 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), shade(@theme_bg_color, 1.1)); @@ -3343,7 +3353,7 @@ GtkPaned.horizontal .notebook tab.top { /* close button styling */ -.notebook tab .button { +notebook tab button { color: mix (@theme_fg_color, @theme_bg_color, 0.85); border-image: none; background-image: none; @@ -3353,28 +3363,28 @@ GtkPaned.horizontal .notebook tab.top { border-color: transparent; border-width: 1px; padding: 1px; - icon-shadow: none; + -gtk-icon-shadow: none; } -.notebook .prelight-page .button, -.notebook tab.prelight-page .button, -.notebook .active-page .button, -.notebook tab.active-page .button { +notebook .hover-page button, +notebook tab.hover-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 tab .button:hover { +notebook tab button:hover { color: @theme_fg_color; border-color: alpha(black, 0.1); } -.notebook tab .button:active, -.notebook tab .button:hover:active { +notebook tab button:active, +notebook tab button:hover:active { 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) @@ -3382,53 +3392,54 @@ GtkPaned.horizontal .notebook tab.top { alpha(black, 0.13); } -.notebook.arrow { +notebook arrow { color: @theme_fg_color; } -.notebook.arrow:hover, -.notebook.arrow:active { +notebook arrow:hover, +notebook arrow:active { color: @theme_selected_bg_color; } -.notebook.arrow:insensitive { +notebook arrow:disabled { color: rgba(141, 144, 145, 0.3); } -.notebook.arrow:backdrop { +notebook arrow:backdrop { color: rgba(84, 89, 90, 0.4); } -.notebook.arrow:backdrop:insensitive { +notebook arrow:backdrop:disabled { color: #c7c7c7; } /************************* * Check and Radio items * *************************/ - +check, +radio, .check, .radio, -.check:insensitive, -.radio:insensitive { +.check:disabled, +.radio:disabled { background-color: transparent; border-style: none; } -GtkCheckButton, -GtkCheckButton:hover, -GtkCheckButton:focus, -GtkCheckButton:focus:hover, -GtkCheckButton:focus:hover:active, -GtkCheckButton:checked, -GtkCheckButton:checked:hover, -GtkCheckButton:checked:focus, -GtkCheckButton:checked:focus:hover, -GtkCheckButton:checked:focus:hover:active { +checkbutton, +checkbutton:hover, +checkbutton:focus, +checkbutton:focus:hover, +checkbutton:focus:hover:active, +checkbutton:checked, +checkbutton:checked:hover, +checkbutton:checked:focus, +checkbutton:checked:focus:hover, +checkbutton:checked:focus:hover:active { background-color: transparent; } -GtkCheckButton.text-button, GtkRadioButton.text-button { +checkbutton.text-button, GtkRadioButton.text-button { padding: 1px; outline-offset: 0; } @@ -3436,7 +3447,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { * Header bars * ***************/ -.header-bar { +headerbar { border-width: 0 0 1px; border-style: solid; border-color: shade(@borders, 0.90); @@ -3446,7 +3457,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { padding: 6px 6px 5px 6px; } -.header-bar:backdrop { +headerbar:backdrop { border-image: linear-gradient(to top, @unfocused_borders, @unfocused_borders 1px, @@ -3455,19 +3466,19 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { background-color: @theme_bg_dark_color; } -.header-bar .button, -.header-bar .button:last-child, -.header-bar .button:first-child, -.header-bar .button:only-child { +headerbar button, +headerbar button:last-child, +headerbar button:first-child, +headerbar button:only-child { background-image: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; color: @theme_fg_dark_color; border-width: 1px; border-radius: 5px; } -.header-bar:backdrop .button { +headerbar:backdrop button { border-width: 1px; border-radius: 5px; padding-left: 4px; @@ -3479,21 +3490,21 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { to (shade(@theme_unfocused_bg_color, 0.85))); } -.header-bar .button:hover:first-child, -.header-bar .button:checked:first-child, -.header-bar .button:hover:active:first-child, -.header-bar .button:checked:hover:first-child, -.header-bar .button:checked:hover:active:first-child, -.header-bar .button:hover:last-child, -.header-bar .button:checked:last-child, -.header-bar .button:hover:active:last-child, -.header-bar .button:checked:hover:last-child, -.header-bar .button:checked:hover:active:last-child, -.header-bar .button:hover:only-child, -.header-bar .button:checked:only-child, -.header-bar .button:hover:active:last-child, -.header-bar .button:checked:hover:only-child, -.header-bar .button:checked:hover:active:only-child { +headerbar button:hover:first-child, +headerbar button:checked:first-child, +headerbar button:hover:active:first-child, +headerbar button:checked:hover:first-child, +headerbar button:checked:hover:active:first-child, +headerbar button:hover:last-child, +headerbar button:checked:last-child, +headerbar button:hover:active:last-child, +headerbar button:checked:hover:last-child, +headerbar button:checked:hover:active:last-child, +headerbar button:hover:only-child, +headerbar button:checked:only-child, +headerbar button:hover:active:last-child, +headerbar button:checked:hover:only-child, +headerbar button:checked:hover:active:only-child { border-width: 1px; border-radius: 5px; background-image: -gtk-gradient (linear, @@ -3510,61 +3521,61 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { inset 0px -1px shade(@selected_bg_color, 0.93); } -.header-bar .button:insensitive, -.header-bar .button:insensitive:last-child, -.header-bar .button:insensitive:first-child { +headerbar button:disabled, +headerbar button:disabled:last-child, +headerbar button:disabled:first-child { color: @theme_text_dark_color; background-image: none; background-color: @theme_bg_dark_color; border-color: @theme_button_border_dark; box-shadow: none; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; } -.header-bar .button *:insensitive { +headerbar button *:disabled { background-color: transparent; text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; } -.header-bar .button.text-button { +headerbar button.text-button { padding: 2px 6px; } -.header-bar .button.image-button { +headerbar button.image-button { padding: 5px 5px 6px 5px; } -.header-bar .title { +headerbar .title { font: Bold 11; color: @theme_text_dark_color; } -.header-bar .subtitle { +headerbar .subtitle { font: 9; color: @theme_text_dark_color; } -.header-bar GtkSeparatorToolItem, -.header-bar .separator, -.header-bar .separator:insensitive, -.header-bar .pane-separator { +headerbar GtkSeparatorToolItem, +headerbar .separator, +headerbar .separator:disabled, +headerbar .pane-separator { border-color: alpha (shade(@theme_bg_dark_color, 0.2), 0.24); border-bottom-color: @theme_bg_dark_color; border-right-color: @theme_bg_dark_color; } /**************** - * GtkAssistant * + * assistant * ****************/ -GtkAssistant .sidebar .highlight { +assistant .sidebar .highlight { color: @theme_text_color; font: bold; } -GtkAssistant .sidebar { +assistant .sidebar { padding: 5px; background-color: shade (@theme_bg_color, 0.97); border-width: 0px 1px 0px 0px; @@ -3578,9 +3589,9 @@ GtkAssistant .sidebar { * Switch * **********/ -GtkSwitch { +switch { padding: 8px; /* 8px to avoid padding list-row issue if active */ - -GtkSwitch-slider-width: 45px; + -switch-slider-width: 45px; font-weight: bold; font-size: smaller; box-shadow: inset 0px 2px alpha(#fff, 0.11), @@ -3593,8 +3604,8 @@ GtkSwitch { inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); } -GtkSwitch.trough, -GtkSwitch.trough:backdrop { +switch trough, +switch trough:backdrop { border: 1px solid ; border-radius: 6px; color: @theme_fg_color; @@ -3616,16 +3627,16 @@ GtkSwitch.trough:backdrop { text-shadow: 0 1px rgba(0, 0, 0, 0.1); } -GtkSwitch.trough:active, -GtkSwitch.trough:backdrop:active { +switch trough:active, +switch trough:backdrop:active { background-image: linear-gradient(to bottom, @theme_selected_bg_color 2px, shade(@theme_selected_bg_color, 1.2)); color: white; } -GtkSwitch.trough:insensitive, -GtkSwitch.trough:backdrop:insensitive { +switch trough:disabled, +switch trough:backdrop:disabled { color: @insensitive_fg_color; border-color: @insensitive_border_color; background-image: none; @@ -3637,8 +3648,8 @@ GtkSwitch.trough:backdrop:insensitive { text-shadow: none; } -GtkSwitch.slider, -GtkSwitch.slider:backdrop { +switch slider, +switch slider:backdrop { border: 1px solid; border-radius: 6px; color: @theme_fg_color; @@ -3663,8 +3674,8 @@ GtkSwitch.slider:backdrop { padding: 2px 4px 2px 2px; } -GtkSwitch.slider:active, -GtkSwitch.slider:backdrop:active { +switch slider:active, +switch slider:backdrop:active { color: @theme_fg_color; border-color: transparent; border-radius: 6px; @@ -3681,8 +3692,8 @@ GtkSwitch.slider:backdrop:active { padding: 1px 3px 1px 1px; } -GtkSwitch.slider:insensitive, -GtkSwitch.slider:backdrop:insensitive { +switch slider:disabled, +switch slider:backdrop:disabled { background-image: none; background-color: @insensitive_bg_color; border-color: alpha (#000, 0.00); @@ -3694,29 +3705,29 @@ GtkSwitch.slider:backdrop:insensitive { inset 0px -1px @insensitive_border_color; } -GtkSwitch.slider:insensitive > GtkLabel, -GtkSwitch.slider:backdrop:insensitive > GtkLabel { +switch slider:disabled > label, +switch slider:backdrop:disabled > label { color: inherit; } -.list-row GtkSwitch, -.list-row GtkSwitch:backdrop, -.list-row:selected GtkSwitch, -.list-row:selected GtkSwitch:backdrop { +list-row switch, +list-row switch:backdrop, +list-row:selected switch, +list-row:selected switch:backdrop { box-shadow: none; border-color: shade(@theme_selected_bg_color, 0.4); } -.list-row:selected GtkSwitch.slider:dir(rtl) { +list-row:selected switch slider:dir(rtl) { border-left-color: @borders; } -.list-row:selected GtkSwitch.slider:dir(ltr) { + list-row:selected switch slider:dir(ltr) { border-right-color: @borders; } -.list-row:selected GtkSwitch.slider, -.list-row:selected GtkSwitch.slider:active { + list-row:selected switch slider, + list-row:selected switch slider:active { border-color: shade(@theme_selected_bg_color, 0.4); } @@ -3724,8 +3735,8 @@ GtkSwitch.slider:backdrop:insensitive > GtkLabel { * image * *********/ -GtkImage, -GtkImage:insensitive { +image, +image:disabled { background-color: transparent; } @@ -3737,14 +3748,14 @@ GtkImage:insensitive { * viewport * ************/ -GtkViewport { +viewport { border-width: 0px; border-style: none; /* Background color and system config gnome-tweak-tools */ background-color: shade(@theme_bg_color, 1.00); } -GtkViewport.frame { +viewport.frame { border-width: 0px; border-style: none; padding: 0px; @@ -3754,31 +3765,31 @@ GdMainIconView.content-view { -GdMainIconView-icon-size: 40; } -GtkIconView.content-view.check { +iconview.content-view.check { background-image: url("assets/grid-selection-unchecked.svg"); background-color: transparent; } -GtkIconView.content-view.check:active { +iconview.content-view.check:active { background-image: url("assets/grid-selection-checked.svg"); background-color: transparent; } -GtkIconView, -GtkViewport { +iconview, +viewport { /* avoid resizing theme thumbnails in mate-appearance-properties */ padding: 0px; } -GtkIconView { +iconview { border-width: 0px; border-style: none; /* background view mate-appearance-properties */ background-color: @base_color; } -GtkIconView.view.cell:selected, -GtkIconView.view.cell:selected:focus { +iconview.view.cell:selected, +iconview.view.cell:selected:focus { /* eg. Configuration center */ background-color: alpha(@theme_selected_bg_color, 0.90); background-image: -gtk-gradient (linear, @@ -3799,26 +3810,39 @@ GtkIconView.view.cell:selected:focus { inset 1px 0px alpha(#fff, 0.07), inset -1px 0px alpha(#fff, 0.07), inset 0px -1px alpha(#fff, 0.06); - -GtkWidget-focus-line-width: 0; text-shadow: 0px 1px @theme_selected_shadow_color; } -GtkIconView.view.cell:hover, -GtkIconView.view.cell:hover:focus { +iconview.view.cell:hover, +iconview.view.cell:hover:focus { background-color: alpha(@theme_selected_bg_color, 0.10); border-style: none; border-radius: 4px; } -.view { +view, +.view, +view text, +.view text, +iconview text, +textview text{ background-color: @theme_base_color; color: @theme_fg_color; text-shadow: 0px 1px @theme_shadow_color; } + + +view, +view:selected, +view:selected:focus, .view:selected, -.view:selected:focus { - background-color: shade(@theme_selected_bg_color, 1.10); +.view:selected:focus, +view text selection, +.view text selection, +view text selection:focus, +.view text selection:focus{ + background-color: shade(@theme_selected_bg_color, 1.10); background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@theme_selected_bg_color, 1.0)), @@ -3827,26 +3851,27 @@ GtkIconView.view.cell:hover:focus { text-shadow: 0px 1px @theme_selected_shadow_color; text-shadow: none; } - +.view text selection:focus, .view:selected:focus { text-shadow: 0px 1px @theme_selected_shadow_color; } -GtkTreeView { - -GtkWidget-focus-line-width: 0; - -GtkWidget-focus-padding: 1; +treeview { } -GtkTreeView.dnd { +treeview.dnd { border-color: @internal_element_color; border-radius: 2px; border-width: 1px; border-style: solid; } -GtkTreeView row:nth-child(odd):selected:hover, -GtkTreeView row:nth-child(even):selected:hover, -.notebook GtkContainer GtkTreeView row:selected { + +treeview:selected:hover, +/*does not work in recent GTK versions +treeview row:nth-child(odd):selected:hover, +treeview row:nth-child(even):selected:hover,*/ +notebook container treeview:selected { background-image: -gtk-gradient (linear, left top, left bottom, @@ -3856,16 +3881,18 @@ GtkTreeView row:nth-child(even):selected:hover, color: @theme_selected_fg_color; } -GtkTreeView.view row, -GtkTreeView.view row:focus { +treeview.view, +treeview.view:focus { background-color: @theme_base_color; border-style: none; } .view row:hover, -GtkTreeView row:nth-child(odd):hover, -GtkTreeView row:nth-child(even):hover, -.notebook GtkContainer GtkTreeView row:hover { +/*does not work in recent GTK versions +treeview row:nth-child(odd):hover, +treeview row:nth-child(even):hover,*/ +treeview:hover, +notebook container treeview:hover { background-image: -gtk-gradient (linear, left top, left bottom, @@ -3876,14 +3903,18 @@ GtkTreeView row:nth-child(even):hover, text-shadow: none; } +/*Keep treeviews from jumping, separators drawn at 0 by default until hovered*/ +treeview.view.separator { + min-height: 2px; +} + column-header { padding: 0px 2px; } -column-header .button, -column-header .button:focus { +column-header button, +column-header button:focus { padding: 0px 4px 1px; - -GtkWidget-focus-line-width: 0; background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_base, 1.00)), @@ -3904,7 +3935,7 @@ column-header .button:focus { inset 0px -1px alpha(#fff, 0.05); } -column-header .button:hover { +column-header button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_gradient1, 1.03)), @@ -3924,7 +3955,7 @@ column-header .button:hover { inset 0px -1px shade(@selected_bg_color, 0.93); } -column-header .button:focus:hover:active { +column-header button:focus:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), @@ -3935,7 +3966,7 @@ column-header .button:focus:hover:active { box-shadow: none; } -column-header .button:insensitive { +column-header button:disabled { background-image: none; background-color: @insensitive_bg_color; border-color: @insensitive_border_color; @@ -3943,15 +3974,15 @@ column-header .button:insensitive { box-shadow: none; } -column-header .button GtkArrow { +column-header button GtkArrow { color: @internal_element_color; } -column-header:nth-child(last) .button { +column-header:nth-child(last) button { border-width: 0px 0px 1px 0px; } -row:insensitive { +row:disabled { border-width: 0px; } @@ -4004,14 +4035,14 @@ row:selected:focus:backdrop { background-image: none; } -.app-notification .button, -.app-notification .header-bar .button.titlebutton, -.header-bar .app-notification .button.titlebutton, -.app-notification .titlebar .button.titlebutton, -.titlebar .app-notification .button.titlebutton, -.app-notification GtkCalendar.header .button.titlebutton, -GtkCalendar.header .app-notification .button.titlebutton, -.app-notification.frame .button { +.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 { color: @theme_dark_fg_color; border-color: rgba(114, 180, 157, 0.7); background-image: linear-gradient(to bottom, @@ -4019,32 +4050,32 @@ 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 .header-bar .titlebutton.button, -.header-bar .app-notification .titlebutton.button, -.app-notification .titlebar .titlebutton.button, -.titlebar .app-notification .titlebutton.button, -.app-notification GtkCalendar.header .titlebutton.button, -GtkCalendar.header .app-notification .titlebutton.button, -.app-notification.frame .button.flat, -.app-notification.frame .header-bar .titlebutton.button, -.header-bar .app-notification.frame .titlebutton.button, -.app-notification.frame .titlebar .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; +.app-notification button.flat, +.app-notification headerbar .titlebutton button, + headerbar .app-notification .titlebutton button, +.app-notification .titlebar .titlebutton button, +.titlebar .app-notification .titlebutton button, +.app-notification calendar.header .titlebutton button, +calendar.header .app-notification .titlebutton button, +.app-notification.frame button.flat, +.app-notification.frame headerbar .titlebutton button, + headerbar .app-notification.frame .titlebutton button, +.app-notification.frame .titlebar .titlebutton button, +.titlebar .app-notification.frame .titlebutton button, +.app-notification.frame calendar.header .titlebutton button, +calendar.header .app-notification.frame .titlebutton button { + -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: black; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, @@ -4052,16 +4083,16 @@ 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; padding: 0 0px 2px 0px; } -.app-notification .button:checked, -.app-notification .button:backdrop:checked, -.app-notification.frame .button:checked, -.app-notification.frame .button:backdrop:active { +.app-notification button:checked, +.app-notification button:backdrop:checked, +.app-notification.frame button:checked, +.app-notification.frame button:backdrop:active { color: white; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, @@ -4069,15 +4100,15 @@ 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 { color: #878989; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, @@ -4085,13 +4116,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; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, @@ -4099,7 +4130,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; } @@ -4108,67 +4139,73 @@ GtkCalendar.header .app-notification.frame .titlebutton.button { * Expanders * *************/ -GtkTreeView.view.expander { +treeview.view.expander { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); color: @theme_fg_color; } - GtkTreeView.view.expander:dir(rtl) { +treeview.view.expander:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } -GtkTreeView.view.expander:checked { +treeview.view.expander:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } -GtkTreeView.view.expander:hover { +treeview.view.expander:hover { color: @theme_selected_bg_color; } -GtkTreeView.view.expander:selected, -GtkTreeView.view.expander:selected:hover { +treeview.view.expander:selected, +treeview.view.expander:selected:hover { color: @theme_selected_fg_color; } -GtkExpander { +expander arrow{ -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } -GtkExpander:dir(rtl) { + +expander arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } -GtkExpander:hover { +expander arrow:hover { color: @internal_element_color; } -GtkExpander:checked { +expander arrow:checked { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); } /* why this weird padding, possible issue with gtk+-3.18 ? */ -GtkExpander { - -GtkExpander-expander-size: 14; +expander { + -expander-expander-size: 14; padding: 0px 4px 0px 0px; } +expander, .expander { color: @theme_fg_color; border-color: @theme_fg_color; } +expander:checked, .expander:checked { color: @theme_selected_bg_color; border-color: @theme_selected_bg_color; } +expander:hover, .expander:hover { color: @internal_element_color; border-color: @internal_element_color; } -.expander row:selected, -.expander row:selected:focus { +expander title:selected, +expander title:selected:focus, +.expander title:selected, +.expander title:selected:focus { border-style: solid; border-width: 1px; border-color: @expander_row_selected_color; @@ -4176,8 +4213,10 @@ GtkExpander { background-color: @theme_selected_bg_color; } -.expander row:selected:hover, -.expander row:selected:focus:hover { +expander title:selected:hover, +expander title:selected:focus:hover, +.expander title:selected:hover, +.expander title:selected:focus:hover { color: @theme_selected_fg_color; border-color: @theme_selected_fg_color; } @@ -4186,23 +4225,23 @@ GtkExpander { * List boxes * **************/ -.list { +list { background-color: @list_box_bg; } -.list .separator.horizontal { +list .separator.horizontal { background-color: @theme_base_color; border-width: 0px; } -.list-row { +list-row { padding: 2px; transition: all 200ms ease-in; background-image: none; background-color: @theme_base_color; } -.list-row:hover { +list-row:hover { border-color: shade (@theme_selected_bg_color, 1.6); background-image: -gtk-gradient (linear, left top, @@ -4215,15 +4254,15 @@ GtkExpander { inset -1px 0px shade(@selected_bg_color, 0.93), inset 0px -1px shade(@selected_bg_color, 0.93); text-shadow: none; - icon-shadow: none; + -gtk-icon-shadow: none; border-image: none; border-radius: 6px; border-style: solid; } -.list-row:selected, -.list-row:selected:hover, -.list-row:selected:hover:active { +list-row:selected, +list-row:selected:hover, +list-row:selected:hover:active { border-width: 0; border-radius: 0px; border-style: none; @@ -4235,8 +4274,8 @@ GtkExpander { color: @theme_selected_fg_color; } -.list-row:selected:backdrop, -.list-row:selected:backdrop:hover { +list-row:selected:backdrop, +list-row:selected:backdrop:hover { border-width: 0; border-style: solid; border-color: shade (@theme_bg_color, 0.85); @@ -4252,20 +4291,20 @@ GtkExpander { * Calendar * **************/ -GtkCalendar { +calendar { border-radius: 3px; border-color: shade (@theme_fg_color, 0.8); padding: 1px 1px 3px 1px; } -GtkCalendar.view { +calendar.view { border-radius: 3px; border-style: solid; border-width: 1px; padding: 2px; } -GtkCalendar.header { +calendar.header { border-radius: 3px 3px 0px 0px; background-image: linear-gradient(to bottom, shade(@theme_bg_color, 1.04), @@ -4273,10 +4312,10 @@ GtkCalendar.header { border-width: 0; } -GtkCalendar.expander, -GtkCalendar.button, -GtkCalendar.button.flat, -GtkCalendar.button:insensitive { +calendar.expander, +calendar button, +calendar button.flat, +calendar button:disabled { border-color: transparent; background-image: none; background-color: transparent; @@ -4285,15 +4324,15 @@ GtkCalendar.button:insensitive { } /* disable shadows and button background on arrows */ -GtkCalendar.button:first-child, -GtkCalendar.button:last-child { +calendar button:first-child, +calendar button:last-child { box-shadow: none; background-image: none; } /* disable button background on arrows */ -GtkCalendar.button:hover:first-child, -GtkCalendar.button:hover:last-child { +calendar button:hover:first-child, +calendar button:hover:last-child { background-image: none; border-radius: 3px; box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), @@ -4303,7 +4342,7 @@ GtkCalendar.button:hover:last-child { } .highlight, -GtkCalendar.highlight { +calendar.highlight { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; border-radius: 0px; @@ -4312,10 +4351,10 @@ GtkCalendar.highlight { border-color: transparent; } -.menuitem GtkCalendar, -.menuitem GtkCalendar.button, -.menuitem GtkCalendar.header, -.menuitem GtkCalendar.view { +menuitem calendar, +menuitem calendar button, +menuitem calendar.header, +menuitem calendar.view { background-color: shade(@theme_bg_dark_color, 0.82); background-image: none; border-radius: 0px; @@ -4325,7 +4364,7 @@ GtkCalendar.highlight { color: @theme_base_color; } -.menuitem GtkCalendar { +menuitem calendar { background-color: shade (@menu_bg_color, 1.3); background-image: none; } @@ -4334,7 +4373,7 @@ GtkCalendar.highlight { * GtkInfoBar * **************/ -GtkInfoBar { +infobar { border-width: 0; border-style: none; } @@ -4353,54 +4392,54 @@ GtkInfoBar { color: @warning_fg_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, +.error button.close:hover { background-image: linear-gradient(to bottom, alpha(white, 0.3), alpha(white, 0.2) 30%, alpha(black, 0.02)); } -.info .button.close:checked, -.warning .button.close:checked, -.question .button.close:checked, -.error .button.close:checked { +.info button.close:checked, +.warning button.close:checked, +.question button.close:checked, +.error button.close:checked { color: @infobar_fg_color; background-image: linear-gradient(to bottom, alpha(black, 0.1), transparent); } -.info .entry, -.info .entry:focus, -.info .button, -.info .button:insensitive, -.info .button:checked, -.warning .entry, -.warning .entry:focus, -.warning .button, -.warning .button:insensitive, -.warning .button:checked, -.error .entry, -.error .entry:focus, -.error .button, -.error .button:insensitive, -.error .button:checked, -.question .entry, -.question .entry:focus, -.question .button, -.question .button:insensitive, -.question .button:checked { +.info entry, +.info entry:focus, +.info button, +.info button:disabled, +.info button:checked, +.warning entry, +.warning entry:focus, +.warning button, +.warning button:disabled, +.warning button:checked, +.error entry, +.error entry:focus, +.error button, +.error button:disabled, +.error button:checked, +.question entry, +.question entry:focus, +.question button, +.question button:disabled, +.question button:checked { color: @theme_fg_color; border-color: darker(@info_bg_color); border-style: solid; @@ -4408,7 +4447,7 @@ GtkInfoBar { } /* Warning Bar */ -GtkInfoBar.horizontal.error { +infobar.horizontal.error { background-color: @error_bg_color; color: @error_fg_color; border-color: darker(@error_bg_color); @@ -4417,14 +4456,14 @@ GtkInfoBar.horizontal.error { } /* Question Bar */ -GtkInfoBar.horizontal.info .horizontal { +infobar.horizontal.info .horizontal { background-color: @question_bg_color; color: @question_fg_color; } -GtkInfoBar.horizontal.info .horizontal .button.flat.raised.close, -GtkInfoBar.horizontal.info .horizontal .button.flat.raised.close:hover, -GtkInfoBar.horizontal.info .horizontal .button.flat.raised.close:checked { +infobar.horizontal.info .horizontal button.flat.raised.close, +infobar.horizontal.info .horizontal button.flat.raised.close:hover, +infobar.horizontal.info .horizontal button.flat.raised.close:checked { border-radius: 3px; box-shadow: none; } @@ -4434,7 +4473,7 @@ GtkInfoBar.horizontal.info .horizontal .button.flat.raised.close:checked { ***************/ .prompt, -GtkMessageDialog { +messagedialog { -GtkDialog-content-area-border: 0; -GtkDialog-action-area-border: 12; -GtkDialog-button-spacing: 0; @@ -4443,18 +4482,18 @@ GtkMessageDialog { } /* ie. mate-keyboard-properties option window */ -GtkDialog GtkScrolledWindow.frame { +dialog scrolledwindow.frame { border-color: @notebook_border; border-style: solid; border-width: 1px; border-radius: 2px; } -GtkDialog GtkScrolledWindow.frame GtkViewport .vertical { +dialog scrolledwindow.frame viewport .vertical { background-color: shade (@theme_bg_color, 1.10); } -GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { +dialog scrolledwindow.frame viewport .vertical expander .vertical { background-color: @theme_base_color; border-radius: 3px; border-color: @notebook_border; @@ -4463,71 +4502,71 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { } /* middle buttons */ -.dialog-action-area.linked .button, -.dialog-action-area.linked .button:focus, -.dialog-action-area.linked .button:hover, -.dialog-action-area.linked .button:focus:hover, -.dialog-action-area.linked .button:focus:hover:active, -.dialog-action-area.linked .button:checked, -.dialog-action-area.linked .button:checked:hover, -.dialog-action-area.linked .button:checked:hover:active, -.dialog-action-area.linked .button:insensitive { +.dialog-action-area.linked button, +.dialog-action-area.linked button:focus, +.dialog-action-area.linked button:hover, +.dialog-action-area.linked button:focus:hover, +.dialog-action-area.linked button:focus:hover:active, +.dialog-action-area.linked button:checked, +.dialog-action-area.linked button:checked:hover, +.dialog-action-area.linked button:checked:hover:active, +.dialog-action-area.linked button:disabled { border-right-width: 0px; border-left-width: 0px; border-width: 1px 0; border-radius: 0; - padding: 1px 2px; + padding: 6px 2px; /*this looks about right on the Caja run/display dialog*/ } /* left button */ -.dialog-action-area.linked .button:first-child, -.dialog-action-area.linked .button:focus:first-child, -.dialog-action-area.linked .button:hover:first-child, -.dialog-action-area.linked .button:focus:hover:first-child, -.dialog-action-area.linked .button:focus:hover:active:first-child, -.dialog-action-area.linked .button:checked:first-child, -.dialog-action-area.linked .button:checked:hover:first-child, -.dialog-action-area.linked .button:checked:hover:active:first-child, -.dialog-action-area.linked .button:insensitive:first-child { +.dialog-action-area.linked button:first-child, +.dialog-action-area.linked button:focus:first-child, +.dialog-action-area.linked button:hover:first-child, +.dialog-action-area.linked button:focus:hover:first-child, +.dialog-action-area.linked button:focus:hover:active:first-child, +.dialog-action-area.linked button:checked:first-child, +.dialog-action-area.linked button:checked:hover:first-child, +.dialog-action-area.linked button:checked:hover:active:first-child, +.dialog-action-area.linked button:disabled:first-child { border-radius: 6px 0 0 6px; border-width: 1px; border-right-width: 0; - padding: 1px 2px; + padding: 6px 2px; } /* right button */ -.dialog-action-area.linked .button:last-child, -.dialog-action-area.linked .button:focus:last-child, -.dialog-action-area.linked .button:hover:last-child, -.dialog-action-area.linked .button:focus:hover:last-child, -.dialog-action-area.linked .button:focus:hover:active:last-child, -.dialog-action-area.linked .button:checked:last-child, -.dialog-action-area.linked .button:checked:hover:last-child, -.dialog-action-area.linked .button:checked:hover:active:last-child, -.dialog-action-area.linked .button:insensitive:last-child { +.dialog-action-area.linked button:last-child, +.dialog-action-area.linked button:focus:last-child, +.dialog-action-area.linked button:hover:last-child, +.dialog-action-area.linked button:focus:hover:last-child, +.dialog-action-area.linked button:focus:hover:active:last-child, +.dialog-action-area.linked button:checked:last-child, +.dialog-action-area.linked button:checked:hover:last-child, +.dialog-action-area.linked button:checked:hover:active:last-child, +.dialog-action-area.linked button:disabled:last-child { border-width: 1px; border-radius: 0 6px 6px 0; border-left-width: 0; - padding: 1px 2px; + padding: 6px 2px; } /* single button */ -.dialog-action-area.linked .button:only-child, -.dialog-action-area.linked .button:focus:only-child, -.dialog-action-area.linked .button:hover:only-child, -.dialog-action-area.linked .button:focus:hover:only-child, -.dialog-action-area.linked .button:focus:hover:active:only-child, -.dialog-action-area.linked .button:checked:only-child, -.dialog-action-area.linked .button:checked:hover:only-child, -.dialog-action-area.linked .button:checked:hover:active:only-child, -.dialog-action-area.linked .button:insensitive:last-child { +.dialog-action-area.linked button:only-child, +.dialog-action-area.linked button:focus:only-child, +.dialog-action-area.linked button:hover:only-child, +.dialog-action-area.linked button:focus:hover:only-child, +.dialog-action-area.linked button:focus:hover:active:only-child, +.dialog-action-area.linked button:checked:only-child, +.dialog-action-area.linked button:checked:hover:only-child, +.dialog-action-area.linked button:checked:hover:active:only-child, +.dialog-action-area.linked button:disabled:last-child { padding-left: 6px; padding-right: 6px; border-width: 1px; border-radius: 6px; } -.dialog-action-area.linked .button:only-child { +.dialog-action-area.linked button:only-child { border-width: 0px; background-image: -gtk-gradient (linear, left top, left bottom, @@ -4545,14 +4584,14 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); } -.dialog-action-area.linked .button:focus:only-child { +.dialog-action-area.linked button:focus:only-child { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), inset 0px -1px shade(@selected_bg_color, 0.93); } -.dialog-action-area.linked .button:hover:only-child { +.dialog-action-area.linked button:hover:only-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_gradient1, 1.03)), @@ -4561,7 +4600,7 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { to (shade(@button_gradient4, 1.01))); } -.dialog-action-area.linked .button:active:only-child { +.dialog-action-area.linked button:active:only-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), @@ -4570,10 +4609,10 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { to (shade (@theme_bg_color, 0.80))); } -.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 { +.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 { box-shadow: none; } @@ -4612,7 +4651,7 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4); } -GtkOverlay.osd { +overlay.osd { background-color: transparent; } @@ -4621,15 +4660,15 @@ GtkOverlay.osd { background-origin: border-box; } -.osd.button:focus, -.osd.button:checked, -.osd.button:hover:active, -.osd.button:focus:hover:active, -.osd .button, -.osd .button:focus, -.osd .button:checked, -.osd .button:hover:active, -.osd .button:focus:hover:active { +.osd button:focus, +.osd button:checked, +.osd button:hover:active, +.osd button:focus:hover:active, +.osd button, +.osd button:focus, +.osd button:checked, +.osd button:hover:active, +.osd button:focus:hover:active { border-width: 1px; border-style: solid; border-image: none; @@ -4638,23 +4677,23 @@ GtkOverlay.osd { box-shadow: none; } -.osd.button, -.osd.button:hover, -.osd.button:checked { +.osd button, +.osd button:hover, +.osd button:checked { background-color: shade(@osd_bg, 1.10); border-radius: 5px; border-color: @osd_button_border; } -.osd .button, -.osd .button:hover, -.osd .button:checked { +.osd button, +.osd button:hover, +.osd button:checked { background-color: transparent; box-shadow: none; } -.osd.button:insensitive, -.osd .button:insensitive { +.osd button:disabled, +.osd button:disabled { background-image: none; border-color: @osd_button_bg_insensitive; background-color: transparent; @@ -4662,17 +4701,17 @@ GtkOverlay.osd { color: @osd_button_fg_insensitive; } -.osd.button:checked:insensitive, -.osd .button:checked:insensitive { +.osd button:checked:disabled, +.osd button:checked:disabled { background-image: none; background-color: @osd_button_bg_insensitive_active; color: @osd_button_fg_insensitive; } -.osd.button, -.osd.button:focus, -.osd .button, -.osd .button:focus { +.osd button, +.osd button:focus, +.osd button, +.osd button:focus { padding: 4px; background-image: linear-gradient(to bottom, @osd_button_bg_a, @@ -4680,12 +4719,12 @@ GtkOverlay.osd { @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:hover, -.osd .button:hover, -.osd .linked .button:hover { +.osd button:hover, +.osd button:hover, +.osd .linked button:hover { background-image: linear-gradient(to bottom, @osd_button_bg_hover_a, @osd_button_bg_hover_b 68%, @@ -4693,17 +4732,17 @@ GtkOverlay.osd { color: @osd_button_fg_hover; } -.osd.button:checked, -.osd.button:checked:hover, -.osd.button:checked:hover:active, -.osd.button:hover:active, -.osd.button:focus:hover:active, -.osd .button:checked, -.osd .button:checked:hover, -.osd .button:checked:hover:active, -.osd .button:hover:active, -.osd .button:focus:hover:active, -.osd GtkMenuButton.button:checked { +.osd button:checked, +.osd button:checked:hover, +.osd button:checked:hover:active, +.osd button:hover:active, +.osd button:focus:hover:active, +.osd button:checked, +.osd button:checked:hover, +.osd button:checked:hover:active, +.osd button:hover:active, +.osd button:focus:hover:active, +.osd GtkMenuButton button:checked { background-image: linear-gradient(to bottom, @osd_button_bg_active_a, @osd_button_bg_active_b 68%, @@ -4712,13 +4751,13 @@ GtkOverlay.osd { text-shadow: 0 -1px @osd_button_shadow; } -.osd GtkMenuButton.button:checked { +.osd GtkMenuButton button:checked { background-color: transparent; border-color: @osd_button_border; } /* gnome-weather */ -.linked.stack-switcher.osd .button { +.linked.stack-switcher.osd button { background-image: linear-gradient(to bottom, alpha(shade(@theme_selected_bg_color, 1.2), 0.1), alpha(shade(@theme_selected_bg_color, 0.95), 0.1)); @@ -4726,7 +4765,7 @@ GtkOverlay.osd { box-shadow: none; } -.linked.stack-switcher.osd .button:hover { +.linked.stack-switcher.osd button:hover { background-image: linear-gradient(to bottom, alpha(shade(@theme_selected_bg_color, 1.2), 0.4), alpha(shade(@theme_selected_bg_color, 0.95), 0.4)); @@ -4734,30 +4773,30 @@ GtkOverlay.osd { } -.linked.stack-switcher.osd .button { +.linked.stack-switcher.osd button { border-width: 1px 0 1px 0px; border-color: shade (@theme_selected_bg_color, 0.8); } -.linked.stack-switcher.osd .button:first-child { +.linked.stack-switcher.osd button:first-child { border-width: 1px 1px 1px 1px; } -.linked.stack-switcher.osd .button:last-child { +.linked.stack-switcher.osd button:last-child { border-width: 1px 1px 1px 0px; } -.linked.stack-switcher.osd .button:only-child { +.linked.stack-switcher.osd button:only-child { border-width: 1px; } /* ie. parole media-player */ /* previous/play/next */ -.osd .horizontal .horizontal .button { +.osd .horizontal .horizontal button { padding: 5px 8px; } -.osd .horizontal .horizontal .button:insensitive { +.osd .horizontal .horizontal button:disabled { border-color: @osd_button_bg_insensitive; } @@ -4775,12 +4814,12 @@ GtkOverlay.osd { } /* ie. volume button */ -.osd .horizontal .button, -.osd .horizontal .button:hover { +.osd .horizontal button, +.osd .horizontal button:hover { padding: 5px 8px; } -.osd.toolbar { +.osd toolbar { color: @osd_fg; text-shadow: 0 1px @osd_text_shadow; padding: 10px; @@ -4795,41 +4834,41 @@ GtkOverlay.osd { -GtkToolbar-button-relief: normal; } -.osd.toolbar .button, -.osd.toolbar .button:hover, -.osd.toolbar .linked .button { +.osd toolbar button, +.osd toolbar button:hover, +.osd toolbar .linked button { padding: 6px; border-width: 1px; border-radius: 5px; } -.osd.toolbar .button:first-child, -.osd.toolbar .linked .button:first-child { +.osd toolbar button:first-child, +.osd toolbar .linked button:first-child { border-radius: 5px 0 0 5px; border-width: 1px 0 1px 1px; box-shadow: inset -1px 0 @osd_button_inset; } -.osd.toolbar .button:last-child, -.osd.toolbar .linked .button:last-child { +.osd toolbar button:last-child, +.osd toolbar .linked button:last-child { box-shadow: none; border-radius: 0 5px 5px 0; border-width: 1px 1px 1px 0; } -.osd.toolbar .button:only-child, -.osd.toolbar .linked .button:only-child, -.osd.toolbar GtkToolButton .button, -.osd.toolbar GtkToolButton:only-child .button, -.osd.toolbar GtkToolButton:last-child .button, -.osd.toolbar GtkToolButton:first-child .button { +.osd toolbar button:only-child, +.osd toolbar .linked button:only-child, +.osd toolbar GtkToolButton button, +.osd toolbar GtkToolButton:only-child button, +.osd toolbar GtkToolButton:last-child button, +.osd toolbar GtkToolButton:first-child button { border-width: 1px; border-radius: 5px; border-style: solid; box-shadow: none; } -.osd.toolbar .separator { +.osd toolbar .separator { color: shade(@osd_lowlight, 0.80); } @@ -4844,13 +4883,13 @@ GtkOverlay.osd { background-color: @osd_fg; } -.osd .scale.trough:insensitive, -.osd .scale.trough.highlight:insensitive { +.osd scale trough:disabled, +.osd scale trough.highlight:disabled { background-image: none; background-color: transparent; } -.osd .scale-popup.popover.background { +.osd scale-popup popover.background { color: @osd_fg; border-style: solid; border-width: 1px; @@ -4862,7 +4901,7 @@ GtkOverlay.osd { background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4); } -.osd .popover.scale-popup .flat.button.image-button { +.osd popover scale-popup .flat button.image-button { background-image: linear-gradient(to bottom, @osd_button_bg_a, @osd_button_bg_b 68%, @@ -4874,16 +4913,16 @@ GtkOverlay.osd { padding: 2px; } -.osd .popover.scale-popup .flat.button.image-button:hover { +.osd popover scale-popup .flat button.image-button:hover { background-image: linear-gradient(to bottom, @osd_button_bg_hover_a, @osd_button_bg_hover_b 68%, @osd_button_bg_hover_c); border-color: alpha(shade(@theme_selected_bg_color, 2.2), 0.8); - -gtk-image-effect: highlight; + /*-gtk-image-effect: highlight; INVALID */ } -.osd .popover.scale-popup .flat.button.image-button:insensitive { +.osd popover scale-popup .flat button.image-button:disabled { background-image: none; background-color: transparent; border-image: none; @@ -4891,16 +4930,16 @@ GtkOverlay.osd { box-shadow: none; } -.osd GtkProgressBar, -GtkProgressBar.osd { +.osd progressbar, +progressbar.osd { padding: 0; - -GtkProgressBar-xspacing: 0; - -GtkProgressBar-yspacing: 3px; - -GtkProgressBar-min-horizontal-bar-height: 3px; + -progressbar-xspacing: 0; + -progressbar-yspacing: 3px; + min-height: 3px; } -.osd GtkProgressBar.trough, -GtkProgressBar.osd.trough { +.osd progressbar trough, +progressbar.osd trough { padding: 0; border-image: none; border-style: none; @@ -4910,8 +4949,8 @@ GtkProgressBar.osd.trough { border-radius: 0; } -.osd GtkProgressBar.progressbar, -GtkProgressBar.osd.progressbar { +.osd progressbar.progressbar, +progressbar.osd.progressbar { border-style: none; background-color: @theme_selected_bg_color; background-image: none; @@ -4932,15 +4971,15 @@ GtkProgressBar.osd.progressbar { } .osd .scrollbar.slider:hover { - background-color: @osd_scrollbar_slider_prelight; + background-color: @osd_scrollbar_slider_hover; } .osd .scrollbar.slider:active { background-color: @osd_scrollbar_slider_active; } -.osd GtkIconView.cell:selected, -.osd GtkIconView.cell:selected:focus { +.osd iconview.cell:selected, +.osd iconview.cell:selected:focus { background-color: transparent; border-style: solid; border-radius: 15px; @@ -4962,7 +5001,7 @@ GtkProgressBar.osd.progressbar { * Popovers * *************/ -.popover { +popover { background-clip: initial; margin: 10px; padding: 2px; @@ -4973,42 +5012,42 @@ GtkProgressBar.osd.progressbar { background-color: @bg_dark_color; box-shadow: 0 1px 5px @wm_shadow; text-shadow: none; - icon-shadow: none; -} - -.popover > .list, -.popover > .view, -.popover > .toolbar .popover.osd > .toolbar, -.popover > .inline-toolbar .popover.osd > .toolbar, -.popover > .search-bar .popover.osd > .toolbar, -.popover > .location-bar .popover.osd > .toolbar, -.popover > .toolbar .popover.osd > .inline-toolbar, -.popover > .inline-toolbar .popover.osd > .inline-toolbar, -.popover > .search-bar .popover.osd > .inline-toolbar, -.popover > .location-bar .popover.osd > .inline-toolbar, -.popover > .toolbar .popover.osd > .search-bar, -.popover > .inline-toolbar .popover.osd > .search-bar, -.popover > .search-bar .popover.osd > .search-bar, -.popover > .location-bar .popover.osd > .search-bar, -.popover > .toolbar .popover.osd > .location-bar, -.popover > .inline-toolbar .popover.osd > .location-bar, -.popover > .search-bar .popover.osd > .location-bar, -.popover > .location-bar .popover.osd > .location-bar { + -gtk-icon-shadow: none; +} + +popover > list, +popover > .view, +popover > toolbar popover.osd > toolbar, +popover > .inline-toolbar popover.osd > toolbar, +popover > .search-bar popover.osd > toolbar, +popover > .location-bar popover.osd > toolbar, +popover > toolbar popover.osd > .inline-toolbar, +popover > .inline-toolbar popover.osd > .inline-toolbar, +popover > .search-bar popover.osd > .inline-toolbar, +popover > .location-bar popover.osd > .inline-toolbar, +popover > toolbar popover.osd > .search-bar, +popover > .inline-toolbar popover.osd > .search-bar, +popover > .search-bar popover.osd > .search-bar, +popover > .location-bar popover.osd > .search-bar, +popover > toolbar popover.osd > .location-bar, +popover > .inline-toolbar popover.osd > .location-bar, +popover > .search-bar popover.osd > .location-bar, +popover > .location-bar popover.osd > .location-bar { border-style: none; background-color: transparent; } -.popover .separator { +popover .separator { font-size: 80%; font-weight: bold; color: alpha(@theme_fg_dark_color,0.6); 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); border: 1px solid black; @@ -5016,27 +5055,27 @@ GtkProgressBar.osd.progressbar { 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:checked { +popover.osd button:checked { box-shadow: none; } -.popover.osd .button:insensitive { +popover.osd button:disabled { color: alpha(@theme_selected_fg_color, 0.4); } -.popover.scale-popup .flat.button.image-button:insensitive { +popover scale-popup .flat button.image-button:disabled { background-image: none; background-color: transparent; border-image: none; @@ -5044,7 +5083,7 @@ GtkProgressBar.osd.progressbar { box-shadow: none; } -.popover.scale-popup .flat.button.image-button { +popover scale-popup .flat button.image-button { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -5056,29 +5095,29 @@ GtkProgressBar.osd.progressbar { inset 0px -1px shade(@selected_bg_color, 0.93); } -.popover.scale-popup .flat.button.image-button:hover { - -gtk-image-effect: highlight; +popover scale-popup .flat button.image-button:hover { + /* -gtk-image-effect: highlight; INVALID*/ } -.popover.scale-popup .scale .trough, -.popover.scale-popup .scale .trough.vertical { +popover scale-popup scale .trough, +popover scale-popup scale .trough.vertical { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@scale_border_a, 1.10)), to (shade (@scale_border_a, 1.51))); } -.popover.scale-popup .scale .trough.highlight, -.popover.scale-popup .scale .trough.highlight.vertical { +popover scale-popup scale .trough.highlight, +popover scale-popup scale .trough.highlight.vertical { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_selected_bg_color, 1.31)), to (shade (@theme_selected_bg_color, 1.00))); } -/* needs to be here to avoid a override by .popover.scale-popup */ -.osd .scale.trough, -.osd .scale-popup.popover .scale.trough { +/* needs to be here to avoid a override by popover scale-popup */ +.osd scale trough, +.osd scale-popup popover scale trough { border-color: @osd_scale_border; border-image: none; background-image: linear-gradient(to bottom, @@ -5087,19 +5126,19 @@ GtkProgressBar.osd.progressbar { background-color: transparent; } -.osd .scale.trough.highlight, -.osd .scale-popup.popover .scale.trough.highlight { +.osd scale trough.highlight, +.osd scale-popup popover scale trough.highlight { background-image: none; background-color: @theme_selected_bg_color; border-color: @scale_highlight_border; } -.popover .list { +popover list { background-color: @theme_base_color; } /* more/less volume button */ -.popover .image-button:hover { +popover .image-button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -5110,7 +5149,7 @@ GtkProgressBar.osd.progressbar { inset 0px -1px shade(@selected_bg_color, 0.93); } -.popover .image-button:insensitive { +popover .image-button:disabled { background-image: none; background-color: transparent; box-shadow: inset 0px 1px @insensitive_border_color, @@ -5119,45 +5158,45 @@ GtkProgressBar.osd.progressbar { inset 0px -1px @insensitive_border_color; } -GtkModelButton.button, -GtkModelButton.button:first-child, -GtkModelButton.button:last-child, -GtkModelButton.button:only-child { +modelbutton button, +modelbutton button:first-child, +modelbutton button:last-child, +modelbutton button:only-child { background-image: none; color: @theme_fg_dark_color; border-radius: 3px; } -GtkModelButton.button:checked, -GtkModelButton.button:insensitive, -GtkModelButton.button:checked:insensitive, -GtkModelButton.button, -GtkModelButton.button:focus, -GtkModelButton.button:checked:focus, -GtkModelButton.button:checked:first-child, -GtkModelButton.button:insensitive:first-child, -GtkModelButton.button:checked:insensitive:first-child, -GtkModelButton.button:first-child, -GtkModelButton.button:focus:first-child, -GtkModelButton.button:checked:focus:first-child, -GtkModelButton.button:checked:last-child, -GtkModelButton.button:insensitive:last-child, -GtkModelButton.button:checked:insensitive:last-child, -GtkModelButton.button:last-child, -GtkModelButton.button:focus:last-child, -GtkModelButton.button:checked:focus:last-child, -GtkModelButton.button:checked:only-child, -GtkModelButton.button:insensitive:only-child, -GtkModelButton.button:checked:insensitive:only-child, -GtkModelButton.button:only-child, -GtkModelButton.button:focus:only-child, -GtkModelButton.button:checked:focus:only-child, -.linked GtkModelButton.button, -.linked GtkModelButton.button:focus, -.linked GtkModelButton.button:first-child, -.linked GtkModelButton.button:focus:first-child, -.linked GtkModelButton.button:last-child, -.linked GtkModelButton.button:focus:last-child { +modelbutton button:checked, +modelbutton button:disabled, +modelbutton button:checked:disabled, +modelbutton button, +modelbutton button:focus, +modelbutton button:checked:focus, +modelbutton button:checked:first-child, +modelbutton button:disabled:first-child, +modelbutton button:checked:disabled:first-child, +modelbutton button:first-child, +modelbutton button:focus:first-child, +modelbutton button:checked:focus:first-child, +modelbutton button:checked:last-child, +modelbutton button:disabled:last-child, +modelbutton button:checked:disabled:last-child, +modelbutton button:last-child, +modelbutton button:focus:last-child, +modelbutton button:checked:focus:last-child, +modelbutton button:checked:only-child, +modelbutton button:disabled:only-child, +modelbutton button:checked:disabled:only-child, +modelbutton button:only-child, +modelbutton button:focus:only-child, +modelbutton button:checked:focus:only-child, +.linked modelbutton button, +.linked modelbutton button:focus, +.linked modelbutton button:first-child, +.linked modelbutton button:focus:first-child, +.linked modelbutton button:last-child, +.linked modelbutton button:focus:last-child { background-color: shade (@theme_bg_dark_color, 1.0); background-image: none; border-color: transparent; @@ -5167,42 +5206,42 @@ GtkModelButton.button:checked:focus:only-child, border-radius: 3px; } -GtkModelButton.button:checked:hover:only-child, -GtkModelButton.button:checked:hover:active:only-child, -GtkModelButton.button:focus:hover:active:only-child, -GtkModelButton.button:hover:active:only-child, -GtkModelButton.button:hover:only-child, -GtkModelButton.button:selected:only-child, -GtkModelButton.button:checked:hover:first-child, -GtkModelButton.button:checked:hover:active:first-child, -GtkModelButton.button:focus:hover:active:first-child, -GtkModelButton.button:hover:active:first-child, -GtkModelButton.button:hover:first-child, -GtkModelButton.button:selected:first-child, -GtkModelButton.button:checked:hover:last-child, -GtkModelButton.button:checked:hover:active:last-child, -GtkModelButton.button:focus:hover:active:last-child, -GtkModelButton.button:hover:active:last-child, -GtkModelButton.button:hover:last-child, -GtkModelButton.button:selected:last-child, -GtkModelButton.button:checked:hover, -GtkModelButton.button:checked:hover:active, -GtkModelButton.button:focus:hover:active, -GtkModelButton.button:hover:active, -GtkModelButton.button:hover, -GtkModelButton.button:selected, -.linked GtkModelButton.button:hover, -.linked GtkModelButton.button:hover:active, -.linked GtkModelButton.button:checked:hover, -.linked GtkModelButton.button:checked:hover:active, -.linked GtkModelButton.button:hover:first-child, -.linked GtkModelButton.button:hover:active:first-child, -.linked GtkModelButton.button:checked:hover:first-child, -.linked GtkModelButton.button:checked:hover:active:first-child, -.linked GtkModelButton.button:hover:last-child, -.linked GtkModelButton.button:hover:active:last-child, -.linked GtkModelButton.button:checked:hover:last-child, -.linked GtkModelButton.button:checked:hover:active:last-child { +modelbutton button:checked:hover:only-child, +modelbutton button:checked:hover:active:only-child, +modelbutton button:focus:hover:active:only-child, +modelbutton button:hover:active:only-child, +modelbutton button:hover:only-child, +modelbutton button:selected:only-child, +modelbutton button:checked:hover:first-child, +modelbutton button:checked:hover:active:first-child, +modelbutton button:focus:hover:active:first-child, +modelbutton button:hover:active:first-child, +modelbutton button:hover:first-child, +modelbutton button:selected:first-child, +modelbutton button:checked:hover:last-child, +modelbutton button:checked:hover:active:last-child, +modelbutton button:focus:hover:active:last-child, +modelbutton button:hover:active:last-child, +modelbutton button:hover:last-child, +modelbutton button:selected:last-child, +modelbutton button:checked:hover, +modelbutton button:checked:hover:active, +modelbutton button:focus:hover:active, +modelbutton button:hover:active, +modelbutton button:hover, +modelbutton button:selected, +.linked modelbutton button:hover, +.linked modelbutton button:hover:active, +.linked modelbutton button:checked:hover, +.linked modelbutton button:checked:hover:active, +.linked modelbutton button:hover:first-child, +.linked modelbutton button:hover:active:first-child, +.linked modelbutton button:checked:hover:first-child, +.linked modelbutton button:checked:hover:active:first-child, +.linked modelbutton button:hover:last-child, +.linked modelbutton button:hover:active:last-child, +.linked modelbutton button:checked:hover:last-child, +.linked modelbutton button:checked:hover:active:last-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -5219,11 +5258,11 @@ GtkModelButton.button:selected, inset 0px -1px shade(@selected_bg_color, 0.93); } -.csd .popover .linked GtkModelButton.button:checked, -.csd .popover .linked GtkModelButton.button:hover, -.csd .popover .linked GtkModelButton.button:hover:active, -.csd .popover .linked GtkModelButton.button:checked:hover, -.csd .popover .linked GtkModelButton.button:checked:hover:active { +.csd popover .linked modelbutton button:checked, +.csd popover .linked modelbutton button:hover, +.csd popover .linked modelbutton button:hover:active, +.csd popover .linked modelbutton button:checked:hover, +.csd popover .linked modelbutton button:checked:hover:active { color: @fg_dark_color; background-image: -gtk-gradient (linear, left top, left bottom, @@ -5236,36 +5275,36 @@ GtkModelButton.button:selected, } /* middle button*/ -.linked GtkModelButton.button:hover, -.linked GtkModelButton.button:hover:active, -.linked GtkModelButton.button:checked:hover, -.linked GtkModelButton.button:checked:hover:active { +.linked modelbutton button:hover, +.linked modelbutton button:hover:active, +.linked modelbutton button:checked:hover, +.linked modelbutton button:checked:hover:active { border-right-width: 0px; border-left-width: 0px; border-radius: 0; } /* left button*/ -.linked GtkModelButton.button:hover:first-child, -.linked GtkModelButton.button:hover:active:first-child, -.linked GtkModelButton.button:checked:hover:first-child, -.linked GtkModelButton.button:checked:hover:active:first-child { +.linked modelbutton button:hover:first-child, +.linked modelbutton button:hover:active:first-child, +.linked modelbutton button:checked:hover:first-child, +.linked modelbutton button:checked:hover:active:first-child { border-right-width: 0px; border-radius: 6px 0 0 6px; } /* right button*/ -.linked GtkModelButton.button:hover:last-child, -.linked GtkModelButton.button:hover:active:last-child, -.linked GtkModelButton.button:checked:hover:last-child, -.linked GtkModelButton.button:checked:hover:active:last-child { +.linked modelbutton button:hover:last-child, +.linked modelbutton button:hover:active:last-child, +.linked modelbutton button:checked:hover:last-child, +.linked modelbutton button:checked:hover:active:last-child { border-left-width: 0px; border-radius: 0 6px 6px 0; } -.popover .button.default.text-button.suggested-action { +popover button.default.text-button.suggested-action { background-image: none; - color: @theme_fg_dark_color; + color: @theme_fg_color; text-shadow: none; border-width: 0; border-color: transparent; @@ -5273,7 +5312,7 @@ GtkModelButton.button:selected, padding: 5px 4px; } -.popover .button.default.text-button.suggested-action:hover { +popover button.default.text-button.suggested-action:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -5290,7 +5329,7 @@ GtkModelButton.button:selected, inset 0px -1px shade(@selected_bg_color, 0.93); } -.entry.cursor-handle, +entry.cursor-handle, .cursor-handle { background-color: transparent; background-image: none; @@ -5298,12 +5337,12 @@ GtkModelButton.button:selected, border-style: none; } -.entry.cursor-handle.top, +entry.cursor-handle.top, .cursor-handle.top { -gtk-icon-source: -gtk-icontheme("selection-start-symbolic"); } -.entry.cursor-handle.bottom, +entry.cursor-handle.bottom, .cursor-handle.bottom { -gtk-icon-source: -gtk-icontheme("selection-end-symbolic"); } @@ -5312,6 +5351,14 @@ GtkModelButton.button:selected, * CSD * *******/ +decoration{ + border-radius: 7px 7px 0px 0px; + border-width: 0px; + box-shadow: 0 0 0 2px @wm_csd_border_color, 0 2px 8px 3px @wm_shadow; + /* this is used for the resize cursor area */ + margin: 10px; +} + .titlebar { text-shadow: 0 1px @wm_title_shadow; background-image: linear-gradient(to bottom, @@ -5350,11 +5397,11 @@ GtkModelButton.button:selected, background-color: @theme_bg_dark_color; } -.titlebar .button, -.titlebar .button:first-child, -.titlebar .button:last-child, -.titlebar .button:only-child { - icon-shadow: 0px 1px @theme_shadow_dark_color; +.titlebar button, +.titlebar button:first-child, +.titlebar button:last-child, +.titlebar button:only-child { + -gtk-icon-shadow: 0px 1px @theme_shadow_dark_color; color: @wm_title; background: none; padding: 5px 5px 6px 5px; @@ -5370,7 +5417,7 @@ GtkModelButton.button:selected, } .titlebar .titlebutton { - icon-shadow: 0px 1px @theme_shadow_dark_color; + -gtk-icon-shadow: 0px 1px @theme_shadow_dark_color; color: @wm_title; padding: 5px 5px 6px 5px; border-style: solid; @@ -5382,11 +5429,11 @@ GtkModelButton.button:selected, background-color: transparent; } -.titlebar .button:hover, -.titlebar .button:focus:hover, -.titlebar .button:focus:hover:active, -.titlebar .button:checked, -.titlebar .button:checked:focus, +.titlebar button:hover, +.titlebar button:focus:hover, +.titlebar button:focus:hover:active, +.titlebar button:checked, +.titlebar button:checked:focus, .titlebar .titlebutton:hover, .titlebar .titlebutton:hover:focus, .titlebar .titlebutton:hover:focus:active, @@ -5410,19 +5457,19 @@ GtkModelButton.button:selected, background: none; color: @theme_text_dark_color; border-image: none; - icon-shadow: none; + -gtk-icon-shadow: none; } /* Middle titlebar-button */ -.titlebar .linked .button, -.titlebar .linked .button:focus, -.titlebar .linked .button:insensitive, -.titlebar .button.raised.linked, -.titlebar .button.raised.linked:focus, -.titlebar .button.raised.linked:insensitive, -.titlebar .raised.linked .button, -.titlebar .raised.linked .button:focus, -.titlebar .raised.linked .button:insensitive { +.titlebar .linked button, +.titlebar .linked button:focus, +.titlebar .linked button:disabled, +.titlebar button.raised.linked, +.titlebar button.raised.linked:focus, +.titlebar button.raised.linked:disabled, +.titlebar .raised.linked button, +.titlebar .raised.linked button:focus, +.titlebar .raised.linked button:disabled { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_raised_gradient_color_b, 0.90)), @@ -5435,21 +5482,21 @@ GtkModelButton.button:selected, padding: 5px 5px 6px 5px; } -.titlebar .linked .button:hover, -.titlebar .linked .button:checked, -.titlebar .linked .button:focus:hover:active, -.titlebar .linked .button:checked:hover, -.titlebar .linked .button:checked:focus:hover:active, -.titlebar .button.raised.linked:hover, -.titlebar .button.raised.linked:checked, -.titlebar .button.raised.linked:focus:hover:active, -.titlebar .button.raised.linked:checked:hover, -.titlebar .button.raised.linked:checked:focus:hover:active, -.titlebar .raised.linked .button:hover, -.titlebar .raised.linked .button:checked, -.titlebar .raised.linked .button:focus:hover:active, -.titlebar .raised.linked .button:checked:hover, -.titlebar .raised.linked .button:checked:focus:hover:active { +.titlebar .linked button:hover, +.titlebar .linked button:checked, +.titlebar .linked button:focus:hover:active, +.titlebar .linked button:checked:hover, +.titlebar .linked button:checked:focus:hover:active, +.titlebar button.raised.linked:hover, +.titlebar button.raised.linked:checked, +.titlebar button.raised.linked:focus:hover:active, +.titlebar button.raised.linked:checked:hover, +.titlebar button.raised.linked:checked:focus:hover:active, +.titlebar .raised.linked button:hover, +.titlebar .raised.linked button:checked, +.titlebar .raised.linked button:focus:hover:active, +.titlebar .raised.linked button:checked:hover, +.titlebar .raised.linked button:checked:focus:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -5460,265 +5507,34 @@ GtkModelButton.button:selected, inset -1px 0px shade(@selected_bg_color, 0.93), inset 0px -1px shade(@selected_bg_color, 0.93); color: @theme_fg_dark_color; - border-width: 1px; - border-right-width: 0px; - border-left-width: 0px; - border-radius: 0; - padding: 5px 5px 6px 5px; } -/* Leftmost titlebar-button */ -.titlebar .linked .button:first-child, -.titlebar .linked .button:focus:first-child, -.titlebar .linked .button:insensitive:first-child, -.titlebar .button.raised.linked:first-child, -.titlebar .button.raised.linked:focus:first-child, -.titlebar .button.raised.linked:insensitive:first-child, -.titlebar .raised.linked .button:first-child, -.titlebar .raised.linked .button:focus:first-child, -.titlebar .raised.linked .button:insensitive:first-child { - background-image: -gtk-gradient (linear, - left top, left bottom, - from (shade(@button_raised_gradient_color_b, 0.90)), - to (shade(@button_raised_gradient_color_a, 0.80))); - color: @theme_fg_dark_color; - border-width: 1px; - border-right-width: 0; - border-radius: 5px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; - padding: 5px 5px 6px 5px; -} - -.titlebar .linked .button:hover:first-child, -.titlebar .linked .button:checked:first-child, -.titlebar .linked .button:focus:hover:active:first-child, -.titlebar .linked .button:checked:hover:first-child, -.titlebar .linked .button:checked:focus:hover:active:first-child, -.titlebar .button.raised.linked:hover:first-child, -.titlebar .button.raised.linked:checked:first-child, -.titlebar .button.raised.linked:focus:hover:active:first-child, -.titlebar .button.raised.linked:checked:hover:first-child, -.titlebar .button.raised.linked:checked:focus:hover:active:first-child, -.titlebar .raised.linked .button:hover:first-child, -.titlebar .raised.linked .button:checked:first-child, -.titlebar .raised.linked .button:focus:hover:active:first-child, -.titlebar .raised.linked .button:checked:hover:first-child, -.titlebar .raised.linked .button:checked:focus:hover:active:first-child { - background-image: -gtk-gradient (linear, - left top, left bottom, - from (shade(@menu_bg_dark_color, 2.03)), - to (shade(@menu_bg_dark_color, 1.17))); - padding: 5px 5px 6px 5px; - box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), - inset 1px 0px shade(@selected_bg_color, 0.97), - inset -1px 0px shade(@selected_bg_color, 0.93), - inset 0px -1px shade(@selected_bg_color, 0.93); - color: @theme_fg_dark_color; - border-width: 1px; - border-right-width: 0; - border-radius: 5px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; - padding: 5px 5px 6px 5px; -} - -/* rightmost titlebar-button */ -.titlebar .linked .button:last-child, -.titlebar .linked .button:focus:last-child, -.titlebar .linked .button:insensitive:last-child, -.titlebar .button.raised.linked:last-child, -.titlebar .button.raised.linked:focus:last-child, -.titlebar .button.raised.linked:insensitive:last-child, -.titlebar .raised.linked .button:last-child, -.titlebar .raised.linked .button:focus:last-child, -.titlebar .raised.linked .button:insensitive:last-child { - background-image: -gtk-gradient (linear, - left top, left bottom, - from (shade(@button_raised_gradient_color_b, 0.90)), - to (shade(@button_raised_gradient_color_a, 0.80))); - color: @theme_fg_dark_color; - border-width: 1px; - border-left-width: 0px; - border-radius: 5px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - padding: 5px 5px 6px 5px; -} - -.titlebar .linked .button:hover:last-child, -.titlebar .linked .button:checked:last-child, -.titlebar .linked .button:focus:hover:active:last-child, -.titlebar .linked .button:checked:hover:last-child, -.titlebar .linked .button:checked:focus:hover:active:last-child, -.titlebar .button.raised.linked:hover:last-child, -.titlebar .button.raised.linked:checked:last-child, -.titlebar .button.raised.linked:focus:hover:active:last-child, -.titlebar .button.raised.linked:checked:hover:last-child, -.titlebar .button.raised.linked:checked:focus:hover:active:last-child, -.titlebar .raised.linked .button:hover:last-child, -.titlebar .raised.linked .button:checked:last-child, -.titlebar .raised.linked .button:focus:hover:active:last-child, -.titlebar .raised.linked .button:checked:hover:last-child, -.titlebar .raised.linked .button:checked:focus:hover:active:last-child { - background-image: -gtk-gradient (linear, - left top, left bottom, - from (shade(@menu_bg_dark_color, 2.03)), - to (shade(@menu_bg_dark_color, 1.17))); - padding: 5px 5px 6px 5px; - box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), - inset 1px 0px shade(@selected_bg_color, 0.97), - inset -1px 0px shade(@selected_bg_color, 0.93), - inset 0px -1px shade(@selected_bg_color, 0.93); - color: @theme_fg_dark_color; - border-width: 1px; - border-left-width: 0px; - border-radius: 5px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; - padding: 5px 5px 6px 5px; -} - -/* Linked single titlebar-button */ -.titlebar .linked .button:only-child, -.titlebar .linked .button:focus:only-child, -.titlebar .linked .button:insensitive:only-child, -.titlebar .button.raised.linked:only-child, -.titlebar .button.raised.linked:focus:only-child, -.titlebar .button.raised.linked:insensitive:only-child, -.titlebar .raised.linked .button:only-child, -.titlebar .raised.linked .button:focus:only-child, -.titlebar .raised.linked .button:insensitive:only-child { - background-image: -gtk-gradient (linear, - left top, left bottom, - from (shade(@button_raised_gradient_color_b, 0.90)), - to (shade(@button_raised_gradient_color_a, 0.80))); - color: @theme_fg_dark_color; - border-width: 1px; - border-radius: 5px; - padding: 5px 5px 6px 5px; -} - -.titlebar .linked .button:hover:only-child, -.titlebar .linked .button:checked:only-child, -.titlebar .linked .button:focus:hover:active:only-child, -.titlebar .linked .button:checked:hover:only-child, -.titlebar .linked .button:checked:focus:hover:active:only-child, -.titlebar .button.raised.linked:hover:only-child, -.titlebar .button.raised.linked:checked:only-child, -.titlebar .button.raised.linked:focus:hover:active:only-child, -.titlebar .button.raised.linked:checked:hover:only-child, -.titlebar .button.raised.linked:checked:focus:hover:active:only-child, -.titlebar .raised.linked .button:hover:only-child, -.titlebar .raised.linked .button:checked:only-child, -.titlebar .raised.linked .button:focus:hover:active:only-child, -.titlebar .raised.linked .button:checked:hover:only-child, -.titlebar .raised.linked .button:checked:focus:hover:active:only-child { - background-image: -gtk-gradient (linear, - left top, left bottom, - from (shade(@menu_bg_dark_color, 2.03)), - to (shade(@menu_bg_dark_color, 1.17))); - padding: 5px 5px 6px 5px; - box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), - inset 1px 0px shade(@selected_bg_color, 0.97), - inset -1px 0px shade(@selected_bg_color, 0.93), - inset 0px -1px shade(@selected_bg_color, 0.93); - color: @theme_fg_dark_color; - border-width: 1px; - border-radius: 5px; - padding: 5px 5px 6px 5px; -} - -/* workaround to avoid unwanted black frames if switching compositor on/off */ -.background .window-frame { - box-shadow: none; -} - -.background.csd .window-frame { - border-color: darker(@theme_bg_dark_color); - border-radius: 7px 7px 0 0; - border-width: 1px; - border-style: solid; - background-color: @theme_bg_color; - box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow; - /* this is used for the resize cursor area */ - margin: 10px; -} - -/* workaround to avoid unwanted black frames if switching compositor on/off */ -.window-frame:backdrop { - background-color: @theme_bg_dark_color; -/* box-shadow: 0 0 0 1px shade(@wm_border,1.1), 0 2px 5px 1px @wm_shadow;*/ - box-shadow: none; -} - -.window-frame.tiled { - border-radius: 0; - background-color: @theme_bg_color; -} - -.window-frame.ssd { - box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); -} - -.window-frame.solid-csd { - border-radius: 0; - margin: 1px; - background-color: @wm_bg_a; - border: solid 1px @wm_csd_solid_border_color; - box-shadow: none; -} - -.window-frame.csd.popup { - border-radius: 0; - box-shadow: none; -} - -.window-frame.csd.tooltip { - border-radius: 3px; - box-shadow: 0 1px 5px shade (@theme_selected_bg_color, 1.3); - padding: 4px 4px; -} - -.window-frame.csd.message-dialog { - border-radius: 7px; - box-shadow: 0 1px 5px shade (@theme_selected_bg_color, 1.3); -} /********************* * Spinner Animation * *********************/ -/* This is could be CPU-intensive */ - -@keyframes spin { - to { -gtk-icon-transform: rotate(1turn); } -} - -.spinner { - background-image: none; - background-color: blue; - opacity: 0; - -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); -} - -.spinner:active { - opacity: 1; - animation: spin 1s linear infinite; -} -.spinner:active:insensitive { - opacity: 0.5; -} +/*taken straight from Adwaita, it works */ -.button .spinner:active { - color: @theme_fg_color; -} +@keyframes spin { + to { + -gtk-icon-transform: rotate(1turn); } } +spinner { + background: none; + opacity: 0; + /*remove icon, the default w/o it is more like gtk2 version was*/ + /*-gtk-icon-source: -gtk-icontheme("process-working-symbolic"); */} +spinner:checked { + opacity: 1; + animation: spin 1s linear infinite; } + spinner:checked:disabled { + opacity: 0.5; } /************************ * overshoot/undershoot * ************************/ /* displays at end of mouse scrolling */ -.overshoot.top { +overshoot.top { background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, @@ -5737,7 +5553,7 @@ GtkModelButton.button:selected, box-shadow: none; } -.overshoot.top:backdrop { +overshoot.top:backdrop { background-image: -gtk-gradient(radial, center top, 0, center top, 0.5, @@ -5751,7 +5567,7 @@ GtkModelButton.button:selected, box-shadow: none; } -.overshoot.bottom { +overshoot.bottom { background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, @@ -5770,7 +5586,7 @@ GtkModelButton.button:selected, box-shadow: none; } -.overshoot.bottom:backdrop { +overshoot.bottom:backdrop { background-image: -gtk-gradient(radial, center bottom, 0, center bottom, 0.5, @@ -5784,7 +5600,7 @@ GtkModelButton.button:selected, box-shadow: none; } -.overshoot.left { +overshoot.left { background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, @@ -5803,7 +5619,7 @@ GtkModelButton.button:selected, box-shadow: none; } -.overshoot.left:backdrop { +overshoot.left:backdrop { background-image: -gtk-gradient(radial, left center, 0, left center, 0.5, @@ -5817,7 +5633,7 @@ GtkModelButton.button:selected, box-shadow: none; } -.overshoot.right { +overshoot.right { background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, @@ -5836,7 +5652,7 @@ GtkModelButton.button:selected, box-shadow: none; } -.overshoot.right:backdrop { +overshoot.right:backdrop { background-image: -gtk-gradient(radial, right center, 0, right center, 0.5, @@ -5851,7 +5667,7 @@ GtkModelButton.button:selected, } /* result is disable undershoot */ -.undershoot.top { +undershoot.top { background-color: transparent; background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, @@ -5862,7 +5678,7 @@ GtkModelButton.button:selected, background-position: center top; } -.undershoot.bottom { +undershoot.bottom { background-color: transparent; background-image: linear-gradient(to left, rgba(255, 255, 255, 0.2) 50%, @@ -5873,7 +5689,7 @@ GtkModelButton.button:selected, background-position: center bottom; } -.undershoot.left { +undershoot.left { background-color: transparent; background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, @@ -5884,7 +5700,7 @@ GtkModelButton.button:selected, background-position: left center; } -.undershoot.right { +undershoot.right { background-color: transparent; background-image: linear-gradient(to top, rgba(255, 255, 255, 0.2) 50%, @@ -5899,17 +5715,17 @@ GtkModelButton.button:selected, * GtkStack * ************/ -GtkStack .horizontal .vertical .frame { +stack .horizontal .vertical .frame { background-color: shade (@theme_bg_color, 1.1); border-width: 1px; border-color: @notebook_border; } -GtkStackSidebar.sidebar .separator.horizontal { - -GtkWidget-separator-height: 0px; +stackSidebar.sidebar .separator.horizontal { + /* -GtkWidget-separator-height: 0px; */ } -GtkStack .linked.vertical .entry { +stack .linked.vertical .entry { border-radius: 5px; border-style: solid; border-width: 1px 1px 0px 1px; @@ -5924,18 +5740,18 @@ GtkStack .linked.vertical .entry { } -GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:last-child, -GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:hover:last-child, -GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:focus:last-child, -GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:focus:hover:last-child, -GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:checked:last-child, -GtkStack .vertical.linked > GtkComboBox > GtkToggleButton.button:insensitive:last-child, -GtkStack .linked.vertical GtkToggleButton.button, -GtkStack .linked.vertical GtkToggleButton.button:hover, -GtkStack .linked.vertical GtkToggleButton.button:focus, -GtkStack .linked.vertical GtkToggleButton.button:focus:hover, -GtkStack .linked.vertical GtkToggleButton.button:checked, -GtkStack .linked.vertical GtkToggleButton.button:insensitive { +stack .vertical.linked > combobox > togglebutton.button:last-child, +stack .vertical.linked > combobox > togglebutton.button:hover:last-child, +stack .vertical.linked > combobox > togglebutton.button:focus:last-child, +stack .vertical.linked > combobox > togglebutton.button:focus:hover:last-child, +stack .vertical.linked > combobox > togglebutton.button:checked:last-child, +stack .vertical.linked > combobox > togglebutton.button:disabled:last-child, +stack .linked.vertical togglebutton.button, +stack .linked.vertical togglebutton.button:hover, +stack .linked.vertical togglebutton.button:focus, +stack .linked.vertical togglebutton.button:focus:hover, +stack .linked.vertical togglebutton.button:checked, +stack .linked.vertical togglebutton.button:disabled { border-radius: 5px 5px 0 0; border-width: 1px; border-bottom-width: 1px; @@ -5943,12 +5759,12 @@ GtkStack .linked.vertical GtkToggleButton.button:insensitive { padding: 3px 5px; } -GtkStack .linked.vertical .button:last-child, -GtkStack .linked.vertical .button:hover:last-child, -GtkStack .linked.vertical .button:focus:last-child, -GtkStack .linked.vertical .button:focus:hover:last-child, -GtkStack .linked.vertical .button:checked:last-child, -GtkStack .linked.vertical .button:insensitive:last-child { +stack .linked.vertical .button:last-child, +stack .linked.vertical .button:hover:last-child, +stack .linked.vertical .button:focus:last-child, +stack .linked.vertical .button:focus:hover:last-child, +stack .linked.vertical .button:checked:last-child, +stack .linked.vertical .button:disabled:last-child { border-radius: 0 0 5px 5px; border-width: 1px; border-top-width: 0; @@ -5956,12 +5772,12 @@ GtkStack .linked.vertical .button:insensitive:last-child { padding: 5px 5px; } -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton:hover, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton:focus, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton:active, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton:checked, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton:insensitive { +stack .linked.vertical spinbutton.horizontal.entry.spinbutton, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton:hover, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton:focus, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton:active, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton:checked, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton:disabled { border-radius: 0px; border-width: 1px; border-style: solid; @@ -5969,26 +5785,26 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton:insensitive } /* all to zero */ -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:active, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:active:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:active, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:active:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:hover, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:hover:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:focus:hover:active, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:focus:hover:active:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:insensitive, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:first-child:insensitive { +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:hover, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:hover:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:hover:active, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:hover:active:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:hover, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:hover:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:hover:active, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:hover:active:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:checked, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:checked:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:checked:hover, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:checked:hover:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:checked:focus:hover:active, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:checked:focus:hover:active:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:disabled, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:first-child:disabled { border-radius: 0px; border-width: 0px; border-style: none; @@ -5999,28 +5815,28 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:firs box-shadow: none; } -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked { +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:hover, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:hover, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:checked { border-width: 0 1px 0 1px; border-style: solid; border-color: shade(@notebook_border, 1.0); } -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:last-child { +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:hover:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:hover:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:checked:last-child { border-width: 0px; } -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:last-child { +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:hover, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:hover, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:hover:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:hover:last-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_gradient1, 1.03)), @@ -6029,8 +5845,8 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focu to (shade(@button_gradient4, 1.01))); } -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active:last-child { +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:active, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:active:last-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), @@ -6039,17 +5855,17 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:acti to (shade (@theme_bg_color, 0.80))); } -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover { +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:active, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:hover, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:hover { border-width: 1px; border-style: solid; border-color: shade(@button_border_active, 1.0); } -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:hover:last-child, -GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focus:hover:last-child { +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:active:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:hover:last-child, +stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:hover:last-child { border-width: 1px; border-style: solid; border-width: 1px 1px 1px 0; @@ -6059,36 +5875,36 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:focu * print dialog * ****************/ -GtkPrintUnixDialog.background .vertical.view.dialog-vbox { +printdialog.background .vertical.view.dialog-vbox { background-color: shade (@theme_bg_color, 1.0); } -GtkPrintUnixDialog.background .notebook { +printdialog.background notebook { border-width: 0px 1px 1px 1px; border-radius: 0px 0px 4px 4px; } -GtkPrintUnixDialog.background .notebook.header { +printdialog.background notebook.header { border-radius: 0px; } -GtkPrintUnixDialog.background .notebook tab GtkLabel { +printdialog.background notebook tab label { color: mix (@theme_fg_color, @theme_bg_color, 0.40); font-weight: normal; } -GtkPrintUnixDialog.background .notebook .prelight-page, -GtkPrintUnixDialog.background .notebook .prelight-page GtkLabel { +printdialog.background notebook .prelight-page, +printdialog.background notebook .prelight-page label { color: mix (@theme_fg_color, @theme_bg_color, 0.15); } -GtkPrintUnixDialog.background .notebook .active-page, -.notebook tab .active-page GtkLabel { +printdialog.background notebook .active-page, +notebook tab .active-page label { color: @theme_fg_color; } -GtkPrintUnixDialog.background .notebook tab.top:active, -GtkPrintUnixDialog.background .notebook tab.top:hover:active { +printdialog.background notebook tab.top:active, +printdialog.background notebook tab.top:hover:active { background-image: linear-gradient(to bottom, shade(@theme_bg_color, 1.18), shade(@theme_bg_color, 1.1)); @@ -6099,7 +5915,7 @@ GtkPrintUnixDialog.background .notebook tab.top:hover:active { box-shadow: none; } -GtkPrintUnixDialog.background .notebook tab.top:hover { +printdialog.background notebook header.top tab:hover { background-image: linear-gradient(to bottom, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); @@ -6110,15 +5926,15 @@ GtkPrintUnixDialog.background .notebook tab.top:hover { box-shadow: none; } -GtkPrintUnixDialog.background .notebook tab.top:active { +printdialog.background notebook header.top tab:active { border-bottom-color: @notebook_active_tab_border; } -GtkPrintUnixDialog.background .notebook .text-button { +printdialog.background notebook .text-button { background-color: transparent; } -GtkPrintUnixDialog.background .vertical.view.dialog-vbox .notebook GtkToggleButton.button { +printdialog.background .vertical.view.dialog-vbox notebook togglebutton.button { padding: 4px; border-radius: 4px; } @@ -6127,37 +5943,37 @@ GtkPrintUnixDialog.background .vertical.view.dialog-vbox .notebook GtkToggleButt * GtkFileChooser * ******************/ -GtkFileChooserWidget.vertical GtkPaned.horizontal { +filechooser.vertical paned.horizontal { -GtkPaned-handle-size: 3px; border-color: transparent; } /* workaround for broken first/last-child logic with linked buttons in pathbar with gtk+-3.18 */ -.path-bar.linked .button:dir(ltr), -.path-bar.linked .button:dir(ltr):hover, -.path-bar.linked .button:dir(ltr):hover:active, -.path-bar.linked .button:dir(ltr):checked, -.path-bar.linked .button:dir(ltr):checked:hover, -.path-bar.linked .button:dir(ltr):checked:hover:active, -.path-bar.linked .button:dir(ltr):first-child, -.path-bar.linked .button:dir(ltr):hover:first-child, -.path-bar.linked .button:dir(ltr):hover:active:first-child, -.path-bar.linked .button:dir(ltr):checked:first-child, -.path-bar.linked .button:dir(ltr):checked:hover:first-child, -.path-bar.linked .button:dir(ltr):checked:hover:active:first-child, -.path-bar.linked .button:dir(ltr):last-child, -.path-bar.linked .button:dir(ltr):hover:last-child, -.path-bar.linked .button:dir(ltr):hover:active:last-child, -.path-bar.linked .button:dir(ltr):checked:last-child, -.path-bar.linked .button:dir(ltr):checked:hover:last-child, -.path-bar.linked .button:dir(ltr):checked:hover:active:last-child { +.path-bar.linked button:dir(ltr), +.path-bar.linked button:dir(ltr):hover, +.path-bar.linked button:dir(ltr):hover:active, +.path-bar.linked button:dir(ltr):checked, +.path-bar.linked button:dir(ltr):checked:hover, +.path-bar.linked button:dir(ltr):checked:hover:active, +.path-bar.linked button:dir(ltr):first-child, +.path-bar.linked button:dir(ltr):hover:first-child, +.path-bar.linked button:dir(ltr):hover:active:first-child, +.path-bar.linked button:dir(ltr):checked:first-child, +.path-bar.linked button:dir(ltr):checked:hover:first-child, +.path-bar.linked button:dir(ltr):checked:hover:active:first-child, +.path-bar.linked button:dir(ltr):last-child, +.path-bar.linked button:dir(ltr):hover:last-child, +.path-bar.linked button:dir(ltr):hover:active:last-child, +.path-bar.linked button:dir(ltr):checked:last-child, +.path-bar.linked button:dir(ltr):checked:hover:last-child, +.path-bar.linked button:dir(ltr):checked:hover:active:last-child { border-width: 1px 0 1px 0px; border-radius: 3px; padding: 0px 4px; } -.path-bar.linked .button { +.path-bar.linked button { box-shadow: inset 0px 2px alpha(#fff, 0.11), inset 2px 0px alpha(#fff, 0.09), inset -2px 0px alpha(#fff, 0.09), @@ -6168,9 +5984,9 @@ GtkFileChooserWidget.vertical GtkPaned.horizontal { inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); } -.path-bar.linked .button:hover, -.path-bar.linked .button:checked, -.path-bar.linked .button:checked:active { +.path-bar.linked button:hover, +.path-bar.linked button:checked, +.path-bar.linked button:checked:active { box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93), @@ -6227,4 +6043,3 @@ GtkFileChooserWidget.vertical GtkPaned.horizontal { .floating-bar.bottom.left { box-shadow: inset -1px 1px alpha(#fff, 0.07); } - -- cgit v1.2.1