From 3e3ff9745450801886d0fe06b1f3199cb3bfb809 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Wed, 2 Mar 2016 12:18:20 +0100 Subject: GTK+-3.20 Green-Submarine gtk-widget.css: sync with Blue-Submarine --- .../Green-Submarine/gtk-3.0/gtk-widgets.css | 4651 +++++++++++--------- 1 file changed, 2569 insertions(+), 2082 deletions(-) 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 1c4bdcf4..a637a5d2 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css @@ -7,27 +7,10 @@ * { padding: 0; background-clip: padding-box; - /*-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;*/ - -GtkButtonBox-child-min-height: 26; - /*-GtkCheckButton-indicator-size: 16; - -GtkCheckMenuItem-indicator-size: 12;*/ - -GtkComboBox-arrow-scaling: 0.75; -GtkDialog-button-spacing: 4; /* ie. logout dialog */ -GtkDialog-action-area-border: 10; /* ie. logout dialog */ - -GtkExpander-expander-size: 14; -GtkHTML-link-color: @link_color; -GtkIMHtml-hyperlink-color: @link_color; - /* -GtkMenu-horizontal-padding: 0; - -GtkMenu-vertical-padding: 0; */ - -GtkMenuBar-internal-padding: 0; - -GtkPaned-handle-size: 1; - -GtkProgressBar-min-horizontal-bar-height: 16; - -GtkProgressBar-min-vertical-bar-width: 16; -GtkRange-trough-border: 1; -GtkRange-slider-width: 11; -GtkRange-stepper-size: 13; @@ -39,25 +22,14 @@ -GtkScrollbar-slider-width: 11; -GtkScrollbar-min-slider-length: 31; -GtkScrolledWindow-scrollbar-spacing: 0; - -GtkScrolledWindow-scrollbars-within-bevel: 1; - -GtkSeparatorMenuItem-horizontal-padding: 0; - -GtkStatusbar-shadow-type: none; -GtkTextView-error-underline-color: @error_color; -GtkToolButton-icon-spacing: 4; -GtkToolItemGroup-expander-size: 6; - -GtkToolbar-internal-padding: 0; -GtkTreeView-expander-size: 12; /* arrow size in list/tree views */ -GtkTreeView-horizontal-separator: 4; -GtkTreeView-vertical-separator: 4; - -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;*/ -WnckTasklist-fade-overlay-rect: 0; /* Highlight drag-drop destination */ - /*engine: none; This is now IGNORED */ outline-color: alpha(@theme_selected_bg_color, 0.3); outline-style: dashed; outline-offset: -3px; /* 2px */ @@ -69,7 +41,6 @@ /*************** * Base States * ***************/ - window { color: @theme_fg_color; } @@ -172,16 +143,21 @@ tooltip.background { box-shadow: 0 1px 5px shade (@theme_selected_bg_color, 1.3); } +tooltip decoration { + background-color: transparent; +} + tooltip * { background-color: transparent; padding: 4px 4px; } -grip { +.grip { background-color: transparent; background-image: url("assets/resize-grip.svg"); } +/* ie. selection mouse retancle in caja */ view.rubberband, rubberband, .view.rubberband, @@ -201,22 +177,26 @@ separator { border-width: 1px; border-style: solid; border-image: none; - border-color: mix(@theme_fg_color, @theme_bg_color, 0.95); + border-color: mix(@theme_fg_color, @theme_bg_color, 0.95); border-bottom-color: alpha (shade (@theme_bg_color, 1.26), 0.15); border-right-color: alpha (shade (@theme_bg_color, 1.26), 0.15); } -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; } +treeview.view.separator, +treeview.separator, +treeview.view.separator:hover, +treeview.separator:hover { + border-style: solid; + border-width: 0px 0px 1px 0px; + border-color: @notebook_border; +} + separator.horizontal { border-width: 1px 0 1px 0; } @@ -225,43 +205,27 @@ separator.vertical { border-width: 0 1px 0 1px; } -combobox .separator { - -GtkWidget-horizontal-separator: 0; - -GtkWidget-vertical-separator: 0; -} - button separator, button.separator { border-color: alpha (#000, 0.00); } -button .separator:disabled, +button separator:disabled, button.separator:disabled { border-color: alpha (#000, 0.00); } -.pane-separator { - color: shade (@sidebar_background, 0.95); -} - -.pane-separator:hover, -.pane-separator:selected { - color: shade (@sidebar_background, 0.95); -} - statusbar { padding: 0px; + margin: -2px 0 -2px 0; color: @theme_fg_color; - -statusbar-shadow-type: none; font-size: smaller; } -statusbar .frame { - padding: 0px; - border-width: 0; +statusbar frame { + border-style: none; } -dnd, .dnd { border-width: 1px; border-style: solid; @@ -269,18 +233,49 @@ dnd, border-radius: 0px; } +/********* + * Paned * + *********/ + +/* the small line between sidebar and view */ +paned > separator { + min-width: 3px; + min-height: 3px; + -gtk-icon-source: none; + border-style: none; + background-color: @theme_bg_color; + background-size: 1px 1px; + } + +paned > separator:hover, +paned > separator:selected { + background-color: @theme_bg_color; +} + +paned > separator:backdrop { +} + +paned > separator.wide { + margin: 0; + padding: 0; + min-width: 5px; + min-height: 5px; + background-size: 1px 1px, 1px 1px; +} + +paned > separator.wide:backdrop { +} + /**************** * Text Entries * ****************/ entry, -combobox-entry entry { +entry.combo { /* Look out ! This is the background color of mate-control-center 'too' */ - background-color: @theme_base_color; - padding: 5px 4px; - -GtkEntry-inner-border: 0; - -GtkEntry-progress-border: 0; + background-color: shade (@bg_color, 1.1); + padding: 6px 4px; color: @entry_text_color; background-image: -gtk-gradient(linear, left top, left bottom, @@ -292,10 +287,10 @@ This is the background color of mate-control-center 'too' */ border-width: 2px; border-style: solid; border-radius: 5px; - border-top-color: transparent; - border-right-color: alpha(#fff, 0.02); - border-left-color: alpha(#fff, 0.02); - border-bottom-color: alpha(#fff, 0.03); + border-top-color: transparent; + border-right-color: alpha(#fff, 0.02); + border-left-color: alpha(#fff, 0.02); + border-bottom-color: alpha(#fff, 0.03); /* border */ box-shadow: inset 0px 3px alpha(#000, 0.03), inset 0px 2px alpha(#000, 0.05), @@ -315,7 +310,8 @@ entry:focus { inset 0px -1px shade(@selected_bg_color, 0.93); } -entry:disabled { +entry:disabled, +entry.combo:disabled { color: @insensitive_fg_color; background-image: none; background-color: @insensitive_bg_color; @@ -335,41 +331,65 @@ entry selection:focus { color: @theme_selected_fg_color; } -entry.progressbar { +entry progressbar { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; border-width: 1px; border-radius: 3px; } -/******************* - * Symbolic images * - *******************/ +/**************** + * Progress bar * + ****************/ -image { - color: @internal_element_color; +progressbar { + border-radius: 3px; + padding: 0; + font-size: smaller; } -image:hover { - color: @internal_element_hover; +progressbar.horizontal { + min-height: 16px; } -/**************** - * Progress bar * - ****************/ +progressbar.vertical { + min-width: 16px; +} /* progress component */ -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; +progressbar.horizontal trough, +progressbar.horizontal progress { + min-height: 16px; + border-radius: 3px; +} + +progressbar.vertical trough, +progressbar.vertical progress { + min-width: 16px; border-radius: 3px; - min-height: 16px; +} + +progressbar progress.left { + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; +} + +progressbar progress.right { + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; +} + +progressbar progress.top { + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} + +progressbar progress.bottom { + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} + +progressbar.horizontal progress { background-image: linear-gradient(to right, alpha (#000, 0.00), alpha (#000, 0.00) 48%, @@ -391,20 +411,16 @@ progressbar row:selected:focus { inset 1px 0px alpha(black, 0.03), inset -1px 0px alpha(black, 0.03), inset 0px -1px alpha(white, 0.10); - 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); + 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); border-bottom-color: shade(@button_border_active, 1.00); -/* Label font color of progressbar*/ - color: @theme_fg_color; - text-shadow: none; } 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%, @@ -426,37 +442,16 @@ progressbar.vertical progress { inset 1px 0px alpha(black, 0.03), inset -1px 0px alpha(white, 0.10), inset 0px -1px alpha(black, 0.03); - 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); + 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); border-bottom-color: shade(@button_border_active, 0.85); -/* Label font color of progressbar*/ - color: @theme_fg_color; - text-shadow: none; -} - -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 */ progressbar trough { - padding: 0px; - text-shadow: none; - border-radius: 2px; - padding: 0 0 1px 0; -} - -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)), @@ -472,7 +467,6 @@ trough row:hover { } progressbar.vertical trough { - min-width: 16px; background-image: -gtk-gradient (linear, left top, right top, from (alpha (#000, 0.18)), @@ -483,31 +477,30 @@ progressbar.vertical trough { text-shadow: none; } -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)), - to (mix (@trough_bg_color_b, @theme_selected_bg_color, 0.25))); -} - /* level bars as used for password quality or remaining power */ levelbar { - -levelbar-min-block-width: 34; - -levelbar-min-block-height: 3; + min-width: 34px; + min-height: 3px; } levelbar.vertical { - -levelbar-min-block-width: 3; - -levelbar-min-block-height: 34; + min-width: 3px; + min-height: 34px; } -level-bar trough { - padding: 2px; +levelbar trough { + padding: 2px; + border-radius: 2px; + background-image: linear-gradient(to bottom, + @trough_bg_color_a, + @trough_bg_color_b); + background-color: transparent; + box-shadow: inset 1px 1px alpha(#000, 0.15), + inset -1px -1px alpha(#000, 0.15); } -level-bar.fill-block { - border-width: 1px; +levelbar block.filled { + border-width: 2px; border-style: solid; border-color: @button_border_active; background-image: -gtk-gradient (linear, @@ -518,41 +511,44 @@ level-bar.fill-block { to (shade (@button_bg_active, 1.20))); } -level-bar.indicator-continuous.fill-block { - padding: 2px; +levelbar.continuous block.filled { + padding: 1px; border-radius: 2px; } -level-bar.indicator-discrete.fill-block.horizontal { +levelbar.discrete.horizontal block.filled { margin: 0 1px; } -level-bar.indicator-discrete.fill-block.vertical { +levelbar.discrete.vertical block.filled { margin: 1px 0; } -/* discrete indicator border rounding, - 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 { +levelbar block.low { + border-color: shade(@warning_color, 0.80); + background-image: linear-gradient(to bottom, + shade(@warning_color, 1.3), + @warning_color 75%, + shade(@warning_color, 0.90)); +} + +levelbar block.high { border-color: shade(@success_color, 0.85); background-image: linear-gradient(to bottom, shade(@success_color, 1.2), @@ -560,23 +556,24 @@ level-bar.fill-block.level-high { shade(@success_color, 0.95)); } -level-bar.fill-block.level-low { - border-color: shade(@warning_bg_color, 0.80); +levelbar block.full { + border-color: shade(@success_color, 0.95); background-image: linear-gradient(to bottom, - shade(@warning_bg_color, 1.3), - @warning_bg_color 75%, - shade(@warning_bg_color, 0.90)); + shade(@success_color, 1.2), + @success_color 75%, + shade(@success_color, 0.95)); } -level-bar.fill-block.empty-fill-block { +levelbar block.empty { + border: 1px solid #2a76c6; + border-radius: 1px; background-color: transparent; - background-image: none; - border-color: alpha(@theme_fg_color, 0.1); + border-color: rgba(46, 52, 54, 0.2); + box-shadow: none; } -level-bar.fill-block.empty-fill-block:backdrop { - border-color: transparent; - background-color: transparent; +levelbar block.empty:backdrop { + border-color: rgba(139, 142, 143, 0.15); } /************ @@ -598,19 +595,25 @@ scale slider:disabled { color: alpha(@theme_base_color, 0.0); background-color: alpha(@theme_base_color, 0.0); /* background-image in -assets variant */ + background-repeat: no-repeat; + background-position: center; +} + +scale.horizontal.fine-tune slider:active, +scale.horizontal.fine-tune slider:hover:active { + background-size: 80%; + background-repeat: no-repeat; 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 { +/* Why different values ? */ +scale.vertical.fine-tune slider:active, +scale.vertical.fine-tune slider:hover:active { background-size: 98%; background-repeat: no-repeat; background-position: center; } -toolbar scale trough, scale trough { border-radius: 8px; border-style: solid; @@ -638,21 +641,6 @@ scale.vertical trough { border-color: @scale_border_b; } -scale trough.highlight, -scale.vertical trough.highlight { - border-style: none; -} - -scale trough, -scale.vertical trough { - border-color: @scale_border_b; -} - -scale trough.highlight, -scale.vertical trough.highlight { - border-color: @scale_highlight_border; -} - scale trough:disabled { background-image: -gtk-gradient (linear, left top, @@ -660,26 +648,34 @@ scale trough:disabled { from (alpha (#000, 0.03)), to (alpha (#000, 0.03))); border-style: none; + box-shadow: inset 1px 1px alpha(#000, 0.15), + inset -1px -1px alpha(#000, 0.15); } - scale.progressbar { - background-color: @scale_progress_fill; - border-width: 1px; - border-radius: 3px; - border-style: none; +scale trough highlight, +scale.vertical trough highlight, +scale.horizontal trough highlight { + border-style: solid; + border-color: @scale_highlight_border; + border-radius: 8px; + background-color: @scale_highlight_bg; +} + +scale trough highlight:disabled, +scale.vertical trough highlight:disabled { + background-color: transparent; } scale:disabled, -.vertical scale:disabled { +scale.vertical:disabled { background-color: transparent; } -scale .mark { +scale marks { color: mix(@theme_bg_color, @theme_text_color, 0.56); } -menubar menuitem scale.highlight.left, -scale.highlight.left { +scale highlight.left { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@scale_fill, 0.90)), @@ -689,12 +685,11 @@ scale.highlight.left { border-radius: 8px; box-shadow: inset 1px 1px alpha(#000, 0.08), inset -1px -1px alpha(#000, 0.08); - color: @theme_selected_fg_color; + color: @theme_selected_fg_color; text-shadow: none; } -menubar menuitem scale.highlight.bottom, -scale.highlight.bottom { +scale highlight.bottom { background-image: -gtk-gradient (linear, left top, right top, from (shade (@scale_fill, 0.90)), @@ -704,11 +699,11 @@ scale.highlight.bottom { border-radius: 8px; box-shadow: inset 1px 1px alpha(#000, 0.08), inset -1px -1px alpha(#000, 0.08); - color: @theme_selected_fg_color; + color: @theme_selected_fg_color; text-shadow: none; } -scale.highlight.left:disabled { +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))); @@ -716,7 +711,7 @@ scale.highlight.left:disabled { inset -1px -1px alpha(#000, 0.02); } -scale.highlight.bottom:disabled { +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))); @@ -727,27 +722,26 @@ scale.highlight.bottom:disabled { /********** * Frames * **********/ -.frame, + frame { padding: 2px; border-width: 1px; border-radius: 4px; border-style: solid; border-color: shade (@theme_bg_color, 0.85); - border-top-color: shade(@notebook_border, 1.25); - border-left-color: shade(@notebook_border, 1.25); - border-right-color: shade(@notebook_border, 1.25); + border-top-color: shade(@notebook_border, 1.25); + border-left-color: shade(@notebook_border, 1.25); + border-right-color: shade(@notebook_border, 1.25); border-bottom-color: shade(@notebook_border, 1.25); color: mix(@theme_selected_bg_color, @theme_fg_color, 0.70); } -/* only render frames in a scrolledwindow */ -scrolledwindow.frame, -scrolledwindow>frame { - border-width: 1px; +/* only render frames in a GtkScrolledWindow */ +scrolledwindow.frame { + border-width: 1px; border-radius: 0; - border-style: solid; - border-color: shade (@theme_bg_color, 0.85); + border-style: solid; + border-color: shade (@theme_bg_color, 0.85); padding: 0px; } @@ -760,15 +754,18 @@ button menuitem menubar { } button { - padding: 4px; + padding: 6px; + min-height: 20px; + min-width: 20px; +} + +/* needed with new button padding */ +button label { + padding: 2px 0px; } button { transition: all 400ms ease-out; - /*-GtkButton-image-spacing: 4; - -GtkButton-interior-focus: true; - -GtkButton-default-border: 0; - -GtkButton-inner-border: 3;*/ -GtkArrow-arrow-scaling: 0.5; background-image: -gtk-gradient (linear, left top, left bottom, @@ -780,26 +777,21 @@ button { border-radius: 6px; border-style: solid; /* outer */ - border-top-color: transparent; - border-left-color: alpha (#000, 0.01); - border-right-color: alpha (#000, 0.01); + border-top-color: transparent; + border-left-color: alpha (#000, 0.01); + border-right-color: alpha (#000, 0.01); border-bottom-color: alpha (#000, 0.03); - box-shadow: inset 0px 2px alpha(#fff, 0.11), - inset 2px 0px alpha(#fff, 0.09), - inset -2px 0px alpha(#fff, 0.09), - inset 0px -2px alpha(#fff, 0.07), - inset 0px 1px alpha(shade(@button_border, 1.00), 0.70), + 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), inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); /* box-shadow Syntax */ /* box-shadow: [ inset ] horizontal_offset vertical_offset [ blur_radius ] [ spread ] color */ - color: @theme_fg_color; + color: @theme_fg_color; text-shadow: 0px 1px @theme_shadow_color; } button.default { - transition: all 400ms ease-out; text-shadow: none; color: @theme_fg_color; } @@ -807,7 +799,8 @@ button.default { /* ie. mate-control-center */ button.flat { transition: all 400ms ease-out; - padding: 0px; + border-radius: 6px; + padding: 4px; border-color: transparent; background-color: transparent; background-image: none; @@ -817,10 +810,16 @@ button.flat { border-image: none; } +/* ie. caja location drop down button */ +button.flat.toggle { + padding: 6px; +} + /* ie. controls gnome-mplayer, virtual-manager */ button.flat.image-button, +button.flat.image-button:focus, button.flat.image-button:hover, -volumebutton button.flat { +button.flat.scale { padding: 4px; } @@ -857,174 +856,175 @@ button:checked:hover:active { 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); - border-bottom-color: alpha(@focused_entry_outer, 0.95); + border-color: transparent; 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); } -button *:hover:active, -button *:checked, -button *:checked:hover, -button *:checked:hover:active { - color: @theme_selected_fg_color; +button:hover:active, +button:checked, +button:checked:hover, +button:checked:hover:active { text-shadow: 1px 1px @theme_selected_shadow_color; } button:disabled { background-image: none; background-color: @insensitive_bg_color; - color: @insensitive_fg_color; - border-color: transparent; - border-bottom-color: transparent; + border-color: alpha (#000, 0.00); + border-bottom-color: alpha (#000, 0.00); border-image: none; - /* Puts borders on Caja toobar buttons, disable */ - /* box-shadow: inset 0px 1px @insensitive_border_color, + 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 *:disabled { +button:disabled { color: @insensitive_fg_color; text-shadow: none; } -toolbar.vertical .image-button.flat button { +toolbar.vertical > button.image-button.flat { padding: 5px; } button.text-button, +button.text-button:focus, button.text-button:hover, -GtkFileChooserButton button { - padding: 5px 4px; +button.file { + padding: 6px; } -combobox GtkToggleButton button, -combobox GtkToggleButton button:hover { +combobox > button.combo, +combobox > button.combo:hover { padding: 4px; } -GtkFontButton button, -GtkColorButton button { +button.font, +button.color { padding: 6px 4px; } -path-bar button, -path-bar button image, -path-bar button label { - padding: 2px; +.path-bar > button, +.linked.path-bar > button, +.linked.path-bar > button:hover, +.linked.path-bar > button:hover:active, +.linked.path-bar > button:checked, +.linked.path-bar > button:checked:hover, +.linked.path-bar > button:checked:hover:active { + padding: 7px; } -path-bar button { +/* slider (left/right arrow) button */ +.linked.path-bar > button.image-button { border-width: 1px 0px 1px 1px; + box-shadow: none; } -path-bar button:hover:checked { - border-left-width: 1px; +.linked.path-bar > button.image-button:first-child { + border-width: 1px 0px 1px 1px; + box-shadow: inset 0px 1px 0 0 alpha(shade(@button_border, 1.00), 0.70), + inset 1px 0px 0 0 alpha(shade(@button_border, 0.94), 0.80), + inset -1px 0px 0 0 alpha(shade(@button_border, 0.94), 0.80), + inset 0px -1px 0 0 alpha(shade(@button_border, 0.88), 0.90); } -/* 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 { - border-radius: 0px; - border-width: 1px 0px 1px 0px; +.linked.path-bar > button.image-button:first-child: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); } -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; +.linked.path-bar > button.image-button:last-child { + border-width: 1px 1px 1px 0px; + box-shadow: inset 0px 1px 0 0 alpha(shade(@button_border, 1.00), 0.70), + inset -1px 0px 0 0 alpha(shade(@button_border, 0.94), 0.80), + inset 0px -1px 0 0 alpha(shade(@button_border, 0.88), 0.90); } -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; +.linked.path-bar > button.image-button:last-child:hover { border-width: 1px 1px 1px 0px; + box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), + inset -1px 0px shade(@selected_bg_color, 0.93), + inset 0px -1px shade(@selected_bg_color, 0.93); } -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; +.linked.path-bar > button.toggle, +.linked.path-bar > button.toogle.button-image { + border-width: 1px 0px 1px 0px; + border-radius: 0px; + box-shadow: inset 0px 1px 0 0 alpha(shade(@button_border, 1.00), 0.70), + inset -1px 0px 0 0 alpha(shade(@button_border, 0.94), 0.80), + inset 0px -1px 0 0 alpha(shade(@button_border, 0.88), 0.90); +} + +.linked.path-bar > button.toggle:hover, +.linked.path-bar > button.toogle.button-image:hover, +.linked.path-bar > button.toggle:checked, +.linked.path-bar > button.toogle.button-image:checked { + border-width: 1px 0px 1px 0px; + border-radius: 0px; + box-shadow: inset 0px 1px shade(@selected_bg_color, 1.05), + inset -1px 0px shade(@selected_bg_color, 0.93), + inset 0px -1px shade(@selected_bg_color, 0.93); } /***************************/ /* 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: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 { +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, +toolbar.primary-toolbar .linked entry, +toolbar.primary-toolbar .linked entry:disabled, +toolbar.primary-toolbar .linked button, +toolbar.primary-toolbar .linked button:focus, +toolbar.primary-toolbar .linked button:hover, +toolbar.primary-toolbar .linked button:hover:active, +toolbar.primary-toolbar .linked button:checked, +toolbar.primary-toolbar .linked button:checked:focus, +toolbar.primary-toolbar .linked button:checked:hover, +toolbar.primary-toolbar .linked button:checked:hover:active, +toolbar.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, +toolbar.primary-toolbar .linked button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -1036,38 +1036,38 @@ primary-toolbar .linked button:hover { } /* 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, +toolbar.primary-toolbar .linked button:hover:active, +toolbar.primary-toolbar .linked button:checked, +toolbar.primary-toolbar .linked button:checked:focus, +toolbar.primary-toolbar .linked button:checked:hover, +toolbar.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), inset 0px -1px shade(@selected_bg_color, 0.93); } -/* Middle toolbar-button 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 { +/* Middle toolbar-button disabled */ +toolbar menubar .linked button:disabled, +toolbar button.raised.linked:disabled, +toolbar .raised.linked button:disabled, +toolbar.primary-toolbar .linked button:disabled, +toolbar.primary-toolbar .linked entry:disabled { /* remove outer */ border-color: alpha (#fff, 0.00); /* Remove right border */ @@ -1077,54 +1077,53 @@ primary-toolbar .linked entry:disabled { } /* 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: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 { +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, +toolbar.primary-toolbar .linked entry:first-child, +toolbar.primary-toolbar .linked button:first-child, +toolbar.primary-toolbar .linked button:focus:first-child, +toolbar.primary-toolbar .linked button:hover:first-child, +toolbar.primary-toolbar .linked button:hover:active:first-child, +toolbar.primary-toolbar .linked button:checked:first-child, +toolbar.primary-toolbar .linked button:checked:focus:first-child, +toolbar.primary-toolbar .linked button:checked:hover:first-child, +toolbar.primary-toolbar .linked button:checked:hover:active:first-child, +toolbar.primary-toolbar .linked button:disabled:first-child, +toolbar.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, +toolbar.primary-toolbar .linked button:hover:first-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -1136,38 +1135,38 @@ primary-toolbar .linked button:hover:first-child { } /* 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 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 .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.primary-toolbar .linked button:hover:active:first-child, +toolbar.primary-toolbar .linked button:checked:first-child, +toolbar.primary-toolbar .linked button:checked:focus:first-child, +toolbar.primary-toolbar .linked button:checked:hover:first-child, +toolbar.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), inset 0px -1px shade(@selected_bg_color, 0.93); } -/* Leftmost toolbars-button insensitive */ -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 { +/* Leftmost toolbars-button disabled */ +toolbar menubar .linked button:disabled:first-child, +toolbar button.raised.linked:disabled:first-child, +toolbar .raised.linked button:disabled:first-child, +toolbar.primary-toolbar .linked button:disabled:first-child, +toolbar.primary-toolbar .linked entry:disabled:first-child { /* remove outer */ border-color: alpha (#fff, 0.00); /* Remove right border */ @@ -1177,53 +1176,53 @@ primary-toolbar .linked entry:disabled:first-child { } /* 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: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 { +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, +toolbar.primary-toolbar .linked entry:last-child, +toolbar.primary-toolbar .linked button:last-child, +toolbar.primary-toolbar .linked button:focus:last-child, +toolbar.primary-toolbar .linked button:hover:last-child, +toolbar.primary-toolbar .linked button:hover:active:last-child, +toolbar.primary-toolbar .linked button:checked:last-child, +toolbar.primary-toolbar .linked button:checked:focus:last-child, +toolbar.primary-toolbar .linked button:checked:hover:last-child, +toolbar.primary-toolbar .linked button:checked:hover:active:last-child, +toolbar.primary-toolbar .linked button:disabled:last-child, +toolbar.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, +toolbar.primary-toolbar .linked button:hover:last-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -1235,38 +1234,38 @@ primary-toolbar .linked button:hover:last-child { } /* 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, +toolbar.primary-toolbar .linked button:hover:active:last-child, +toolbar.primary-toolbar .linked button:checked:last-child, +toolbar.primary-toolbar .linked button:checked:focus:last-child, +toolbar.primary-toolbar .linked button:checked:hover:last-child, +toolbar.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), inset 0px -1px shade(@selected_bg_color, 0.93); } -/* Rightmost toolbar-button insensitive */ -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 { +/* Rightmost toolbar-button disabled */ +toolbar menubar .linked button:disabled:last-child, +toolbar button.raised.linked:disabled:last-child, +toolbar .raised.linked button:disabled:last-child, +toolbar.primary-toolbar .linked button:disabled:last-child, +toolbar.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), @@ -1275,50 +1274,49 @@ primary-toolbar .linked entry:disabled:last-child { } /* 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: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 { +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, +toolbar.primary-toolbar .linked entry:only-child, +toolbar.primary-toolbar .linked button:only-child, +toolbar.primary-toolbar .linked button:hover:only-child, +toolbar.primary-toolbar .linked button:hover:active:only-child, +toolbar.primary-toolbar .linked button:checked:only-child, +toolbar.primary-toolbar .linked button:checked:focus:only-child, +toolbar.primary-toolbar .linked button:checked:hover:only-child, +toolbar.primary-toolbar .linked button:checked:hover:active:only-child, +toolbar.primary-toolbar .linked entry:disabled:only-child, +toolbar.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, +toolbar.primary-toolbar .linked button:hover:only-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -1330,38 +1328,38 @@ primary-toolbar .linked button:hover:only-child { } /* 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, +toolbar.primary-toolbar .linked button:hover:active:only-child, +toolbar.primary-toolbar .linked button:checked:only-child, +toolbar.primary-toolbar .linked button:checked:focus:only-child, +toolbar.primary-toolbar .linked button:checked:hover:only-child, +toolbar.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), inset 0px -1px shade(@selected_bg_color, 0.93); } -/* Linked single toolbar-button insensitive */ -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 { +/* Linked single toolbar-button disabled */ +toolbar menubar .linked button:disabled:only-child, +toolbar button.raised.linked:disabled:only-child, +toolbar .raised.linked button:disabled:only-child, +toolbar.primary-toolbar .linked entry:disabled:only-child, +toolbar.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), @@ -1370,102 +1368,96 @@ primary-toolbar .linked button:disabled:only-child { } /* nth-child for linked areas */ -/*toolbar .raised.linked button, */ +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, -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: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(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: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 > 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; +.linked entry, +.linked > combobox > button.combo, +.linked > combobox > button.combo:focus +.linked > combobox > button.combo:checked, +.linked > combobox > button.combo:hover, +.linked > combobox > button.combo:focus:hover, +.linked > combobox > button.combo: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 { + background-color: transparent; + border-width: 1px; border-radius: 6px; + color: @theme_fg_color; + text-shadow: none; + box-shadow: none; } -.linked entry { - padding: 5px 4px; -} - -.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 entry { + padding: 7px 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:disabled { +.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 > combobox > button:disabled, -.linked button:disabled { +.linked > combobox > button.combo:disabled, +.linked 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; } -.linked > combobox > button, -.linked > combobox > button:focus, -.linked button, -.linked button:focus { +.linked > combobox > button.combo, +.linked > combobox > button.combo:focus, +.linked button, +.linked button:focus { background-image: -gtk-gradient (linear, left top, left bottom, from (@button_gradient1), @@ -1475,11 +1467,11 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { } -.linked > combobox > button:hover, -.linked > combobox > button:focus:hover, -.linked button:hover, -.linked button:focus:hover, -.linked button:checked:hover { +.linked > combobox > button.combo:hover, +.linked > combobox > button.combo: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)), @@ -1488,10 +1480,10 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { to (shade(@button_gradient4, 1.01))); } -.linked > combobox > button:checked, -.linked > combobox > button:checked:hover:active, -.linked button:checked, -.linked button:checked:hover:active { +.linked > combobox > button.combo:checked, +.linked > combobox > button.combo: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)), @@ -1501,20 +1493,20 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { } /* 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), @@ -1522,189 +1514,130 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { } /* Middle button */ -/* -.linked entry, -.linked > combobox > button:last-child, -.linked > combobox > button:focus:last-child, -.linked button, -.linked button:focus { +.linked entry, +.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), inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); - border-right-width: 0px; - border-left-width: 0px; + border-width: 1px 0px 1px 0px; border-radius: 0; } -*/ - /* Middle Button 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), - inset 0px -1px shade(@selected_bg_color, 0.93); - border-right-width: 0px; - border-left-width: 0px; - border-radius: 0; + + /* Middle Button active/hover */ +.linked button:hover, +.linked button:checked:hover, +.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.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); + border-width: 1px 0px 1px 0px; + border-radius: 0; } -/* Middle button 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), - inset 0px -1px shade(@selected_bg_color, 0.93); - border-right-width: 0px; - border-left-width: 0px; - border-radius: 0; -} - -/* Middle button insensitive */ -.linked > combobox > button:disabled:last-child, -.linked button:disabled { +/* Middle button disabled */ +.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), inset 0px -1px @insensitive_border_color; - border-right-width: 0px; - border-left-width: 0px; + border-width: 1px 0px 1px 0px; border-radius: 0; } /* Leftmost button */ -/* -.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 { +.linked entry:first-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), inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); border-radius: 6px 0 0 6px; - border-right-width: 0; -} -*/ -/* Leftmost button active */ -.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), - inset 0px -1px shade(@selected_bg_color, 0.93); - border-radius: 6px 0 0 6px; - border-right-width: 0; + border-width: 1px 0px 1px 1px; } -/* Leftmost button hover */ -.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), +/* Leftmost button active/hover */ +.linked button:hover:first-child, +.linked button:checked:hover:first-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.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, 0.93); + inset 0px -1px shade(@selected_bg_color, 1.3); border-radius: 6px 0 0 6px; - border-right-width: 0; + border-width: 1px 0px 1px 1px; } -/* Leftmost button insensitive */ -.linked > combobox:first-child > button:disabled:last-child, -.linked button:disabled:first-child { +/* Leftmost button disabled */ +.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), inset 0px -1px @insensitive_border_color; border-radius: 6px 0 0 6px; - border-right-width: 0; + border-width: 1px 0px 1px 1px; } /* Rightmost button */ -/* -.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 { +.linked entry: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), inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); border-radius: 0 6px 6px 0; - border-left-width: 0; -} -*/ -/* Rightmost button active */ -.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), - inset 0px -1px shade(@selected_bg_color, 0.93); - border-radius: 0 6px 6px 0; - border-left-width: 0; + border-width: 1px 1px 1px 0px; } -/* Rightmost button hover */ -.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 { +/* Rightmost button active/hover */ +.linked button:hover:last-child, +.linked button:checked:hover: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), inset 0px -1px shade(@selected_bg_color, 0.93); border-radius: 0 6px 6px 0; - border-left-width: 0; + border-width: 1px 1px 1px 0px; } -/* Rightmost button insensitive */ -.linked > combobox:last-child > button:disabled:last-child, -.linked button:disabled:last-child { +/* Rightmost button disabled */ +.linked button.combo:disabled:last-child { 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; border-radius: 0 6px 6px 0; - border-left-width: 0; + border-width: 1px 1px 1px 0px; } -/* Linked single button */ -.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 { +/* Linked single button.combo */ +.linked entry:only-child, +.linked button:only-child, +.linked button:focus:only-child { border-radius: 6px; + border-width: 1px; } -.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 { +.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), @@ -1712,9 +1645,8 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { border-radius: 6px; } -/* Linked single button insensitive */ -.linked > combobox:only-child > button:disabled:last-child, -.linked button:disabled:only-child { +/* Linked single button disabled */ +.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, @@ -1724,10 +1656,8 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { /* vertical */ /* Middle button */ -.vertical.linked > combobox > button:last-child, -.vertical.linked > combobox > button:focus:last-child, -.vertical.linked button, -.vertical.linked button:focus { +.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), @@ -1736,16 +1666,13 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { border-width: 0px 1px 1px 1px; } -.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 { +.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), @@ -1754,8 +1681,7 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { border-width: 0px 1px 1px 1px; } -.vertical.linked > combobox > button:disabled:last-child, -.vertical.linked button:disabled { +.vertical.linked button:disabled { box-shadow: inset 0px 1px @insensitive_border_color, inset 1px 0px @insensitive_border_color, inset -1px 0px @insensitive_border_color, @@ -1766,10 +1692,8 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { /* Top button */ -.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 { +.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); @@ -1777,25 +1701,21 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { border-width: 1px 1px 1px 1px; } -.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), +.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.05), + inset 1px 0px shade(@selected_bg_color, 0.97), inset -1px 0px shade(@selected_bg_color, 0.93); border-radius: 6px 6px 0 0; border-width: 1px 1px 1px 1px; } -.vertical.linked > combobox:first-child > button:disabled:last-child, -.vertical.linked button:disabled:first-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; @@ -1805,10 +1725,8 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { /* Bottom button */ -.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 { +.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); @@ -1816,16 +1734,13 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { border-width: 0px 1px 1px 1px; } -.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 { +.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); @@ -1833,8 +1748,7 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { border-width: 0px 1px 1px 1px; } -.vertical.linked > combobox:last-child > button:disabled:last-child, -.vertical.linked 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; @@ -1844,10 +1758,8 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { /* Single button */ -.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 { +.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), @@ -1856,16 +1768,13 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { border-width: 1px; } -.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 { +.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), @@ -1874,8 +1783,7 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { border-width: 1px; } -.vertical.linked > combobox:only-child > button:disabled:last-child, -.vertical.linked button:disabled:only-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, @@ -1889,16 +1797,16 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { /*************************/ /* Middle button */ -.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 { +toolbar.inline-toolbar button, +toolbar.inline-toolbar button:checked, +toolbar.inline-toolbar button:disabled, +toolbar.inline-toolbar GtkToolButton > button, +toolbar.inline-toolbar GtkToolButton > button:checked, +toolbar.inline-toolbar GtkToolButton > button:disabled { /* outer */ border-width: 0px; border-right-width: 0px; - border-left-width: 0px; + border-left-width: 0px; border-radius: 0; /* border and inset */ box-shadow: inset 0px 1px alpha(#fff, 0.09), @@ -1908,11 +1816,11 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { 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 { +toolbar.inline-toolbar button:hover:active, +toolbar.inline-toolbar button:checked, +toolbar.inline-toolbar button:checked:hover, +toolbar.inline-toolbar button:checked:hover:active, +toolbar.inline-toolbar GtkToolButton > button:checked { background-color: transparent; box-shadow: inset 0px 1px alpha(#000, 0.05), inset 2px 0px alpha(#000, 0.03), @@ -1921,18 +1829,18 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { inset 0px -1px alpha(#000, 0.02); } -.inline-toolbar toolbar button:disabled, -.inline-toolbar toolbar GtkToolButton > button:disabled { +toolbar.inline-toolbar button:disabled, +toolbar.inline-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: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 { +toolbar.inline-toolbar button:first-child, +toolbar.inline-toolbar button:checked:first-child, +toolbar.inline-toolbar button:disabled:first-child, +toolbar.inline-toolbar GtkToolButton:first-child > button, +toolbar.inline-toolbar GtkToolButton:first-child > button:checked, +toolbar.inline-toolbar GtkToolButton:first-child > button:disabled { border-width: 0px; border-radius: 0px; box-shadow: inset 0px 1px alpha(#fff, 0.09), @@ -1941,12 +1849,11 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { 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 { - +toolbar.inline-toolbar button:hover:active:first-child, +toolbar.inline-toolbar button:checked:first-child, +toolbar.inline-toolbar button:checked:hover:first-child, +toolbar.inline-toolbar button:checked:hover:active:first-child, +toolbar.inline-toolbar GtkToolButton:first-child > button:checked { background-color: transparent; box-shadow: inset 0px 1px alpha(#000, 0.05), inset 1px 0px alpha(#000, 0.03), @@ -1954,18 +1861,18 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { inset 0px -1px alpha(#000, 0.02); } -.inline-toolbar toolbar button:disabled:first-child, -.inline-toolbar toolbar GtkToolButton:first-child > button:disabled { +toolbar.inline-toolbar button:disabled:first-child, +toolbar.inline-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: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 { +toolbar.inline-toolbar button:last-child, +toolbar.inline-toolbar button:checked:last-child, +toolbar.inline-toolbar button:disabled:last-child, +toolbar.inline-toolbar GtkToolButton:last-child > button, +toolbar.inline-toolbar GtkToolButton:last-child > button:checked, +toolbar.inline-toolbar GtkToolButton:last-child > button:disabled { border-width: 0px; border-radius: 0px; box-shadow: inset 0px 1px alpha(#fff, 0.09), @@ -1976,11 +1883,11 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { 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 { +toolbar.inline-toolbar button:hover:active:last-child, +toolbar.inline-toolbar button:checked:last-child, +toolbar.inline-toolbar button:checked:hover:last-child, +toolbar.inline-toolbar button:checked:hover:active:last-child, +toolbar.inline-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), @@ -1990,20 +1897,20 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { inset 0px -1px alpha(#000, 0.02); } -.inline-toolbar toolbar button:disabled:last-child, -.inline-toolbar toolbar GtkToolButton:last-child > button:disabled { +toolbar.inline-toolbar button:disabled:last-child, +toolbar.inline-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: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; +toolbar.inline-toolbar button:only-child, +toolbar.inline-toolbar button:checked:only-child, +toolbar.inline-toolbar button:disabled:only-child, +toolbar.inline-toolbar GtkToolButton:only-child > button, +toolbar.inline-toolbar GtkToolButton:only-child > button:checked, +toolbar.inline-toolbar GtkToolButton:only-child > button:disabled { + border-radius: 0px; border-width: 0px; box-shadow: inset 0px 1px alpha(#fff, 0.09), inset -1px 0px alpha(#fff, 0.07), @@ -2011,11 +1918,11 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { 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 { +toolbar.inline-toolbar button:hover:active:only-child, +toolbar.inline-toolbar button:checked:only-child, +toolbar.inline-toolbar button:checked:hover:only-child, +toolbar.inline-toolbar button:checked:hover:active:only-child, +toolbar.inline-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), @@ -2023,8 +1930,8 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { inset 1px 0px shade(@button_border, 0.80); } -.inline-toolbar toolbar button:disabled:only-child, -.inline-toolbar toolbar GtkToolButton:only-child > button:disabled { +toolbar.inline-toolbar button:disabled:only-child, +toolbar.inline-toolbar GtkToolButton:only-child > button:disabled { box-shadow: inset 1px 0px shade(@button_border, 1.10); } @@ -2034,8 +1941,6 @@ toolbar .raised.linked:nth-child(last) button:checked:hover { combobox { padding: 0px; - -combobox-arrow-scaling: 0.5; - -combobox-shadow-type: none; } combobox .cell { @@ -2044,20 +1949,14 @@ combobox .cell { text-shadow: 0 1px @theme_shadow_color; } -combobox menu .cell { - /* light text on dark combobox menu */ - color: @theme_bg_color; - text-shadow: 0 1px @theme_shadow_color; -} - -combobox .separator { +combobox separator { /* always disable separators */ -GtkWidget-horizontal-separator: 0; -GtkWidget-vertical-separator: 0; } -combobox entry, -combobox 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 */ @@ -2071,8 +1970,7 @@ combobox entry:nth-child(first) { inset 0px -1px shade(@button_border, 1.10); } - -combobox entry:focus { +combobox entry:focus { border-width: 2px 0px 2px 2px; /* remove right-outer */ /* border */ box-shadow: inset 0px 3px alpha(#000, 0.03), @@ -2086,18 +1984,18 @@ combobox entry:focus { } /* for RTL languages */ -combobox 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; } -combobox button { +combobox button { color: @internal_element_color; padding: 2px 3px 2px 6px; } -combobox button *:hover { +combobox button:hover { color: @theme_text_color; } @@ -2107,17 +2005,17 @@ toolbar combobox .cell { text-shadow: 0 1px @toolbar_shadow_color; } -.primary-toolbar combobox .cell { +toolbar.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 combobox entry, -toolbar combobox entry:focus { +toolbar combobox entry.combo, +toolbar combobox entry.combo: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); + border-top-color: shade(@toolbar_gradient_base, 0.60); + border-left-color: shade(@toolbar_gradient_base, 0.70); border-bottom-color: shade(@toolbar_gradient_base, 0.80); box-shadow: inset 0px 3px alpha(#000, 0.02), inset 0px 2px alpha(#000, 0.04), @@ -2126,25 +2024,25 @@ toolbar combobox entry:focus { inset -1px 0px alpha(#000, 0.05); } -toolbar combobox.combobox-entry button { +toolbar combobox button.combo { background-image: -gtk-gradient (linear, left top, left bottom, from (alpha(#fff, 0.04)), to (alpha(#000, 0.07))); - border-top-color: alpha (#000, 0.15); - border-left-color: alpha (#000, 0.20); - border-right-color: alpha (#000, 0.20); + border-top-color: alpha (#000, 0.15); + border-left-color: alpha (#000, 0.20); + border-right-color: alpha (#000, 0.20); border-bottom-color: alpha (#000, 0.25); } -toolbar combobox.combobox-entry button:checked { +toolbar combobox button.combo:checked { background-image: -gtk-gradient (linear, left top, left bottom, from (alpha(#000, 0.20)), to (alpha(#000, 0.06))); - border-top-color: alpha (#000, 0.40); - border-left-color: alpha (#000, 0.31); - border-right-color: alpha (#000, 0.31); + border-top-color: alpha (#000, 0.40); + border-left-color: alpha (#000, 0.31); + border-right-color: alpha (#000, 0.31); border-bottom-color: alpha (#000, 0.22); box-shadow: inset 0px 2px alpha(#000, 0.02), inset 0px 1px alpha(#000, 0.06), @@ -2155,85 +2053,318 @@ toolbar combobox.combobox-entry button:checked { inset 0px -1px alpha(#fff, 0.01); } -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; - border-bottom-right-radius: 4px; +toolbar combobox button.combo, +toolbar combobox button.combo:hover, +toolbar combobox button.combo:checked, +toolbar combobox button.combo:disabled, +toolbar combobox button.combo:nth-child(last), +toolbar.primary-toolbar combobox button.combo, +toolbar.primary-toolbar combobox button.combo:hover, +toolbar.primary-toolbar combobox button.combo:checked, +toolbar.primary-toolbar combobox button.combo:disabled, +toolbar.primary-toolbar combobox button.combo:nth-child(last) { + border-radius: 6px; border-width: 1px 1px 1px 1px; - padding: 2px 3px; + padding: 8px 6px; +} + +combobox button.combo, +combobox button.combo:focus, +combobox button.combo:focus:hover, +combobox button.combo:hover, +combobox button.combo:hover:active, +combobox button.combo:checked, +combobox button.combo:checked:hover, +combobox button.combo:checked:hover:active, +combobox button.combo:disabled { + border-width: 1px; + border-radius: 6px; + border-width: 1px; + padding: 5px 6px; } -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; - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; - border-width: 2px 2px 2px 0px; - padding: 2px 3px; +/* button left from entry */ +combobox.linked button.combo, +combobox.linked button.combo:focus, +combobox.linked button.combo:focus:hover, +combobox.linked button.combo:hover, +combobox.linked button.combo:hover:active, +combobox.linked button.combo:checked, +combobox.linked button.combo:checked:hover, +combobox.linked button.combo:checked:hover:active, +combobox.linked button:disabled +combobox.linked button.combo { + padding: 5px 4px; + border-radius: 0px 6px 6px 0px; + border-width: 1px 1px 1px 0px; } -combobox.combobox-entry button:hover { - border-top-left-radius: 0px; - border-bottom-left-radius: 0px; - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; - border-width: 2px 2px 2px 0px; +combobox.linked button.combo:checked { 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); - border-color: transparent; } -/* for RTL languages */ -combobox.combobox-entry button:nth-child(first) { - border-width: 2px 0px 2px 2px; - border-radius: 4px 0px 0px 4px; +combobox button.combo arrow { + padding: 0px 2px; } -.primary-toolbar combobox.combobox-entry button:nth-child(first) { - border-width: 1px 0px 1px 1px; - border-radius: 4px 0px 0px 4px; +/* Middle button */ +.linked.horizontal combobox button.combo, +.linked.horizontal combobox button.combo: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), + inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); + border-right-width: 0px; + border-left-width: 0px; + border-radius: 0; +} + + /* Middle Button active/hover */ +.linked.horizontal combobox button.combo:hover, +.linked.horizontal combobox button.combo:focus:hover, +.linked.horizontal combobox button.combo:hover:active, +.linked.horizontal combobox button.combo:checked, +.linked.horizontal combobox button.combo:checked:hover, +.linked.horizontal combobox button.combo: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), + inset 0px -1px shade(@selected_bg_color, 0.93); + border-right-width: 0px; + border-left-width: 0px; + border-radius: 0; +} + +/* Middle button disabled */ +.linked.horizontal combobox button.combo: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), + inset 0px -1px @insensitive_border_color; + border-right-width: 0px; + border-left-width: 0px; + border-radius: 0; +} + +/* Leftmost button */ +.linked.horizontal combobox:first-child button.combo:first-child, +.linked.horizontal combobox:first-child button.combo: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), + inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); + border-radius: 6px 0 0 6px; + border-right-width: 0; +} + +/* Leftmost button active/active */ +.linked.horizontal combobox:first-child button.combo:hover:first-child, +.linked.horizontal combobox:first-child button.combo:focus:hover:first-child, +.linked.horizontal combobox:first-child button.combo:hover:active:first-child, +.linked.horizontal combobox:first-child button.combo:checked:first-child, +.linked.horizontal combobox:first-child button.combo:checked:hover:first-child, +.linked.horizontal combobox:first-child button.combo: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), + inset 0px -1px shade(@selected_bg_color, 0.93); + border-radius: 6px 0 0 6px; + border-right-width: 0; +} + +/* Leftmost button disabled */ +.linked.horizontal combobox:first-child button.combo: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), + inset 0px -1px @insensitive_border_color; + border-radius: 6px 0 0 6px; + border-right-width: 0; +} + +/* Rightmost button */ +.linked.horizontal combobox:last-child button.combo:last-child, +.linked.horizontal combobox:last-child button.combo: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), + inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); + border-radius: 0 6px 6px 0; + border-left-width: 0; +} + +/* Rightmost button active */ +.linked.horizontal combobox:last-child button.combo:hover:last-child, +.linked.horizontal combobox:last-child button.combo:focus:hover:last-child, +.linked.horizontal combobox:last-child button.combo:hover:active:last-child, +.linked.horizontal combobox:last-child button.combo:checked:last-child, +.linked.horizontal combobox:last-child button.combo:checked:hover:last-child, +.linked.horizontal combobox:last-child button.combo: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), + inset 0px -1px shade(@selected_bg_color, 0.93); + border-radius: 0 6px 6px 0; + border-left-width: 0; +} + +/* Rightmost button disabled */ +.linked.horizontal combobox:last-child button.combo:last-child { + 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; + border-radius: 0 6px 6px 0; + border-left-width: 0; +} + +/* vertical */ +/* Middle button */ +.vertical.linked > combobox > button.combo, +.vertical.linked > combobox > button.combo: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), + inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); + border-radius: 0px; + border-width: 0px 1px 1px 1px; +} + +.vertical.linked > combobox > button.combo:hover, +.vertical.linked > combobox > button.combo:focus:hover, +.vertical.linked > combobox > button.combo:checked { + 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); + border-radius: 0px; + border-width: 0px 1px 1px 1px; +} + +.vertical.linked > combobox > button.combo:disabled { + 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; + border-radius: 0px; + border-width: 0px 1px 1px 1px; +} + +/* Top button */ +.vertical.linked > combobox:first-child > button.combo:first-child, +.vertical.linked > combobox:first-child > button.combo: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); + border-radius: 6px 6px 0 0; + border-width: 1px 1px 1px 1px; +} + +.vertical.linked > combobox:first-child > button.combo:hover:first-child, +.vertical.linked > combobox:first-child > button.combo:focus:hover:first-child, +.vertical.linked > combobox:first-child > button.combo:checked: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); + border-radius: 6px 6px 0 0; + border-width: 1px 1px 1px 1px; +} + +.vertical.linked > combobox:first-child > button.combo:disabled:first-child { + box-shadow: inset 0px 1px @insensitive_border_color, + inset 1px 0px @insensitive_border_color, + inset -1px 0px @insensitive_border_color; + border-radius: 6px 6px 0 0; + border-width: 1px 1px 1px 1px; +} + +/* Bottom button */ +.vertical.linked > combobox:last-child > button.combo:last-child, +.vertical.linked > combobox:last-child > button.combo: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); + border-radius: 0 0 6px 6px; + border-width: 0px 1px 1px 1px; +} + +.vertical.linked > combobox:last-child > button.combo:hover:last-child, +.vertical.linked > combobox:last-child > button.combo:focus:hover:last-child, +.vertical.linked > combobox:last-child > button.combo:checked: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); + border-radius: 0 0 6px 6px; + border-width: 0px 1px 1px 1px; +} + +.vertical.linked > combobox:last-child > button.combo:disabled:last-child { + box-shadow: inset 1px 0px @insensitive_border_color, + inset -1px 0px @insensitive_border_color, + inset 0px -1px @insensitive_border_color; + border-radius: 0 0 6px 6px; + border-width: 0px 1px 1px 1px; +} + +/* Single button */ +.vertical.linked > combobox:only-child > button.combo:only-child, +.vertical.linked > combobox:only-child > button.combo: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), + inset 0px -1px alpha(shade(@button_border, 0.94), 0.90); + border-radius: 6px; + border-width: 1px; +} + +.vertical.linked > combobox:only-child > button.combo:hover:only-child, +.vertical.linked > combobox:only-child > button.combo:focus:hover:only-child, +.vertical.linked > combobox:only-child > button.combo:checked: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); + border-radius: 6px; + border-width: 1px; } -combobox.combobox-entry button *:checked, -combobox.combobox-entry button *:hover { - color: @internal_element_hover; +.vertical.linked > combobox:only-child > button.combo:disabled:only-child { + 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; + border-radius: 6px; + border-width: 1px; +} + +combobox button.combo:checked, +combobox button.combo:hover { + color: @internal_element_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 { +toolbar combobox button.combo:checked, +toolbar combobox button.combo:hover, +toolbar.primary-toolbar combobox button.combo *:checked, +toolbar.primary-toolbar combobox button.combo *:hover { color: @theme_text_dark_color; } +combobox arrow { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); + color: @theme_fg_color; + min-height: 16px; + min-width: 16px; +} + /************ * Toolbars * ************/ - 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, @@ -2247,16 +2378,49 @@ GtkHandleBox, color: @toolbar_fg_color; } - toolbar.vertical { +toolbar.vertical { border-radius: 4px 0 0 4px; padding: 2px; } +toolbar button.flat.image-button label { + color: @menu_fg_dark_color; +} + +toolbar toolitem combobox button.combo, +toolbar toolbutton button.flat.toggle.popup:focus, +toolbar toolbutton button.flat.toggle.popup:disabled, +toolbar toolbutton button.flat.image-button:disabled { + box-shadow: none; + background-image: none; +} + +toolbar toolbutton button.flat.toggle.popup:focus { + +} + +toolbar toolbutton button.flat.text-button:focus:hover, +toolbar toolbutton button.flat.toggle.popup:focus:hover, +toolbar toolitem combobox button.combo:hover { + 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))); + 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); +} + +toolbar toolbutton button.flat.text-button:focus { + box-shadow: none; +} + /******************** * Menubar Toolbars * ********************/ - toolbar menubar { +toolbar menubar { padding: 2px 4px 5px 3px; background-image: -gtk-gradient (linear, left top, left bottom, @@ -2280,7 +2444,7 @@ GtkHandleBox, * hint on the containing vbox, so we need to handle both these cases here. */ -.primary-toolbar toolbar { +toolbar.primary-toolbar { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@theme_bg_dark_color, 1.00)), @@ -2289,7 +2453,7 @@ GtkHandleBox, border-width: 0px 0px 1px 0px; border-radius: 0px; border-style: solid; - border-color: transparent; + border-color: @primay-toolbar-border; padding: 3px; box-shadow: none; -GtkWidget-window-dragging: true; @@ -2297,7 +2461,7 @@ GtkHandleBox, color: @theme_fg_dark_color; } -.primary-toolbar toolbar:disabled { +toolbar.primary-toolbar:disabled { background-image: none; background-color: shade (@theme_bg_dark_color, 0.97); border-image: none; @@ -2306,24 +2470,24 @@ GtkHandleBox, } /* primary toolbar buttons */ - toolbar button, -.primary-toolbar toolbar button { +toolbar button, +toolbar.primary-toolbar button, +toolbar.primary-toolbar .linked button, +toolbar.primary-toolbar button:focus { 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 label{ +toolbar button { color: shade(@toolbar_fg_color, 1.00); text-shadow: 0px 1px @toolbar_shadow_color; } -toolbar combobox button { +toolbar combobox button { /* color combobox read-only */ color: shade(@toolbar_fg_color, 1.00); text-shadow: 0px 1px @toolbar_shadow_color; @@ -2331,9 +2495,9 @@ toolbar combobox button { left top, left bottom, from (alpha(#fff, 0.04)), to (alpha(#000, 0.06))); - border-top-color: alpha (#000, 0.15); - border-left-color: alpha (#000, 0.20); - border-right-color: alpha (#000, 0.20); + border-top-color: alpha (#000, 0.15); + border-left-color: alpha (#000, 0.20); + border-right-color: alpha (#000, 0.20); border-bottom-color: alpha (#000, 0.25); box-shadow: inset 0px 1px alpha(shade(@button_border, 1.00), 0.70), inset 1px 0px alpha(shade(@button_border, 0.94), 0.80), @@ -2341,37 +2505,37 @@ toolbar combobox button { inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); } - toolbar combobox button:hover { +toolbar combobox button:hover { border-radius: 5px } -.primary-toolbar toolbar button { +toolbar.primary-toolbar button { color: @theme_fg_dark_color; text-shadow: 0px 1px @theme_shadow_dark_color; } -.primary-toolbar .linked button:focus { +toolbar.primary-toolbar .linked button:focus { box-shadow: none; } - toolbar button:disabled, -.primary-toolbar toolbar button:disabled { +toolbar button:disabled, +toolbar.primary-toolbar button:disabled { background-image: none; background-color: alpha (@theme_base_color, 0.0); border-color: transparent; } - toolbar button *:disabled { +toolbar button *:disabled { color: mix(@toolbar_gradient_base, @toolbar_fg_color, 0.60); text-shadow: none; } -.primary-toolbar toolbar button *:disabled { +toolbar.primary-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)), @@ -2382,11 +2546,11 @@ toolbar combobox button { 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)), @@ -2400,12 +2564,12 @@ toolbar combobox button { 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 { +toolbar.primary-toolbar button:hover, +toolbar.primary-toolbar button:hover:active, +toolbar.primary-toolbar button:checked, +toolbar.primary-toolbar button:checked:focus, +toolbar.primary-toolbar button:checked:hover, +toolbar.primary-toolbar button:checked:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -2419,29 +2583,29 @@ toolbar combobox button { 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) */ +toolbar.primary-toolbar button *:hover, +toolbar.primary-toolbar button *:active, +toolbar.primary-toolbar button *:hover:active, +toolbar.primary-toolbar button *:active:active, +toolbar.primary-toolbar button *:checked, +toolbar.primary-toolbar button *:checked:hover, +toolbar.primary-toolbar button *:checked:checked { color: @theme_text_dark_color; text-shadow: 0px 1px @theme_shadow_dark_color; } - toolbar button:active:disabled, - toolbar button:checked:disabled, -.primary-toolbar toolbar button:checked:disabled { +toolbar button:active:disabled, +toolbar button:checked:disabled, +toolbar.primary-toolbar button:checked:disabled { background-image: none; background-color: alpha (@theme_base_color, 0.0); border-color: transparent; @@ -2449,49 +2613,49 @@ toolbar combobox button { text-shadow: none; } - toolbar label { +toolbar label { color: shade(@theme_fg_color, 1.10); text-shadow: 0px 1px @theme_shadow_color; } - toolbar menubar label, -.primary-toolbar toolbar label { +toolbar menubar label, +toolbar.primary-toolbar label { color: @theme_fg_dark_color; text-shadow: 0px 1px @theme_shadow_dark_color; } - toolbar GtkSeparatorToolItem, - toolbar .separator, - toolbar .separator:disabled { - border-color: alpha (#000, 0.24); +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); + border-right-color: alpha (#fff, 0.08); } /************************************ primary toolbar raised buttons *************************************/ - toolbar .raised button, - toolbar .raised button { +toolbar .raised button, +toolbar button.raised { 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 button.raised { background-image: -gtk-gradient (linear, left top, left bottom, from (@button_raised_gradient_color_a), @@ -2500,24 +2664,25 @@ toolbar combobox button { /* outer */ border-color: transparent; /* border and inset */ +/* -GtkWidget-focus-line-width: 0; */ color: shade(@theme_fg_dark_color, 1.00); } -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 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:active, +toolbar button.raised:disabled, toolbar .raised button:disabled:active, -toolbar .raised button:disabled:checked, -toolbar .raised button:disabled:checked { +toolbar button.raised:disabled:active, +toolbar .raised button:disabled:checked, +toolbar button.raised:disabled:checked { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_raised_gradient_color_a, 0.88)), @@ -2527,9 +2692,9 @@ toolbar .raised button:disabled:checked { 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 button.raised:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -2545,13 +2710,13 @@ toolbar .raised button:disabled:checked { 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 button.raised:hover:active, +toolbar menubar button:checked, +toolbar .raised button:checked, toolbar .raised button:checked:hover, -toolbar .raised button:checked { +toolbar button.raised:checked:hover, +toolbar button.raised:checked { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -2567,42 +2732,42 @@ toolbar .raised button:checked { } /* setup shadows */ -toolbar .raised button label, -toolbar .raised button label { +toolbar .raised button label, +toolbar button.raised label { color: @theme_fg_dark_color; text-shadow: 0px 1px @theme_shadow_dark_color; } -toolbar .raised button, -toolbar .raised button { +toolbar .raised button, +toolbar button.raised { -gtk-icon-shadow: 1px 1px @theme_shadow_dark_color; } -toolbar menubar button *:hover, -toolbar .raised button *:hover, +toolbar menubar button *:hover, toolbar .raised button *:hover, -toolbar .raised button *:hover:active, +toolbar button.raised *:hover, toolbar .raised button *:hover:active, -toolbar menubar button *:checked, -toolbar .raised button *:checked, +toolbar button.raised *:hover:active, +toolbar menubar button *:checked, toolbar .raised button *:checked, -toolbar .raised button *:checked:hover, -toolbar .raised button *:checked:hover { +toolbar button.raised *:checked, +toolbar .raised button *:checked:hover, +toolbar button.raised *:checked:hover { color: @theme_text_dark_color; text-shadow: 0px 1px @theme_shadow_dark_color; } -toolbar menubar button *:disabled, -toolbar .raised button *:disabled, -toolbar .raised button *:disabled { +toolbar menubar button *:disabled, +toolbar .raised button *:disabled, +toolbar button.raised *: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); + color: shade(@toolbar_fg_color, 1.0); background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@toolbar_gradient_base, 0.95)), @@ -2610,14 +2775,13 @@ toolbar entry { to (shade(@toolbar_gradient_base, 1.15))); } -toolbar entry, -toolbar menubar entry, -toolbar .raised entry, +toolbar entry, +toolbar menubar entry, toolbar .raised entry, -primary-toolbar toolbar entry, -primary-toolbar toolbar entry { +toolbar .raised.entry, +toolbar.primary-toolbar entry { padding: 4px 4px 4px 6px; - color: @entry_text_dark_color; + color: @entry_text_dark_color; background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@entry_bg_dark_color, 0.80)), @@ -2628,8 +2792,8 @@ primary-toolbar toolbar entry { border-style: solid; border-radius: 5px; border-top-color: transparent; - border-right-color: alpha(#fff, 0.02); - border-left-color: alpha(#fff, 0.02); + border-right-color: alpha(#fff, 0.02); + border-left-color: alpha(#fff, 0.02); border-bottom-color: alpha(#fff, 0.07); /* border */ box-shadow: inset 0px 3px alpha(#000, 0.05), @@ -2643,15 +2807,15 @@ primary-toolbar toolbar entry { inset 0px -1px shade(@theme_entry_border_dark, 1.10); } -toolbar entry:focus, -toolbar menubar entry:focus, -toolbar .raised entry:focus, +toolbar entry:focus, +toolbar menubar entry:focus, toolbar .raised entry:focus, -primary-toolbar toolbar entry:focus { +toolbar .raised.entry:focus, +toolbar.primary-toolbar entry:focus { /* outer */ - border-top-color: @focused_dark_entry_outer; - border-right-color: alpha(@focused_dark_entry_outer, 0.90); - border-left-color: alpha(@focused_dark_entry_outer, 0.90); + border-top-color: @focused_dark_entry_outer; + border-right-color: alpha(@focused_dark_entry_outer, 0.90); + border-left-color: alpha(@focused_dark_entry_outer, 0.90); border-bottom-color: alpha(@focused_dark_entry_outer, 0.85); /* border */ box-shadow: inset 0px 3px alpha(#000, 0.03), @@ -2665,17 +2829,17 @@ primary-toolbar toolbar entry:focus { inset 0px -1px shade(@focused_dark_entry_border, 1.00); } -toolbar entry selection, -toolbar menubar entry selection, -toolbar .raised entry selection, -toolbar .raised entry selection, -primary-toolbar toolbar entry selection { +toolbar entry:selected, +toolbar menubar entry:selected, +toolbar .raised entry:selected, +toolbar .raised.entry:selected, +toolbar.primary-toolbar entry:selected { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; } /* progressbars on primary toolbar entries are special */ -primary-toolbar toolbar entry progressbar progress { +toolbar.primary-toolbar entry.progressbar { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@button_bg_active, 1.35)), @@ -2695,7 +2859,7 @@ primary-toolbar toolbar entry progressbar progress { * Buttons + dialog open * ****************************/ -.inline-toolbar toolbar { +toolbar.inline-toolbar { -GtkToolbar-button-relief: normal; padding: 0px; background-color: alpha(@button_base, 0.0); @@ -2709,9 +2873,9 @@ primary-toolbar toolbar entry progressbar progress { border-width: 0 1px 1px 1px; border-style: solid; border-radius: 3px; - border-top-color: shade(@button_border, 1.00); - border-right-color: shade(@button_border, 1.00); - border-left-color: shade(@button_border, 1.00); + border-top-color: shade(@button_border, 1.00); + border-right-color: shade(@button_border, 1.00); + border-left-color: shade(@button_border, 1.00); border-bottom-color: shade(@button_border, 1.00); box-shadow: inset 0px 1px alpha(#fff, 0.09), inset 1px 0px alpha(#fff, 0.07), @@ -2719,7 +2883,7 @@ primary-toolbar toolbar entry progressbar progress { inset 0px -1px alpha(#fff, 0.05); } -.inline-toolbar toolbar button { +toolbar.inline-toolbar button { padding: 2px 6px; background-image: -gtk-gradient (linear, left top, left bottom, @@ -2736,10 +2900,10 @@ primary-toolbar toolbar entry progressbar progress { -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 { +toolbar.inline-toolbar button:hover:active, +toolbar.inline-toolbar button:checked, +toolbar.inline-toolbar button:checked:hover, +toolbar.inline-toolbar button:checked:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_base, 0.50)), @@ -2753,7 +2917,7 @@ primary-toolbar toolbar entry progressbar progress { inset 0px -1px shade(@button_border, 0.78); } -.inline-toolbar toolbar button:hover { +toolbar.inline-toolbar button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_base, 1.03)), @@ -2763,60 +2927,62 @@ primary-toolbar toolbar entry progressbar progress { color: @theme_text_color; } -.inline-toolbar toolbar button:disabled { +toolbar.inline-toolbar button:disabled { box-shadow: none; background-color: mix(@button_base, @theme_fg_color, 0.10); background-image: none; } -.inline-toolbar toolbar button *:disabled { +toolbar.inline-toolbar button *:disabled { color: @insensitive_fg_color; text-shadow: none; -gtk-icon-shadow: none; } -.inline-toolbar toolbar button *:hover { +toolbar.inline-toolbar button *:hover { color: @theme_text_color; text-shadow: 0 1px @theme_shadow_color; -gtk-icon-shadow: 1px 1px @theme_shadow_color; } -.inline-toolbar toolbar button *:active, -.inline-toolbar toolbar button *:checked { +toolbar.inline-toolbar button *:active, +toolbar.inline-toolbar button *:checked { color: @theme_selected_fg_color; text-shadow: 0 1px @theme_selected_shadow_color; -gtk-icon-shadow: 1px 1px @theme_selected_shadow_color; } /* Stack switcher */ -.stack-switcher > button > label, - headerbar .stack-switcher > button.titlebutton > label, -.titlebar .stack-switcher > button.titlebutton > label, -calendar.header .stack-switcher > button.titlebutton > label { +stackswitcher > button > label, +headerbar stackswitcher > button.titlebutton > label, +headerbar.titlebar stackswitcher > button.titlebutton > label, +calendar.header stackswitcher > button.titlebutton > label { padding-left: 6px; padding-right: 6px; } -stack-switcher > button > image, -header-bar stack-switcher > button.titlebutton > image, -titlebar stack-switcher > button.titlebutton > image, -calendar.header .stack-switcher > button.titlebutton > image { +stackswitcher > button > image, +headerbar stackswitcher > button.titlebutton > image, +headerbar.titlebar stackswitcher > button.titlebutton > image, +calendar.header stackswitcher > 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, - headerbar .stack-switcher > .titlebutton button, -.titlebar .stack-switcher > .titlebutton button, -calendar.header .stack-switcher > .titlebutton button { +stackswitcher.linked.stack-switcher > button.text-button.radio, +stackswitcher > button.text-button.radio, +stackswitcher > .linked.stackswitcher > button.text-button.radio, +stackswitcher > button.image-button.radio, +headerbar stackswitcher > button.titlebutton, +headerbar.titlebar stackswitcher > button.titlebutton, +calendar.header stackswitcher > button.titlebutton { padding: 4px 2px; } -.stack-switcher > button.needs-attention > label, -.stack-switcher > button.needs-attention > image { +stackswitcher > button.needs-attention > label, +stackswitcher > button.needs-attention > image { animation: needs_attention 150ms ease-in; background-color: @theme_bg_color; /* FIXME: ? */ background-size: 6px 6px, 6px 6px; @@ -2824,18 +2990,18 @@ calendar.header .stack-switcher > .titlebutton button { background-position: right 3px, right 4px; } -.stack-switcher > button.needs-attention > label:backdrop, -.stack-switcher > button.needs-attention > image:backdrop { +stackswitcher > button.needs-attention > label:backdrop, +stackswitcher > button.needs-attention > image:backdrop { background-size: 6px 6px, 0 0; } -.stack-switcher > button.needs-attention > label:dir(rtl), -.stack-switcher > button.needs-attention > image:dir(rtl) { +stackswitcher > button.needs-attention > label:dir(rtl), +stackswitcher > button.needs-attention > image:dir(rtl) { background-position: left 3px, left 4px; } -.stack-switcher > button.needs-attention:checked > label, -.stack-switcher > button.needs-attention:checked > image { +stackswitcher > button.needs-attention:checked > label, +stackswitcher > button.needs-attention:checked > image { animation: none; background-image: none; } @@ -2844,11 +3010,19 @@ calendar.header .stack-switcher > .titlebutton button { * GtkActionBar * ****************/ -actionbar .frame.action-bar .horizontal.linked.stack-switcher button.image-button { +actionbar revealer .horizontal.linked.stack-switcher button.image-button.radio { padding: 4px 2px; } -actionbar .frame.action-bar button.image-button { +actionbar revealer .horizontal.linked.stack-switcher button.image-button.radio:first-child { + border-width: 1px 0px 1px 1px; +} + +actionbar revealer .horizontal.linked.stack-switcher button.image-button.radio:last-child { + border-width: 1px 1px 1px 0px; +} + +actionbar revealer .horizontal button.image-button.popup.toggle { padding: 8px; } @@ -2856,45 +3030,41 @@ actionbar .frame.action-bar button.image-button { * GtkSpinButton * *****************/ -.horizontal entry spinbutton { - padding: 4px 5px; +spinbutton, +spinbutton:focus, +spinbutton.vertical, +spinbutton.vertical:focus { + border-color: @button_border; + border-width: 1px; + border-style: solid; + border-radius: 3px; + padding: 0px; } -spinbutton button { - color: @internal_element_color; - border-width: 0; - border-radius: 0; +spinbutton.horizontal > entry { + padding: 0px 10px 0px 3px; + box-shadow: none; + border-radius: 3px 0px 0px 3px; border-style: none; - border-image: none; - background-color: transparent; - background-image: none; } -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 { +spinbutton > button:disabled, +spinbutton > button:disabled:last-child, +spinbutton.vertical > button:disabled, +spinbutton.vertical > button:disabled:last-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 { - border-radius: 0px 0px 0px 0px; - 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, +spinbutton > button:hover, +spinbutton > button:focus, +spinbutton > button:active { + -gtk-icon-shadow: 0 1px @button_text_shadow; + color: @internal_element_prelight; } -spinbutton button:hover { +spinbutton > button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_gradient1, 1.03)), @@ -2903,7 +3073,7 @@ spinbutton button:hover { to (shade(@button_gradient4, 1.01))); } -spinbutton button:checked { +spinbutton > button:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), @@ -2912,184 +3082,111 @@ spinbutton button:checked { to (shade (@theme_bg_color, 0.80))); } -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 { - border-radius: 3px 0 0 3px; - border-image: none; - padding: 6px 3px; +spinbutton > button, +spinbutton > button:focus, +spinbutton > button:hover, +spinbutton > button:active, +spinbutton > button:disabled { + min-height: 10px; + min-width: 10px; + border-radius: 0px; + padding: 0px 5px; + box-shadow: none; + border-style: solid; + border-color: @button_border; + border-width: 0px 1px 0px 1px; } -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:active:last-child, +spinbutton > button:disabled:last-child { border-radius: 0 3px 3px 0; - border-image: none; - padding: 6px 3px; + border-width: 0px; } -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.horizontal > button:hover, +spinbutton.horizontal > button: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), inset 0px -1px shade(@selected_bg_color, 0.93); } -spinbutton button:dir(rtl) { - box-shadow: inset -1px 0 @inset_dark_color; -} - -spinbutton.vertical button { - padding: 4px; - -gtk-icon-shadow: 0 1px @button_text_shadow; -} - -spinbutton.vertical button, -spinbutton.vertical button:hover { - color: @theme_fg_color; -} - -spinbutton.vertical button:disabled { - color: @insensitive_fg_color; -} - -spinbutton.vertical button:checked { - color: @theme_fg_color; - -gtk-icon-shadow: 0 1px @button_active_text_shadow; +spinbutton > button:hover:last-child, +spinbutton > button: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), + inset 0px -1px shade(@selected_bg_color, 0.93); } -/* :disabled:disabled to override the dark overriden style for - normal spinbutton buttons, yeah we lack !important */ -spinbutton.vertical button:disabled:disabled { - -gtk-icon-shadow: none; +spinbutton.vertical > entry { + border-style: none; + border-radius: 0; + padding: 5px 1px; + box-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 { - box-shadow: none; +spinbutton.vertical > button, +spinbutton.vertical > button:focus { + border-style: solid; + border-width: 0px 0px 1px 0px; + border-radius: 3px 3px 0px 0px; + padding: 6px 0px; } -spinbutton.vertical button:first-child { - padding: 6px 4px; - border-image-width: 3px 3px 0 3px; - border-width: 1px 1px 0 1px; - border-radius: 4px 4px 0px 0px; - box-shadow: inset 0px 2px alpha(#fff, 0.11), - inset 2px 0px alpha(#fff, 0.09), - inset -2px 0px alpha(#fff, 0.09), - inset 0px -2px alpha(#fff, 0.07), - 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), - inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); +spinbutton.vertical > button:last-child { + border-width: 1px 0px 0px 0px; + border-radius: 0px 0px 3px 3px; } -spinbutton.vertical button:hover:first-child, -spinbutton.vertical button:checked:first-child { - border-radius: 4px 4px 0px 0; - border-image: none; - color: @internal_element_hover; +spinbutton.vertical > button:hover, +spinbutton.vertical > button: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), - inset 0px -1px shade(@selected_bg_color, 0.93); + inset -1px 0px shade(@selected_bg_color, 0.93); } -spinbutton.vertical button:last-child { - padding: 6px 4px; - border-image-width: 0 3px 4px 3px; - border-width: 0px 1px 1px 1px; - border-radius: 0px 0px 4px 4px; - box-shadow: inset 0px 2px alpha(#fff, 0.11), - inset 2px 0px alpha(#fff, 0.09), - inset -2px 0px alpha(#fff, 0.09), - inset 0px -2px alpha(#fff, 0.07), - 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), - inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); +spinbutton.vertical > button:hover:last-child, +spinbutton.vertical > button: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); } -spinbutton.vertical button:hover:last-child, -spinbutton.vertical button:checked:last-child { - border-radius: 0px 0px 4px 4px; - border-image: none; - color: @internal_element_hover; +spinbutton.horizontal > entry:focus, +spinbutton.vertical > entry:focus { + border-color: alpha(@borders, 0.1); 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 { - border-image: none; - border-color: alpha(@borders, 0.1); - border-width: 0 0px 0 0px; - border-style: none; - border-radius: 0; - padding: 4px 1px 4px 1px; - box-shadow: inset 0px 2px alpha(#fff, 0.11), - inset 2px 0px alpha(#fff, 0.09), - inset -2px 0px alpha(#fff, 0.09), - inset 0px -2px alpha(#fff, 0.07), - inset 1px 0px alpha(shade(@button_border, 0.94), 0.80), - inset -1px 0px alpha(shade(@button_border, 0.94), 0.80); -} - -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 { - 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 */ -grid button, -grid button.flat { - transition: all 600ms ease-out; +GtkGrid button, +GtkGrid button.flat { + transition: all 400ms ease-out; } -grid button, -grid button.flat, -grid button:hover, -grid button:disabled, -grid button.flat:hover, -grid button.flat:disabled { +GtkGrid button, +GtkGrid button.flat, +GtkGrid button:hover, +GtkGrid button:disabled, +GtkGrid button.flat:hover, +GtkGrid button.flat:disabled { padding: 5px 4px; border-radius: 6px; border-color: transparent; background-color: transparent; } -flowbox .grid-child { +GtkFlowBox .grid-child { padding: 3px; border-radius: 3px; } -flowbox .grid-child:selected { +GtkFlowBox .grid-child:selected { outline-offset: -2px; } @@ -3100,10 +3197,7 @@ flowbox .grid-child:selected { color: @link_color; } -linkbutton, -linkbutton:hover, -linkbutton button.flat, -linkbutton button.flat:hover { +button.flat.link.text-button { padding: 4px; border-color: transparent; } @@ -3120,122 +3214,121 @@ notebook { border-style: solid; border-color: @notebook_border; border-width: 1px; - /* -GtkNotebook-initial-gap: 0; - -GtkNotebook-arrow-spacing: 0; - -GtkNotebook-tab-curvature: 0; - -GtkNotebook-has-tab-gap: false;*/ - /* FIXME, why this doesn't work? */ - /*-GtkNotebook-arrow-scaling: 0.3; it's deprecated for sure */ } -notebook:hover { - /*-gtk-image-effect: highlight; INVALID*/ - color: @theme_fg_color; +notebook.frame:nth-child(even) { + border-radius: 0px 4px 4px 0px; } -notebook.frame.top { - border-top: 0px; +notebook.frame:nth-child(odd){ border-radius: 0px 0px 4px 4px; } -notebook.frame.bottom { - border-bottom: 0px; +notebook.frame:nth-child(first) { border-radius: 4px 4px 0px 0px; } -notebook.frame.left { - border-left: 0px; - border-radius: 0px 4px 4px 0px; -} - -notebook.frame.right { - border-right: 0px; +notebook.frame:nth-child(last){ border-radius: 4px 0px 0px 4px; } -notebook header { +notebook header.top { + border-width: 0px 0px 1px 0px; background-image: linear-gradient(to bottom, shade(@theme_bg_color, 0.86), shade(@theme_bg_color, 1.05)); - border-radius: 0px; -} - -notebook header.top { - border-width: 0px 0px 1px 0px; + box-shadow: inset 0px -1px alpha(shade(@button_border, 1.00), 0.90); } notebook header.bottom { border-width: 1px 0px 0px 0px; + background-image: linear-gradient(to top, + shade(@theme_bg_color, 0.86), + shade(@theme_bg_color, 1.05)); + box-shadow: inset 0px 1px alpha(shade(@button_border, 1.00), 0.90); } notebook header.left { border-width: 1px 1px 0px 0px; + background-image: linear-gradient(to right, + shade(@theme_bg_color, 0.86), + shade(@theme_bg_color, 1.05)); + box-shadow: inset -1px 0px alpha(shade(@button_border, 1.00), 0.90); } notebook header.right { border-width: 0px 0px 0px 1px; + background-image: linear-gradient(to left, + shade(@theme_bg_color, 0.86), + shade(@theme_bg_color, 1.05)); + box-shadow: inset 1px 0px alpha(shade(@button_border, 1.00), 0.90); } -/* tabs in view areas, ie. pluma-, caja-tabs */ -paned.horizontal notebook header.top { +notebook header tab { + border-color: transparent; border-width: 0px; + background-image: none; + background-color: transparent; } -notebook header.frame.top { - border-radius: 4px 4px 0px 0px; +notebook header tab label { + color: mix (@theme_fg_color, @theme_bg_color, 0.40); + font-weight: normal; } -notebook header.frame.bottom { - border-radius: 0px 0px 4px 4px; +notebook header .prelight-page, +notebook header .prelight-page label { + color: mix (@theme_fg_color, @theme_bg_color, 0.15); } -notebook header.frame.left { - border-radius: 4px 0px 0px 4px; +notebook header .active-page, +notebook header tab .active-page label { + color: @theme_fg_color; } -notebook header.frame.right { - border-radius: 0px 4px 4px 0px; +/* tabs in view areas, ie. pluma-, caja-tabs */ +paned.horizontal notebook header tab { + padding: 2px 4px; } -notebook tab { - border-style:solid; /*keep tabs from jumping on hover */ - border-color: transparent; - border-width: 1px; - background-image: none; - background-color: transparent; +paned.horizontal notebook header.top { + border-radius: 0px; + border-width: 0px; + box-shadow: none; } -notebook tab label { - color: mix (@theme_fg_color, @theme_bg_color, 0.40); - font-weight: normal; -} -notebook .hover-page, -notebook .hover-page label { - color: mix (@theme_fg_color, @theme_bg_color, 0.15); +paned.horizontal notebook header.top tab:active, +paned.horizontal notebook header.top tab:hover:active { + background-image: linear-gradient(to bottom, + shade(@theme_bg_color, 1.18), + shade(@theme_bg_color, 1.1)); + border-radius: 4px 4px 0 0; + border-width: 1px 1px 0 1px; + border-style: solid; + border-color: @notebook_border; + box-shadow: none; } -notebook .active-page, -notebook tab .active-page label { - color: @theme_fg_color; +paned.horizontal notebook header.top tab:hover { + background-image: linear-gradient(to bottom, + alpha(@theme_base_color, 0.0), + alpha(@theme_base_color, 0.3)); + border-radius: 4px 4px 0 0; + border-style: none; + 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); } +/* tabs in dialog windows */ /* horizontal tabs */ - -notebook header.top tab, -notebook header.bottom tab{ +notebook.frame header.top tab, +notebook.frame header.bottom tab { padding: 5px 20px 6px; } -paned.horizontal notebook header.top tab { - padding: 5px 4px; -} - -notebook header.top tab { - border-width: 1px 1px 0 1px; -} - -notebook header.top tab:active, -notebook header.top tab:active:hover { +notebook.frame header.top tab:active, +notebook.frame header.top tab:hover:active { background-image: linear-gradient(to bottom, shade(@theme_bg_color, 1.18), shade(@theme_bg_color, 1.1)); @@ -3246,23 +3339,21 @@ notebook header.top tab:active:hover { box-shadow: none; } -notebook header.top tab:hover { +notebook.frame header.top tab:hover { background-image: linear-gradient(to bottom, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); border-radius: 4px 4px 0 0; border-width: 1px 1px 0 1px; - border-style: solid; - border-color: @notebook_border; - box-shadow: none; -} - -notebook header.top tab:active { - border-bottom-color: @notebook_active_tab_border; + border-width: 0px 0px 1px 0; + border-style: none; + 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); } -notebook header.bottom tab:active, -notebook header.bottom tab:hover:active { +notebook.frame header.bottom tab:active, +notebook.frame header.bottom tab:hover:active { background-image: linear-gradient(to top, shade(@theme_bg_color, 1.18), shade(@theme_bg_color, 1.1)); @@ -3273,21 +3364,21 @@ notebook header.bottom tab:hover:active { box-shadow: none; } -notebook header.bottom tab:hover { +notebook.frame header.bottom tab:hover { background-image: linear-gradient(to top, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); border-radius: 0 0 4px 4px; - border-style: solid; - border-width: 0px 1px 1px 1px; - border-color: @notebook_border; + border-style: none; box-shadow: none; + box-shadow: inset 1px 0px alpha(shade(@button_border, 0.94), 0.80), + inset -1px 0px alpha(shade(@button_border, 0.94), 0.80), + inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); } /* vertical tabs */ - -notebook header.left tab, -notebook header.right tab{ +notebook.frame header.left tab, +notebook.frame header.right tab { padding: 5px 20px; } @@ -3300,18 +3391,21 @@ notebook header.left tab:hover:active { border-width: 1px 0px 1px 1px; border-color: @notebook_border; border-radius: 4px 0px 0px 4px; + box-shadow: none; } notebook header.left tab:hover { background-image: linear-gradient(to right, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); - border-style: solid; + border-style: none; border-width: 1px 0px 1px 1px; - border-color: @notebook_border; border-radius: 4px 0px 0px 4px; + 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 0px -1px alpha(shade(@button_border, 0.88), 0.90); } - + notebook header.right tab:active, notebook header.right tab:hover:active { background-image: linear-gradient(to left, @@ -3321,16 +3415,19 @@ notebook header.right tab:hover:active { border-width: 1px 1px 1px 0px; border-color: @notebook_border; border-radius: 0px 4px 4px 0px; + box-shadow: none; } notebook header.right tab:hover { background-image: linear-gradient(to left, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); - border-style: solid; + border-style: none; border-width: 1px 1px 1px 0px; - border-color: @notebook_border; border-radius: 0px 4px 4px 0px; + 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 0px -1px alpha(shade(@button_border, 0.88), 0.90); } notebook tab.reorderable-page:hover { @@ -3353,8 +3450,7 @@ notebook tab.reorderable-page:active { /* close button styling */ -notebook tab button { - color: mix (@theme_fg_color, @theme_bg_color, 0.85); +notebook button.flat.small-button { border-image: none; background-image: none; background-color: transparent; @@ -3366,21 +3462,22 @@ notebook tab button { -gtk-icon-shadow: none; } -notebook .hover-page button, -notebook tab.hover-page button, -notebook .active-page button, -notebook tab.active-page button { +notebook .prelight-page button.flat.small-button, +notebook .active-page button.flat.small-button { color: mix(@theme_fg_color, @theme_base_color, 0.6); -gtk-icon-shadow: 0 1px @button_text_shadow; } -notebook tab button:hover { +notebook button.flat:active, +notebook button.flat:active:hover, +notebook button.flat.small-button:active, +notebook button.flat.small-button:active: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); @@ -3392,40 +3489,75 @@ notebook tab button:hover:active { alpha(black, 0.13); } -notebook arrow { +notebook header.top tabs arrow.up, +notebook header.bottom tabs arrow.up { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); + color: @theme_fg_color; +} + +notebook header.top tabs arrow.down, +notebook header.bottom tabs arrow.down { + -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); color: @theme_fg_color; } -notebook arrow:hover, -notebook arrow:active { +notebook header.left tabs arrow.up, +notebook header.right tabs arrow.up { + -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); + color: @theme_fg_color; +} + +notebook header.left tabs arrow.down, +notebook header.right tabs arrow.down { + -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); + color: @theme_fg_color; +} + +notebook header tabs arrow { + color: @theme_fg_color; +} + +notebook header tabs arrow:hover, +notebook header tabs arrow:active { color: @theme_selected_bg_color; } -notebook arrow:disabled { +notebook header tabs arrow:disabled { color: rgba(141, 144, 145, 0.3); } -notebook arrow:backdrop { +notebook header tabs arrow:backdrop { color: rgba(84, 89, 90, 0.4); } -notebook arrow:backdrop:disabled { +notebook header tabs arrow:backdrop:disabled { color: #c7c7c7; } /************************* * Check and Radio items * *************************/ -check, + +check, radio, -.check, -.radio, -.check:disabled, -.radio:disabled { +check:disabled, +radio:disabled { background-color: transparent; border-style: none; } +/* move label to the right */ +check, +radio, +window.background.popup menuitem check, +window.background.popup menuitem radio, +window.background.popup menu menuitem check, +window.background.popup menu menuitem radio { + padding: 0px 6px 0px 0px; + background-repeat: no-repeat; + background-position: center; +} + checkbutton, checkbutton:hover, checkbutton:focus, @@ -3439,9 +3571,11 @@ checkbutton:checked:focus:hover:active { background-color: transparent; } -checkbutton.text-button, GtkRadioButton.text-button { +checkbutton.text-button, +radiobutton.text-button { padding: 1px; - outline-offset: 0; } + outline-offset: 0; +} /*************** * Header bars * @@ -3466,19 +3600,24 @@ headerbar:backdrop { background-color: @theme_bg_dark_color; } -headerbar button, -headerbar button:last-child, -headerbar button:first-child, -headerbar button:only-child { +headerbar button, +headerbar button:last-child, +headerbar button:first-child, +headerbar button:only-child, +headerbar .linked button, +headerbar .linked button:last-child, +headerbar .linked button:first-child, +headerbar .linked button:only-child { background-image: none; text-shadow: none; -gtk-icon-shadow: none; color: @theme_fg_dark_color; border-width: 1px; border-radius: 5px; + box-shadow: none; } -headerbar:backdrop button { +headerbar:backdrop button { border-width: 1px; border-radius: 5px; padding-left: 4px; @@ -3490,21 +3629,47 @@ headerbar:backdrop button { to (shade(@theme_unfocused_bg_color, 0.85))); } -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 { +headerbar button:hover, +headerbar button:checked, +headerbar button:hover:active, +headerbar button:checked:hover, +headerbar button:checked:hover:active, +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, +headerbar .linked button:hover, +headerbar .linked button:checked, +headerbar .linked button:hover:active, +headerbar .linked button:checked:hover, +headerbar .linked button:checked:hover:active, +headerbar .linked button:hover:first-child, +headerbar .linked button:checked:first-child, +headerbar .linked button:hover:active:first-child, +headerbar .linked button:checked:hover:first-child, +headerbar .linked button:checked:hover:active:first-child, +headerbar .linked button:hover:last-child, +headerbar .linked button:checked:last-child, +headerbar .linked button:hover:active:last-child, +headerbar .linked button:checked:hover:last-child, +headerbar .linked button:checked:hover:active:last-child, +headerbar .linked button:hover:only-child, +headerbar .linked button:checked:only-child, +headerbar .linked button:hover:active:last-child, +headerbar .linked button:checked:hover:only-child, +headerbar .linked button:checked:hover:active:only-child { + color: shade (@theme_selected_bg_color, 1.6); border-width: 1px; border-radius: 5px; background-image: -gtk-gradient (linear, @@ -3521,9 +3686,9 @@ headerbar button:checked:hover:active:only-child { inset 0px -1px shade(@selected_bg_color, 0.93); } -headerbar button:disabled, -headerbar button:disabled:last-child, -headerbar button:disabled: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; @@ -3533,21 +3698,42 @@ headerbar button:disabled:first-child { -gtk-icon-shadow: none; } -headerbar button *:disabled { +headerbar > button:disabled { background-color: transparent; text-shadow: none; -gtk-icon-shadow: none; } -headerbar button.text-button { - padding: 2px 6px; +headerbar > button.text-button, +headerbar > button.text-button.radio, +headerbar > .linked > button.text-button, +headerbar > .linked > button.text-button.radio { + padding: 4px 6px; } -headerbar button.image-button { +headerbar > button.image-button { padding: 5px 5px 6px 5px; } - -headerbar .title { + +headerbar > stackswitcher.linked.stack-switcher > button.text-button.radio { + border-right-width: 0px; + border-left-width: 0px; + border-radius: 0px; +} + +headerbar > stackswitcher.linked.stack-switcher > button.text-button.radio:first-child { + border-radius: 6px 0 0 6px; + border-width: 1px; + border-right-width: 0px; +} + +headerbar > stackswitcher.linked.stack-switcher > button.text-button.radio:last-child { + border-radius: 0 6px 6px 0; + border-width: 1px; + border-left-width: 0px; +} + +headerbar title { font: Bold 11; color: @theme_text_dark_color; } @@ -3558,19 +3744,19 @@ headerbar .subtitle { } headerbar GtkSeparatorToolItem, -headerbar .separator, -headerbar .separator:disabled, -headerbar .pane-separator { +headerbar separator, +headerbar separator:disabled, +headerbar paned > 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; + border-right-color: @theme_bg_dark_color; } /**************** * assistant * ****************/ -assistant .sidebar .highlight { +assistant .sidebar highlight { color: @theme_text_color; font: bold; } @@ -3589,32 +3775,21 @@ assistant .sidebar { * Switch * **********/ -switch { - padding: 8px; /* 8px to avoid padding list-row issue if active */ - -switch-slider-width: 45px; +switch, +switch:backdrop { + padding: 4px; font-weight: bold; font-size: smaller; - box-shadow: inset 0px 2px alpha(#fff, 0.11), - inset 2px 0px alpha(#fff, 0.09), - inset -2px 0px alpha(#fff, 0.09), - inset 0px -2px alpha(#fff, 0.07), - 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), - inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); -} - -switch trough, -switch trough:backdrop { + border-radius: 4px; border: 1px solid ; border-radius: 6px; color: @theme_fg_color; background-image: linear-gradient(to bottom, shade(@theme_bg_color, 0.9)); /* outer */ - border-top-color: transparent; - border-left-color: alpha (#000, 0.01); - border-right-color: alpha (#000, 0.01); + border-top-color: transparent; + border-left-color: alpha (#000, 0.01); + border-right-color: alpha (#000, 0.01); border-bottom-color: alpha (#000, 0.03); box-shadow: inset 0px 2px alpha(#fff, 0.11), inset 2px 0px alpha(#fff, 0.09), @@ -3627,16 +3802,16 @@ switch trough:backdrop { text-shadow: 0 1px rgba(0, 0, 0, 0.1); } -switch trough:active, -switch trough:backdrop:active { +switch:active, +switch:backdrop:active { background-image: linear-gradient(to bottom, @theme_selected_bg_color 2px, shade(@theme_selected_bg_color, 1.2)); color: white; } -switch trough:disabled, -switch trough:backdrop:disabled { +switch:disabled, +switch:backdrop:disabled { color: @insensitive_fg_color; border-color: @insensitive_border_color; background-image: none; @@ -3651,17 +3826,16 @@ switch trough:backdrop:disabled { switch slider, switch slider:backdrop { border: 1px solid; - border-radius: 6px; - color: @theme_fg_color; + border-radius: 4px; background-image: -gtk-gradient (linear, left top, left bottom, from (@button_gradient1), color-stop (0.48, @button_gradient2), color-stop (0.52, @button_gradient3), to (@button_gradient4)); - border-top-color: transparent; - border-left-color: alpha (#000, 0.01); - border-right-color: alpha (#000, 0.01); + border-top-color: transparent; + border-left-color: alpha (#000, 0.01); + border-right-color: alpha (#000, 0.01); border-bottom-color: alpha (#000, 0.03); box-shadow: inset 0px 2px alpha(#fff, 0.11), inset 2px 0px alpha(#fff, 0.09), @@ -3671,14 +3845,13 @@ switch slider:backdrop { inset 1px 0px alpha(shade(@button_border, 0.94), 0.80), inset -1px 0px alpha(shade(@button_border, 0.94), 0.80), inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); - padding: 2px 4px 2px 2px; + padding: 2px; + margin: -3px 0px -3px -3px; } -switch slider:active, -switch slider:backdrop:active { - color: @theme_fg_color; +switch:active slider, +switch:active slider:backdrop { border-color: transparent; - border-radius: 6px; background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), @@ -3689,11 +3862,11 @@ switch slider:backdrop:active { inset 1px 0px shade (@theme_fg_color, 1.0), inset -1px 0px shade (@theme_fg_color, 1.0), inset 0px -1px shade (@theme_fg_color, 1.0); - padding: 1px 3px 1px 1px; + margin: -3px -3px -3px 0px; } -switch slider:disabled, -switch slider:backdrop:disabled { +switch:disabled slider, +switch:disabled slider:backdrop { background-image: none; background-color: @insensitive_bg_color; border-color: alpha (#000, 0.00); @@ -3718,16 +3891,16 @@ list-row:selected switch:backdrop { border-color: shade(@theme_selected_bg_color, 0.4); } -list-row:selected switch slider:dir(rtl) { +list-row:selected switch.slider:dir(rtl) { border-left-color: @borders; } - list-row:selected switch slider:dir(ltr) { +list-row:selected switch.slider:dir(ltr) { border-right-color: @borders; } - list-row:selected switch slider, - list-row:selected switch slider:active { +list-row:selected switch.slider, +list-row:selected switch.slider:active { border-color: shade(@theme_selected_bg_color, 0.4); } @@ -3810,6 +3983,7 @@ iconview.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; } @@ -3825,14 +3999,12 @@ view, view text, .view text, iconview text, -textview 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, @@ -3841,8 +4013,8 @@ 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); +.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)), @@ -3851,12 +4023,20 @@ view text selection:focus, text-shadow: 0px 1px @theme_selected_shadow_color; text-shadow: none; } + +/* ie. coloe of selected icons if unfocused */ +.view:active { + background-color: shade(@theme_bg_color, 0.8); +} + .view text selection:focus, .view:selected:focus { text-shadow: 0px 1px @theme_selected_shadow_color; } treeview { +/* -GtkWidget-focus-line-width: 0; + -GtkWidget-focus-padding: 1;*/ } treeview.dnd { @@ -3866,7 +4046,6 @@ treeview.dnd { border-style: solid; } - treeview:selected:hover, /*does not work in recent GTK versions treeview row:nth-child(odd):selected:hover, @@ -3878,7 +4057,7 @@ notebook container treeview:selected { from (shade(@sidebar_selected_bg, 0.90)), color-stop (0.40, shade (@sidebar_selected_bg, 0.98)), to (shade(@sidebar_selected_bg, 1.05))); - color: @theme_selected_fg_color; + color: @theme_selected_fg_color; } treeview.view, @@ -3894,11 +4073,11 @@ treeview row:nth-child(even):hover,*/ treeview:hover, notebook container treeview:hover { background-image: -gtk-gradient (linear, - left top, - left bottom, - from (shade(@theme_bg_color, 1.05)), - color-stop (0.40, shade (@theme_bg_color, 1.13)), - to (shade(@theme_bg_color, 1.10))); + left top, + left bottom, + from (shade(@theme_bg_color, 1.05)), + color-stop (0.40, shade (@theme_bg_color, 1.13)), + to (shade(@theme_bg_color, 1.10))); color: shade (@theme_fg_color, 0.90); text-shadow: none; } @@ -3908,13 +4087,14 @@ treeview.view.separator { min-height: 2px; } -column-header { +treeview header { padding: 0px 2px; } -column-header button, -column-header button:focus { +treeview header button, +treeview 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)), @@ -3935,7 +4115,7 @@ column-header button:focus { inset 0px -1px alpha(#fff, 0.05); } -column-header button:hover { +treeview header button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_gradient1, 1.03)), @@ -3955,7 +4135,7 @@ column-header button:hover { inset 0px -1px shade(@selected_bg_color, 0.93); } -column-header button:focus:hover:active { +treeview header button:focus:hover:active { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), @@ -3966,7 +4146,7 @@ column-header button:focus:hover:active { box-shadow: none; } -column-header button:disabled { +treeview header button:disabled { background-image: none; background-color: @insensitive_bg_color; border-color: @insensitive_border_color; @@ -3974,11 +4154,11 @@ column-header button:disabled { box-shadow: none; } -column-header button GtkArrow { +treeview header button arrow { color: @internal_element_color; } -column-header:nth-child(last) button { +treeview header:nth-child(last) button { border-width: 0px 0px 1px 0px; } @@ -4035,14 +4215,14 @@ row:selected:focus:backdrop { background-image: none; } -.app-notification button, -.app-notification headerbar button.titlebutton, - headerbar .app-notification button.titlebutton, -.app-notification .titlebar button.titlebutton, -.titlebar .app-notification button.titlebutton, -.app-notification calendar.header button.titlebutton, -calendar.header .app-notification button.titlebutton, -.app-notification.frame button { +.app-notification button, +.app-notification 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, @@ -4056,26 +4236,26 @@ calendar.header .app-notification button.titlebutton, padding: 0 0px 2px 0px; } -.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 { +.app-notification button.flat, +.app-notification headerbar button.titlebutton, +headerbar .app-notification button.titlebutton, +.app-notification .titlebar button.titlebutton, +.titlebar .app-notification button.titlebutton, +.app-notification calendar.header button.titlebutton, +calendar.header .app-notification button.titlebutton, +.app-notification.frame button.flat, +.app-notification.frame headerbar button.titlebutton, +headerbar .app-notification.frame button.titlebutton, +.app-notification.frame .titlebar button.titlebutton, +.titlebar .app-notification.frame button.titlebutton, +.app-notification.frame calendar.header button.titlebutton, +calendar.header .app-notification.frame button.titlebutton { -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, @@ -4089,10 +4269,10 @@ calendar.header .app-notification.frame .titlebutton button { 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, @@ -4105,10 +4285,10 @@ calendar.header .app-notification.frame .titlebutton button { border-radius: 3px; } -.app-notification button:disabled, -.app-notification button:backdrop:disabled, -.app-notification.frame button:disabled, -.app-notification.frame button:backdrop:disabled { +.app-notification button:disabled, +.app-notification button:backdrop:disabled, +.app-notification.frame button:disabled, +.app-notification.frame button:backdrop:disabled { color: #878989; border-color: rgba(0, 0, 0, 0.7); background-image: linear-gradient(to bottom, @@ -4121,8 +4301,8 @@ calendar.header .app-notification.frame .titlebutton button { 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, @@ -4161,11 +4341,10 @@ treeview.view.expander:selected:hover { color: @theme_selected_fg_color; } -expander arrow{ +expander arrow { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } - expander arrow:dir(rtl) { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); } @@ -4179,25 +4358,23 @@ expander arrow:checked { } /* why this weird padding, possible issue with gtk+-3.18 ? */ -expander { - -expander-expander-size: 14; +expander arrow { + min-width: 16px; + min-height: 16px; padding: 0px 4px 0px 0px; } -expander, -.expander { +expander { color: @theme_fg_color; border-color: @theme_fg_color; } -expander:checked, -.expander:checked { +expander:checked { color: @theme_selected_bg_color; border-color: @theme_selected_bg_color; } -expander:hover, -.expander:hover { +expander:hover { color: @internal_element_color; border-color: @internal_element_color; } @@ -4234,14 +4411,16 @@ list .separator.horizontal { border-width: 0px; } -list-row { +list row, +list row.activatable { padding: 2px; - transition: all 200ms ease-in; + transition: all 400ms ease-in; background-image: none; background-color: @theme_base_color; } -list-row:hover { +list row:hover, +list row.activatable:hover { border-color: shade (@theme_selected_bg_color, 1.6); background-image: -gtk-gradient (linear, left top, @@ -4260,9 +4439,12 @@ list-row:hover { 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, +list row.activatable:selected, +list row.activatable:selected:hover, +list row.activatable:selected:hover:active { border-width: 0; border-radius: 0px; border-style: none; @@ -4274,8 +4456,10 @@ list-row:selected:hover:active { color: @theme_selected_fg_color; } -list-row:selected:backdrop, -list-row:selected:backdrop:hover { +list row:selected:backdrop, +list row:selected:backdrop:hover, +list row.activatable:selected:backdrop, +list row.activatable:selected:backdrop:hover { border-width: 0; border-style: solid; border-color: shade (@theme_bg_color, 0.85); @@ -4313,9 +4497,9 @@ calendar.header { } calendar.expander, -calendar button, -calendar button.flat, -calendar button:disabled { +calendar.button, +calendar.button.flat, +calendar.button:disabled { border-color: transparent; background-image: none; background-color: transparent; @@ -4324,15 +4508,15 @@ calendar button:disabled { } /* disable shadows and button background on arrows */ -calendar button:first-child, -calendar button:last-child { +calendar.button:first-child, +calendar.button:last-child { box-shadow: none; background-image: none; } /* disable button background on arrows */ -calendar button:hover:first-child, -calendar 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), @@ -4341,7 +4525,7 @@ calendar button:hover:last-child { inset 0px -1px shade(@selected_bg_color, 0.93); } -.highlight, +highlight, calendar.highlight { background-color: @theme_selected_bg_color; color: @theme_selected_fg_color; @@ -4352,7 +4536,7 @@ calendar.highlight { } menuitem calendar, -menuitem calendar button, +menuitem calendar.button, menuitem calendar.header, menuitem calendar.view { background-color: shade(@theme_bg_dark_color, 0.82); @@ -4392,54 +4576,54 @@ infobar { 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; -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: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 { +entry.info, +entry.info:focus, +.info button, +.info button:disabled, +.info button:checked, +entry.warning, +entry.warning:focus, +.warning button, +.warning button:disabled, +.warning button:checked, +entry.error, +entry.error:focus, +.error button, +.error button:disabled, +.error button:checked, +entry.question, +entry.question:focus, +.question button, +.question button:disabled, +.question button:checked { color: @theme_fg_color; border-color: darker(@info_bg_color); border-style: solid; @@ -4461,9 +4645,9 @@ infobar.horizontal.info .horizontal { color: @question_fg_color; } -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 { +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; } @@ -4502,32 +4686,32 @@ dialog scrolledwindow.frame viewport .vertical expander .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:disabled { +.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: 6px 2px; /*this looks about right on the Caja run/display dialog*/ + padding: 6px 2px; } /* 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:disabled: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; @@ -4535,15 +4719,15 @@ dialog scrolledwindow.frame viewport .vertical expander .vertical { } /* 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:disabled: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; @@ -4551,22 +4735,21 @@ dialog scrolledwindow.frame viewport .vertical expander .vertical { } /* 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:disabled:last-child { - padding-left: 6px; - padding-right: 6px; +.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: 6px 2px; 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, @@ -4574,24 +4757,20 @@ dialog scrolledwindow.frame viewport .vertical expander .vertical { color-stop (0.48, @button_gradient2), color-stop (0.52, @button_gradient3), to (@button_gradient4)); - box-shadow: inset 0px 2px alpha(#fff, 0.11), - inset 2px 0px alpha(#fff, 0.09), - inset -2px 0px alpha(#fff, 0.09), - inset 0px -2px alpha(#fff, 0.07), - inset 0px 1px alpha(shade(@button_border, 1.00), 0.70), + 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), 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)), @@ -4600,7 +4779,7 @@ dialog scrolledwindow.frame viewport .vertical expander .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)), @@ -4609,13 +4788,17 @@ dialog scrolledwindow.frame viewport .vertical expander .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:disabled { +.dialog-action-area.linked button.suggested-action, +.dialog-action-area.linked button.suggested-action:active, +.dialog-action-area.linked button.suggested-action:checked, +.dialog-action-area.linked button.suggested-action:disabled { box-shadow: none; } +.dialog-action-area.linked button label { + padding: 2px 0px 0px 0px; +} + /************** * Dim labels * **************/ @@ -4651,7 +4834,7 @@ dialog scrolledwindow.frame viewport .vertical expander .vertical { background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4); } -overlay.osd { +GtkOverlay.osd { background-color: transparent; } @@ -4660,15 +4843,11 @@ overlay.osd { background-origin: border-box; } +.osd button, .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:hover:active { border-width: 1px; border-style: solid; border-image: none; @@ -4685,15 +4864,13 @@ overlay.osd { border-color: @osd_button_border; } -.osd button, -.osd button:hover, -.osd button:checked { +.osd button:hover, +.osd button:checked { background-color: transparent; box-shadow: none; } -.osd button:disabled, -.osd button:disabled { +.osd button:disabled { background-image: none; border-color: @osd_button_bg_insensitive; background-color: transparent; @@ -4701,17 +4878,14 @@ overlay.osd { color: @osd_button_fg_insensitive; } -.osd button:checked:disabled, -.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:focus { padding: 4px; background-image: linear-gradient(to bottom, @osd_button_bg_a, @@ -4723,8 +4897,7 @@ overlay.osd { } .osd button:hover, -.osd button:hover, -.osd .linked button:hover { +.osd .linked button:hover { background-image: linear-gradient(to bottom, @osd_button_bg_hover_a, @osd_button_bg_hover_b 68%, @@ -4737,12 +4910,7 @@ overlay.osd { .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.menu-button:checked { background-image: linear-gradient(to bottom, @osd_button_bg_active_a, @osd_button_bg_active_b 68%, @@ -4751,13 +4919,13 @@ overlay.osd { text-shadow: 0 -1px @osd_button_shadow; } -.osd GtkMenuButton button:checked { +.osd button.menu-button:checked { background-color: transparent; border-color: @osd_button_border; } /* gnome-weather */ -.linked.stack-switcher.osd button { +.linked stackswitcher.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)); @@ -4765,7 +4933,7 @@ overlay.osd { box-shadow: none; } -.linked.stack-switcher.osd button:hover { +.linked stackswitcher.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)); @@ -4773,34 +4941,34 @@ overlay.osd { } -.linked.stack-switcher.osd button { +.linked stackswitcher.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 stackswitcher.osd button:first-child { border-width: 1px 1px 1px 1px; } -.linked.stack-switcher.osd button:last-child { +.linked stackswitcher.osd button:last-child { border-width: 1px 1px 1px 0px; } -.linked.stack-switcher.osd button:only-child { +.linked stackswitcher.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:disabled { - border-color: @osd_button_bg_insensitive; +.osd .horizontal .horizontal button:disabled { + border-color: @osd_button_bg_disabled; } -.osd .horizontal .horizontal .label { +.osd .horizontal .horizontal label { padding: 5px 5px; background-color: transparent; background-image: linear-gradient(to bottom, @@ -4813,13 +4981,7 @@ overlay.osd { border-radius: 5px; } -/* ie. volume button */ -.osd .horizontal button, -.osd .horizontal button:hover { - padding: 5px 8px; -} - -.osd toolbar { +toolbar.osd { color: @osd_fg; text-shadow: 0 1px @osd_text_shadow; padding: 10px; @@ -4834,62 +4996,76 @@ overlay.osd { -GtkToolbar-button-relief: normal; } -.osd toolbar button, -.osd toolbar button:hover, -.osd toolbar .linked button { - padding: 6px; +toolbar.osd button, +toolbar.osd button:hover, +toolbar.osd button:focus, +toolbar.osd button:focus:hover, +toolbar.osd button:focus:hover:active, +toolbar.osd button:hover:active, +toolbar.osd .linked button +toolbar.osd .linked button:hover, +toolbar.osd .linked button:hover:active, +toolbar.osd .linked button:focus, +toolbar.osd .linked button:focus:hover, +toolbar.osd .linked button:focus:hover:active, +toolbar.osd button.scale.flat.image-button { + padding: 8px; border-width: 1px; border-radius: 5px; } -.osd toolbar button:first-child, -.osd toolbar .linked button:first-child { +toolbar.osd button:first-child, +toolbar.osd .linked button:first-child, +toolbar.osd .linked button:focus:hover:first-child, +toolbar.osd .linked button:focus:hover:active: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 { +toolbar.osd button:last-child, +toolbar.osd .linked button:last-child, +toolbar.osd .linked button:focus:hover:last-child, +toolbar.osd .linked button:focus:hover:active: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 { +toolbar.osd button:only-child, +toolbar.osd .linked button:only-child, +toolbar.osd toolitem button, +toolbar.osd toolitem button:only-child, +toolbar.osd toolitem button:last-child, +toolbar.osd toolitem button:first-child { border-width: 1px; border-radius: 5px; border-style: solid; box-shadow: none; } -.osd toolbar .separator { +toolbar.osd separator { color: shade(@osd_lowlight, 0.80); } /* used by gnome-settings-daemon's media-keys OSD and Epiphany */ -.osd.trough { +.osd trough { background-color: @osd_trough_bg; border-width: 0; } -.osd.progressbar { +.osd progressbar { background-color: @osd_fg; } -.osd scale trough:disabled, -.osd scale trough.highlight:disabled { +.osd scale trough:disabled, +.osd scale trough.highlight:disabled { background-image: none; background-color: transparent; } -.osd scale-popup popover.background { +.osd popover.background.scale-popup { color: @osd_fg; border-style: solid; border-width: 1px; @@ -4901,7 +5077,7 @@ overlay.osd { background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4); } -.osd popover scale-popup .flat button.image-button { +.osd popover.background.scale-popup button.flat.image-button { background-image: linear-gradient(to bottom, @osd_button_bg_a, @osd_button_bg_b 68%, @@ -4913,16 +5089,16 @@ overlay.osd { padding: 2px; } -.osd popover scale-popup .flat button.image-button:hover { +.osd popover.background.scale-popup button.flat.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; INVALID */ +/* -gtk-image-effect: highlight; */ } -.osd popover scale-popup .flat button.image-button:disabled { +.osd popover.background.scale-popup button.flat.image-button:disabled { background-image: none; background-color: transparent; border-image: none; @@ -4931,15 +5107,17 @@ overlay.osd { } .osd progressbar, -progressbar.osd { +progressbar .osd { padding: 0; - -progressbar-xspacing: 0; - -progressbar-yspacing: 3px; +} + +.osd progressbar.horizontal, +progressbar.horizontal .osd { min-height: 3px; } .osd progressbar trough, -progressbar.osd trough { +progressbar .osd trough { padding: 0; border-image: none; border-style: none; @@ -4949,32 +5127,31 @@ progressbar.osd trough { border-radius: 0; } -.osd progressbar.progressbar, -progressbar.osd.progressbar { +.osd progressbar, +progressbar .osd { border-style: none; background-color: @theme_selected_bg_color; background-image: none; border-radius: 0; } -.osd .view, -.osd.view { +.osd view { background-color: @osd_view_bg; } -.osd .scrollbar.trough { +.osd scrollbar trough.trough { background-color: @osd_scrollbar_trough; } -.osd .scrollbar.slider { +.osd scrollbar trough.slider { background-color: @osd_scrollbar_slider; } -.osd .scrollbar.slider:hover { - background-color: @osd_scrollbar_slider_hover; +.osd scrollbar trough.slider:hover { + background-color: @osd_scrollbar_slider_prelight; } -.osd .scrollbar.slider:active { +.osd scrollbar trough.slider:active { background-color: @osd_scrollbar_slider_active; } @@ -5001,8 +5178,9 @@ progressbar.osd.progressbar { * Popovers * *************/ -popover { +popover.background { background-clip: initial; + color: @theme_fg_dark_color; margin: 10px; padding: 2px; border-color: @borders; @@ -5015,29 +5193,28 @@ popover { -gtk-icon-shadow: none; } -popover > list, +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 { +popover > toolbar popover.osd > toolbar, +popover > .inline-toolbar popover.osd > toolbar, +popover > searchbar popover.osd > toolbar, +popover > .location-bar popover.osd > toolbar, +popover > toolbar popover.osd > .inline-toolbar, +popover > .inline-toolbar .popover.osd > .inline-toolbar, +popover > searchbar popover.osd > .inline-toolbar, +popover > .location-bar popover.osd > .inline-toolbar, +popover > toolbar popover.osd > searchbar, +popover > .inline-toolbar popover.osd > searchbar, +popover > searchbar popover.osd > searchbar, +popover > .location-bar popover.osd > searchbar +popover > .inline-toolbar popover.osd > .location-bar, +popover > searchbar popover.osd > .location-bar, +popover > .location-bar popover.osd > .location-bar { border-style: none; background-color: transparent; } -popover .separator { +popover separator { font-size: 80%; font-weight: bold; color: alpha(@theme_fg_dark_color,0.6); @@ -5055,27 +5232,27 @@ popover.osd { 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; -gtk-icon-shadow: 0 -1px @osd_text_shadow; } -popover.osd button:checked { +popover.osd button:checked { box-shadow: none; } -popover.osd button:disabled { +popover.osd button:disabled { color: alpha(@theme_selected_fg_color, 0.4); } -popover scale-popup .flat button.image-button:disabled { +popover.background.scale-popup button.flat.image-button:disabled { background-image: none; background-color: transparent; border-image: none; @@ -5083,7 +5260,7 @@ popover scale-popup .flat button.image-button:disabled { box-shadow: none; } -popover scale-popup .flat button.image-button { +popover.background.scale-popup button.flat.image-button { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -5095,29 +5272,29 @@ popover scale-popup .flat button.image-button { inset 0px -1px shade(@selected_bg_color, 0.93); } -popover scale-popup .flat button.image-button:hover { - /* -gtk-image-effect: highlight; INVALID*/ +popover.background.scale-popup button.flat.image-button:hover { +/* -gtk-image-effect: highlight; */ } -popover scale-popup scale .trough, -popover scale-popup scale .trough.vertical { +popover.background.scale-popup scale .trough, +popover.background.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.background.scale-popup scale .trough.highlight, +popover.background.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 popover.background.scale-popup scale trough { border-color: @osd_scale_border; border-image: none; background-image: linear-gradient(to bottom, @@ -5126,19 +5303,19 @@ popover scale-popup scale .trough.highlight.vertical { background-color: transparent; } -.osd scale trough.highlight, -.osd scale-popup popover scale trough.highlight { +.osd .scale.trough.highlight, +.osd popover.background.scale-popup 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 button.image-button:hover { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -5149,7 +5326,7 @@ popover .image-button:hover { inset 0px -1px shade(@selected_bg_color, 0.93); } -popover .image-button:disabled { +popover button.image-button:disabled { background-image: none; background-color: transparent; box-shadow: inset 0px 1px @insensitive_border_color, @@ -5158,45 +5335,54 @@ popover .image-button:disabled { inset 0px -1px @insensitive_border_color; } -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; +modelbutton.flat, +.linked button.image-button.model { + min-height: 24px; +} + +modelbutton.flat arrow.left { + -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); +} + +modelbutton.flat arrow.right { + -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); } -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 { +modelbutton.flat, +modelbutton.flat:first-child, +modelbutton.flat:last-child, +modelbutton.flat:only-child { + background-image: none; + color: @theme_fg_dark_color; + border-radius: 4px; + padding: 6px 0px 6px 6px; +} + +modelbutton.flat:checked, +modelbutton.flat:disabled, +modelbutton.flat:checked:disabled, +modelbutton.flat, +modelbutton.flat:focus, +modelbutton.flat:checked:focus, +modelbutton.flat:checked:first-child, +modelbutton.flat:disabled:first-child, +modelbutton.flat:checked:disabled:first-child, +modelbutton.flat:first-child, +modelbutton.flat:focus:first-child, +modelbutton.flat:checked:focus:first-child, +modelbutton.flat:checked:last-child, +modelbutton.flat:disabled:last-child, +modelbutton.flat:checked:disabled:last-child, +modelbutton.flat:last-child, +modelbutton.flat:focus:last-child, +modelbutton.flat:checked:focus:last-child, +modelbutton.flat:checked:only-child, +modelbutton.flat:disabled:only-child, +modelbutton.flat:checked:disabled:only-child, +modelbutton.flat:only-child, +modelbutton.flat:focus:only-child, +modelbutton.flat:checked:focus:only-child, +.linked button.image-button.model { background-color: shade (@theme_bg_dark_color, 1.0); background-image: none; border-color: transparent; @@ -5206,48 +5392,36 @@ modelbutton button:checked:focus:only-child, border-radius: 3px; } -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 { +modelbutton.flat:checked:hover:only-child, +modelbutton.flat:checked:hover:active:only-child, +modelbutton.flat:focus:hover:active:only-child, +modelbutton.flat:hover:active:only-child, +modelbutton.flat:hover:only-child, +modelbutton.flat:selected:only-child, +modelbutton.flat:checked:hover:first-child, +modelbutton.flat:checked:hover:active:first-child, +modelbutton.flat:focus:hover:active:first-child, +modelbutton.flat:hover:active:first-child, +modelbutton.flat:hover:first-child, +modelbutton.flat:selected:first-child, +modelbutton.flat:checked:hover:last-child, +modelbutton.flat:checked:hover:active:last-child, +modelbutton.flat:focus:hover:active:last-child, +modelbutton.flat:hover:active:last-child, +modelbutton.flat:hover:last-child, +modelbutton.flat:selected:last-child, +modelbutton.flat:checked:hover, +modelbutton.flat:checked:hover:active, +modelbutton.flat:focus:hover:active, +modelbutton.flat:hover:active, +modelbutton.flat:hover, +modelbutton.flat:selected { 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))); background-color: shade (@theme_bg_dark_color, 1.2); - color: shade (@theme_selected_bg_color, 1.3); + color: shade (@theme_selected_bg_color, 1.6); text-shadow: none; border-width: 0; border-color: transparent; @@ -5258,11 +5432,26 @@ modelbutton button:selected, inset 0px -1px shade(@selected_bg_color, 0.93); } -.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 { +.linked button.image-button.model, +.linked button.image-button.model:focus, +.linked button.image-button.model:first-child, +.linked button.image-button.model:focus:first-child, +.linked button.image-button.model:last-child, +.linked button.image-button.model:focus:last-child { + background-color: shade (@theme_bg_dark_color, 1.0); + background-image: none; + border-color: transparent; + border-image: none; + border-style: none; + box-shadow: none; + border-radius: 3px; +} + +.linked button.image-button.model:checked, +.linked button.image-button.model:hover, +.linked button.image-button.model:hover:active, +.linked button.image-button.model:checked:hover, +.linked button.image-button.model:checked:hover:active { color: @fg_dark_color; background-image: -gtk-gradient (linear, left top, left bottom, @@ -5270,41 +5459,41 @@ modelbutton button:selected, to (shade(@menu_bg_dark_color, 1.17))); 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), - inset -1px 0px shade(@selected_bg_color, 0.93); + inset -1px 0px shade(@selected_bg_color, 0.93), + inset 0px -1px shade(@selected_bg_color, 0.93); } /* middle button*/ -.linked modelbutton button:hover, -.linked modelbutton button:hover:active, -.linked modelbutton button:checked:hover, -.linked modelbutton button:checked:hover:active { +.linked button.image-button.model:hover, +.linked button.image-button.model:hover:active, +.linked button.image-button.model:checked:hover, +.linked button.image-button.model:checked:hover:active { border-right-width: 0px; border-left-width: 0px; border-radius: 0; } /* left button*/ -.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 button.image-button.model:hover:first-child, +.linked button.image-button.model:hover:active:first-child, +.linked button.image-button.model:checked:hover:first-child, +.linked button.image-button.model:checked:hover:active:first-child { border-right-width: 0px; border-radius: 6px 0 0 6px; } /* right button*/ -.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 { +.linked button.image-button.model:hover:last-child, +.linked button.image-button.model:hover:active:last-child, +.linked button.image-button.model:checked:hover:last-child, +.linked button.image-button.model:checked:hover:active:last-child { border-left-width: 0px; border-radius: 0 6px 6px 0; } popover button.default.text-button.suggested-action { background-image: none; - color: @theme_fg_color; + color: @theme_fg_dark_color; text-shadow: none; border-width: 0; border-color: transparent; @@ -5312,6 +5501,14 @@ popover button.default.text-button.suggested-action { padding: 5px 4px; } +/* override theme_bg color */ +popover button.default.text-button.suggested-action:disabled { + background-image: -gtk-gradient (linear, + left top, left bottom, + from (shade(@menu_bg_dark_color, 1.0)), + to (shade(@menu_bg_dark_color, 1.0))); +} + popover button.default.text-button.suggested-action:hover { background-image: -gtk-gradient (linear, left top, left bottom, @@ -5351,14 +5548,6 @@ entry.cursor-handle.bottom, * 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, @@ -5397,106 +5586,233 @@ decoration{ background-color: @theme_bg_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; +.titlebar button.titlebutton, +.titlebar button.titlebutton:first-child, +.titlebar button.titlebutton:last-child, +.titlebar button.titlebutton:only-child { + -gtk-icon-shadow: 0px 1px @theme_shadow_dark_color; + color: @wm_title; + background: none; + padding: 5px 5px 6px 5px; + border-width: 1px; + border-radius: 5px; + border-color: transparent; + border-style: solid; + border-image: none; + box-shadow: inset 0px 1px shade(@theme_bg_dark_color, 1.05), + inset 1px 0px shade(@theme_bg_dark_color, 0.97), + inset 0px -1px shade(@theme_bg_dark_color, 0.93), + inset -1px 0px shade(@theme_bg_dark_color, 0.93); +} + +.titlebar button.titlebutton { + -gtk-icon-shadow: 0px 1px @theme_shadow_dark_color; + color: @wm_title; + padding: 5px 5px 6px 5px; + border-style: solid; + border-image: none; + border-radius: 5px; + border-width: 1px; + border-color: transparent; + background: none; + background-color: transparent; +} + +.titlebar button.titlebutton:hover, +.titlebar button.titlebutton:focus:hover, +.titlebar button.titlebutton:focus:hover:active, +.titlebar button.titlebutton:checked, +.titlebar button.titlebutton:checked:focus { + 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))); + background-color: transparent; + border-radius: 5px; + border-width: 1px; + border-color: transparent; + 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); +} + +.titlebar button.titlebutton:backdrop { + background: none; + color: @theme_text_dark_color; + border-image: none; + -gtk-icon-shadow: none; +} + +/* Middle titlebar-button */ +.titlebar .linked button.titlebutton, +.titlebar .linked button.titlebutton:focus, +.titlebar .linked button.titlebutton:disabled, +.titlebar .raised.linked button.titlebutton, +.titlebar .raised.linked button.titlebutton:focus, +.titlebar .raised.linked button.titlebutton:disabled { + 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: 0px; + border-left-width: 0px; + border-radius: 0; + padding: 5px 5px 6px 5px; +} + +.titlebar .linked button.titlebutton:hover, +.titlebar .linked button.titlebutton:checked, +.titlebar .linked button.titlebutton:focus:hover:active, +.titlebar .linked button.titlebutton:checked:hover, +.titlebar .linked button.titlebutton:checked:focus:hover:active, +.titlebar .raised.linked button.titlebutton:hover, +.titlebar .raised.linked button.titlebutton:checked, +.titlebar .raised.linked button.titlebutton:focus:hover:active, +.titlebar .raised.linked button.titlebutton:checked:hover, +.titlebar .raised.linked button.titlebutton:checked:focus:hover:active { + 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: 0px; + border-left-width: 0px; + border-radius: 0; + padding: 5px 5px 6px 5px; +} + +/* Leftmost titlebar-button */ +.titlebar .linked button.titlebutton:first-child, +.titlebar .linked button.titlebutton:focus:first-child, +.titlebar .linked button.titlebutton:disabled:first-child, +.titlebar .raised.linked button.titlebutton:first-child, +.titlebar .raised.linked button.titlebutton:focus:first-child, +.titlebar .raised.linked button.titlebutton:disabled: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-color: transparent; - border-style: solid; - border-image: none; - box-shadow: inset 0px 1px shade(@theme_bg_dark_color, 1.05), - inset 1px 0px shade(@theme_bg_dark_color, 0.97), - inset 0px -1px shade(@theme_bg_dark_color, 0.93), - inset -1px 0px shade(@theme_bg_dark_color, 0.93); + border-bottom-right-radius: 0; + border-top-right-radius: 0; + padding: 5px 5px 6px 5px; } -.titlebar .titlebutton { - -gtk-icon-shadow: 0px 1px @theme_shadow_dark_color; - color: @wm_title; +.titlebar .linked button.titlebutton:hover:first-child, +.titlebar .linked button.titlebutton:checked:first-child, +.titlebar .linked button.titlebutton:focus:hover:active:first-child, +.titlebar .linked button.titlebutton:checked:hover:first-child, +.titlebar .linked button.titlebutton:checked:focus:hover:active:first-child, +.titlebar .raised.linked button.titlebutton:hover:first-child, +.titlebar .raised.linked button.titlebutton:checked:first-child, +.titlebar .raised.linked button.titlebutton:focus:hover:active:first-child, +.titlebar .raised.linked button.titlebutton:checked:hover:first-child, +.titlebar .raised.linked button.titlebutton: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; - border-style: solid; - border-image: none; + 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.titlebutton:last-child, +.titlebar .linked button.titlebutton:focus:last-child, +.titlebar .linked button.titlebutton:disabled:last-child, +.titlebar .raised.linked button.titlebutton:last-child, +.titlebar .raised.linked button.titlebutton:focus:last-child, +.titlebar .raised.linked button.titlebutton:disabled: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-color: transparent; - background: none; - background-color: transparent; + border-left-width: 0px; + border-radius: 5px; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + padding: 5px 5px 6px 5px; } -.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, -.titlebar .titlebutton:checked, -.titlebar .titlebutton:checked:focus { +.titlebar .linked button.titlebutton:hover:last-child, +.titlebar .linked button.titlebutton:checked:last-child, +.titlebar .linked button.titlebutton:focus:hover:active:last-child, +.titlebar .linked button.titlebutton:checked:hover:last-child, +.titlebar .linked button.titlebutton:checked:focus:hover:active:last-child, +.titlebar .raised.linked button.titlebutton:hover:last-child, +.titlebar .raised.linked button.titlebutton:checked:last-child, +.titlebar .raised.linked button.titlebutton:focus:hover:active:last-child, +.titlebar .raised.linked button.titlebutton:checked:hover:last-child, +.titlebar .raised.linked button.titlebutton: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))); - background-color: transparent; - border-radius: 5px; + 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-color: transparent; - box-shadow: inset 0px 1px shade(@theme_bg_dark_color, 1.05), - inset 1px 0px shade(@theme_bg_dark_color, 0.97), - inset 0px -1px shade(@theme_bg_dark_color, 0.93), - inset -1px 0px shade(@theme_bg_dark_color, 0.93); -} - -.titlebar .titlebutton:backdrop { - background: none; - color: @theme_text_dark_color; - border-image: none; - -gtk-icon-shadow: none; + border-left-width: 0px; + border-radius: 5px; + border-bottom-left-radius: 0; + border-top-left-radius: 0; + padding: 5px 5px 6px 5px; } -/* Middle titlebar-button */ -.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 { +/* Linked single titlebar-button */ +.titlebar .linked button.titlebutton:only-child, +.titlebar .linked button.titlebutton:focus:only-child, +.titlebar .linked button.titlebutton:disabled:only-child, +.titlebar .raised.linked button.titlebutton:only-child, +.titlebar .raised.linked button.titlebutton:focus:only-child, +.titlebar .raised.linked button.titlebutton:disabled: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-right-width: 0px; - border-left-width: 0px; - border-radius: 0; + border-radius: 5px; 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.titlebutton:hover:only-child, +.titlebar .linked button.titlebutton:checked:only-child, +.titlebar .linked button.titlebutton:focus:hover:active:only-child, +.titlebar .linked button.titlebutton:checked:hover:only-child, +.titlebar .linked button.titlebutton:checked:focus:hover:active:only-child, +.titlebar .raised.linked button.titlebutton:hover:only-child, +.titlebar .raised.linked button.titlebutton:checked:only-child, +.titlebar .raised.linked button.titlebutton:focus:hover:active:only-child, +.titlebar .raised.linked button.titlebutton:checked:hover:only-child, +.titlebar .raised.linked button.titlebutton:checked:focus:hover:active:only-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@menu_bg_dark_color, 2.03)), @@ -5507,27 +5823,90 @@ decoration{ 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 decoration { + box-shadow: none; +} + +.background.csd decoration { + 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 */ +decoration: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; +} + +.tiled decoration { + border-radius: 0; +/* background-color: @theme_bg_color; */ +} + +.ssd decoration { + box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); +} + +.solid-csd decoration { + border-radius: 0; + margin: 1px; + background-color: @wm_bg_a; + border: solid 1px @wm_csd_solid_border_color; + box-shadow: none; +} + +.csd.popup decoration { + border-radius: 0; + box-shadow: none; +} + +tooltip.csd decoration { + border-radius: 3px; + box-shadow: 0 1px 5px shade (@theme_selected_bg_color, 1.3); + padding: 4px 4px; +} + +messagedialog.csd decoration { + border-radius: 7px; + box-shadow: 0 1px 5px shade (@theme_selected_bg_color, 1.3); } /********************* * Spinner Animation * *********************/ - -/*taken straight from Adwaita, it works */ +/* This is could be CPU-intensive */ @keyframes spin { - to { - -gtk-icon-transform: rotate(1turn); } } + 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"); */} + -gtk-icon-source: -gtk-icontheme("process-working-symbolic"); +} + spinner:checked { opacity: 1; - animation: spin 1s linear infinite; } - spinner:checked:disabled { - opacity: 0.5; } + animation: spin 1s linear infinite; +} + +spinner:checked:disabled { + opacity: 0.5; +} /************************ * overshoot/undershoot * @@ -5715,17 +6094,18 @@ undershoot.right { * GtkStack * ************/ -stack .horizontal .vertical .frame { +stack .horizontal .vertical frame { background-color: shade (@theme_bg_color, 1.1); border-width: 1px; border-color: @notebook_border; } -stackSidebar.sidebar .separator.horizontal { - /* -GtkWidget-separator-height: 0px; */ +stacksidebar.sidebar list row.activatable:hover { + border-radius: 3px; + border-style: none; } -stack .linked.vertical .entry { +stack .linked.vertical entry { border-radius: 5px; border-style: solid; border-width: 1px 1px 0px 1px; @@ -5740,103 +6120,115 @@ stack .linked.vertical .entry { } -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 { +stack .vertical.linked > combobox:first-child > button.combo:first-child, +stack .vertical.linked > combobox:first-child > button.combo:hover:first-child, +stack .vertical.linked > combobox:first-child > button.combo:focus:first-child, +stack .vertical.linked > combobox:first-child > button.combo:focus:hover:first-child, +stack .vertical.linked > combobox:first-child > button.combo:checked:first-child, +stack .vertical.linked > combobox:first-child > button.combo:disabled:first-child { border-radius: 5px 5px 0 0; border-width: 1px; - border-bottom-width: 1px; border-style: solid; + border-color: shade(@notebook_border, 1.0); padding: 3px 5px; } -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 { +stack .vertical.linked > combobox:first-child > button.combo:first-child, +stack .vertical.linked > combobox:first-child > button.combo:focus:first-child { + box-shadow: none; +} + +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; border-style: solid; + border-color: shade(@notebook_border, 1.0); padding: 5px 5px; + box-shadow: none; } -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 { +stack .linked.vertical spinbutton.horizontal { + border-style: none; +} + +stack .linked.vertical spinbutton.horizontal entry, +stack .linked.vertical spinbutton.horizontal entry:hover, +stack .linked.vertical spinbutton.horizontal entry:focus, +stack .linked.vertical spinbutton.horizontal entry:active, +stack .linked.vertical spinbutton.horizontal entry:checked, +stack .linked.vertical spinbutton.horizontal entry:disabled { border-radius: 0px; - border-width: 1px; + border-width: 0px 0px 1px 1px; border-style: solid; - padding: 6px 5px; -} - -/* all to zero */ -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-color: shade(@notebook_border, 1.0); + padding: 0px 5px; +} + +stack .linked.vertical spinbutton.horizontal entry, +stack .linked.vertical spinbutton.horizontal entry:focus, +stack .linked.vertical spinbutton.horizontal entry:active { + box-shadow: none; +} + +stack .linked.vertical spinbutton.horizontal button, +stack .linked.vertical spinbutton.horizontal button:last-child, +stack .linked.vertical spinbutton.horizontal button:hover, +stack .linked.vertical spinbutton.horizontal button:hover:last-child, +stack .linked.vertical spinbutton.horizontal button:hover:active, +stack .linked.vertical spinbutton.horizontal button:hover:active:last-child, +stack .linked.vertical spinbutton.horizontal button:focus, +stack .linked.vertical spinbutton.horizontal button:focus:last-child, +stack .linked.vertical spinbutton.horizontal button:focus:hover, +stack .linked.vertical spinbutton.horizontal button:focus:hover:last-child, +stack .linked.vertical spinbutton.horizontal button:focus:hover:active, +stack .linked.vertical spinbutton.horizontal button:focus:hover:active:last-child, +stack .linked.vertical spinbutton.horizontal button:checked, +stack .linked.vertical spinbutton.horizontal button:checked:last-child, +stack .linked.vertical spinbutton.horizontal button:checked:hover, +stack .linked.vertical spinbutton.horizontal button:checked:hover:last-child, +stack .linked.vertical spinbutton.horizontal button:checked:focus:hover:active, +stack .linked.vertical spinbutton.horizontal button:checked:focus:hover:active:last-child, +stack .linked.vertical spinbutton.horizontal button:disabled, +stack .linked.vertical spinbutton.horizontal button:first-child:disabled { border-radius: 0px; border-width: 0px; border-style: none; - padding: 6px 5px; + padding: 0px 6px; background-color: transparent; background-image: none; border-image: none; box-shadow: none; } -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; +stack .linked.vertical spinbutton.horizontal button, +stack .linked.vertical spinbutton.horizontal button:hover, +stack .linked.vertical spinbutton.horizontal button:focus:hover, +stack .linked.vertical spinbutton.horizontal button:focus, +stack .linked.vertical spinbutton.horizontal button:checked { + border-width: 0px 1px 1px 1px; border-style: solid; border-color: shade(@notebook_border, 1.0); } -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; +stack .linked.vertical spinbutton.horizontal button:last-child, +stack .linked.vertical spinbutton.horizontal button:hover:last-child, +stack .linked.vertical spinbutton.horizontal button:focus:hover:last-child, +stack .linked.vertical spinbutton.horizontal button:focus:last-child, +stack .linked.vertical spinbutton.horizontal button:checked:last-child { + border-width: 0px 1px 1px 0px; + border-style: solid; + border-color: shade(@notebook_border, 1.0); } -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 { +stack .linked.vertical spinbutton.horizontal button:hover, +stack .linked.vertical spinbutton.horizontal button:focus:hover, +stack .linked.vertical spinbutton.horizontal button:hover:last-child, +stack .linked.vertical spinbutton.horizontal button:focus:hover:last-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade(@button_gradient1, 1.03)), @@ -5845,8 +6237,8 @@ stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:focus:hove to (shade(@button_gradient4, 1.01))); } -stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:active, -stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:active:last-child { +stack .linked.vertical spinbutton.horizontal button:active, +stack .linked.vertical spinbutton.horizontal button:active:last-child { background-image: -gtk-gradient (linear, left top, left bottom, from (shade (@theme_bg_color, 1.20)), @@ -5855,20 +6247,32 @@ stack .linked.vertical spinbutton.horizontal.entry.spinbutton .button:active:las to (shade (@theme_bg_color, 0.80))); } -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 { +stack .linked.vertical spinbutton.horizontal button:active, +stack .linked.vertical spinbutton.horizontal button:hover, +stack .linked.vertical spinbutton.horizontal button:focus:hover { border-width: 1px; border-style: solid; border-color: shade(@button_border_active, 1.0); } -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; +stack .linked.vertical spinbutton.horizontal button:active:last-child, +stack .linked.vertical spinbutton.horizontal button:hover:last-child, +stack .linked.vertical spinbutton.horizontal button:focus:hover:last-child { + border-width: 1px 1px 1px 0px; border-style: solid; - border-width: 1px 1px 1px 0; + border-color: shade(@button_border_active, 1.0); +} + +stack .linked.vertical spinbutton.horizontal button:hover, +stack .linked.vertical spinbutton.horizontal button:focus:hover, +stack .linked.vertical spinbutton.horizontal button:active, +stack .linked.vertical spinbutton.horizontal button:hover:last-child, +stack .linked.vertical spinbutton.horizontal button:focus:hover:last-child, +stack .linked.vertical spinbutton.horizontal button: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), + inset 0px -1px shade(@selected_bg_color, 0.93); } /**************** @@ -5915,7 +6319,7 @@ printdialog.background notebook tab.top:hover:active { box-shadow: none; } -printdialog.background notebook header.top tab:hover { +printdialog.background notebook tab.top:hover { background-image: linear-gradient(to bottom, alpha(@theme_base_color, 0.0), alpha(@theme_base_color, 0.3)); @@ -5926,15 +6330,15 @@ printdialog.background notebook header.top tab:hover { box-shadow: none; } -printdialog.background notebook header.top tab:active { +printdialog.background notebook tab.top:active { border-bottom-color: @notebook_active_tab_border; } -printdialog.background notebook .text-button { +printdialog.background notebook button.text-button { background-color: transparent; } -printdialog.background .vertical.view.dialog-vbox notebook togglebutton.button { +printdialog.background .vertical.view.dialog-vbox notebook button.combo { padding: 4px; border-radius: 4px; } @@ -5943,54 +6347,136 @@ printdialog.background .vertical.view.dialog-vbox notebook togglebutton.button { * GtkFileChooser * ******************/ -filechooser.vertical paned.horizontal { - -GtkPaned-handle-size: 3px; +filechooser.vertical paned > separator { + min-width: 3px; + min-height: 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 { - border-width: 1px 0 1px 0px; - border-radius: 3px; - padding: 0px 4px; +filechooser paned.horizontal box.vertical { + border-color: @notebook_border; + border-style: solid; + border-width: 1px; } -.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), - inset 0px -2px alpha(#fff, 0.07), - 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), - inset 0px -1px alpha(shade(@button_border, 0.88), 0.90); +filechooser #pathbarbox { + background-color: shade(@theme_bg_color, 1.07); + border-width: 0px 0px 1px 0px; } -.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), - inset 0px -1px shade(@selected_bg_color, 0.93); +/* bg color srollbar junction */ +filechooser paned.horizontal box.vertical box.horizontal .view box.vertical { + background-color: shade(@theme_bg_color, 1.07); + border-style: none; +} + +filechooser placessidebar.sidebar { + border-color: @notebook_border; + border-style: solid; + border-width: 0px 0px 1px 0px; +} + +/***************** + * Color Chooser * + *****************/ + +button.color colorswatch.activatable { + border-radius: 3px; +} + +colorchooser { + border-style: solid; + border-color: @notebook_border; + border-width: 1px; + border-radius: 4px; + background-color: shade (@theme_bg_color, 1.1); + color: @theme_fg_color; + box-shadow: none; +} + +colorchooser box.vertical { + padding: 6px; +} + +colorswatch, +colorswatch:selected { + border-width: 1px; + border-style: solid; + border-radius: 3px; + border-color: @notebook_border; + box-shadow: inset 0 2px alpha(black, 0.07), + inset 1px 1px alpha(black, 0.07); + background-color: transparent; + background-clip: border-box; +} + +colorswatch:hover { + border-color: alpha(black, 0.45); +} + +colorswatch.color-dark:hover { + background-image: linear-gradient(to bottom, + alpha(white, 0) 40%, + alpha(white, 0.3)); +} + +colorswatch.color-light:hover { + background-image: linear-gradient(to top, + alpha(black, 0) 40%, + alpha(black, 0.1)); +} + +colorswatch.color-light:selected:hover { + background-image: none; +} + +colorswatch { + border-radius: 6px; +} + +colorchooser #add-color-button { + background-clip: padding-box; + border-color: mix(@borders, @theme_bg_color, 0.3); + background-color: mix(@borders, @theme_bg_color, 0.8); +} + +colorchooser #add-color-button:hover { + border-color: @borders; + background-color: @borders; + color: @theme_base_color; +} + +.color-active-badge, +.color-active-badge:selected { + border-style: solid; + border-width: 2px; + background-color: transparent; +} + +.color-active-badge.color-light, +.color-active-badge.color-light:hover { + border-color: #444444; + color: #444444; +} + +.color-active-badge.color-dark, +.color-active-badge.color-dark:hover { + border-color: #cccccc; + color: #cccccc; +} + +colorchooser box.horizontal colorswatch { + border-radius: 6px; +} + +colorchooser box.horizontal colorswatch.color-dark:hover { + background-image: none; + border-color: alpha(black, 0.3); +} + +/* color mix window */ +colorchooser box.horizontal box.horizontal grid.horizontal{ + padding: 6px; } /***************** @@ -6043,3 +6529,4 @@ filechooser.vertical paned.horizontal { .floating-bar.bottom.left { box-shadow: inset -1px 1px alpha(#fff, 0.07); } + -- cgit v1.2.1