From fb26dcda1cbb65674475d13332dc7e26f4763708 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Sun, 21 Feb 2016 01:12:57 +0100 Subject: GTK+-3.20 Blue-Submarine: port the rest of mate-applications to 3.20 --- .../Blue-Submarine/gtk-3.0/gtk-widgets.css | 26 +++++- .../Blue-Submarine/gtk-3.0/mate-applications.css | 95 +++------------------- 2 files changed, 34 insertions(+), 87 deletions(-) diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css index 51f3a731..0ae47fa7 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css @@ -801,7 +801,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; @@ -2379,6 +2380,27 @@ toolbar.vertical { padding: 2px; } +toolbar button.flat.image-button label { + color: @menu_fg_dark_color; +} + +toolbar toolitem combobox button.combo, +toolbar toolbutton button.flat.image-button:disabled { + box-shadow: none; + background-image: none; +} + +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.3), + inset 1px 0px shade(@selected_bg_color, 1.3), + inset -1px 0px shade(@selected_bg_color, 1.3), + inset 0px -1px shade(@selected_bg_color, 1.3); +} + /******************** * Menubar Toolbars * ********************/ @@ -2416,7 +2438,7 @@ toolbar.primary-toolbar { 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; diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css index bb92ab99..cfb91bed 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css @@ -718,92 +718,21 @@ na-tray-applet widget box.horizontal { * Mate-Control-Center * ***********************/ -/* background */ -ShellWindow .enty, -ShellWindow AppResizer SlabSection { - background-color: @theme_base_color; -} - -/* button of sidebar */ -ShellWindow .button.flat { +#MyControlCenter button.flat { border-image: none; border-radius: 6px; padding: 4px; } -ShellWindow .button.flat:hover { - border-radius: 6px; - padding: 4px; -} - -/* button of applications */ -ShellWindow GtkScrolledWindow .button.flat { - padding: 4px 0px; - border-image: none; -} - -/* button hover of applications */ -ShellWindow GtkScrolledWindow .button.flat:hover { - padding: 4px 0px; - border-radius: 12px; - background-image: -gtk-gradient (linear, - left top, left bottom, - from (shade(@button_gradient1, 1.03)), - color-stop (0.48, shade(@button_gradient2, 1.03)), - color-stop (0.52, shade(@button_gradient3, 1.03)), - to (shade(@button_gradient4, 1.01))); - border-top-color: alpha(@focused_entry_outer, 0.65); - border-right-color: alpha(@focused_entry_outer, 0.75); - border-left-color: alpha(@focused_entry_outer, 0.75); - border-bottom-color: alpha(@focused_entry_outer, 0.80); - box-shadow: inset 0px 1px shade (@theme_selected_bg_color, 1.3), - inset 1px 0px shade (@theme_selected_bg_color, 1.3), - inset -1px 0px shade (@theme_selected_bg_color, 1.3), - inset 0px -1px shade (@theme_selected_bg_color, 1.3); -} - -GsmLogoutDialog * { - -GtkDialog-button-spacing: 0; -} - -/*********************** - * Engrampa * - ***********************/ - -FrWindow .toolbar.primary-toolbar { - border-color: @primay-toolbar-border; - border-width: 0 0 1px 0; -} - /********* * Atril * *********/ -EvWindow .vertical.primary-toolbar .horizontal.toolbar { - padding: 1px 4px; -} - -/* size of page entry */ -EvPageActionWidget .entry { - padding: 4px; -} - -EvWindow .toolbar .button, -EvWindow .toolbar .button.flat { - padding: 0px 4px; -} - -EvWindow .vertical.primary-toolbar .horizontal.toolbar EphyZoomControl GtkToggleButton:hover.button { - padding: 4px; - border-radius: 4px; -} - -EvSidebar .flat.button { - border-radius: 4px; - padding: 4px; +.atril-window paned.horizontal notebook scrolledwindow { + border-style: none; } -/* atril and eom */ +/* atril and eom FIXME */ EggToolbarEditor.vertical GtkScrolledWindow .frame { background-color: shade (@base_color, 1.0); border-color: @notebook_border; @@ -813,7 +742,7 @@ EggToolbarEditor.vertical GtkScrolledWindow .frame { } /************** - * mate-media * + * mate-media FIXME* **************/ GvcMixerDialog .frame.flat { @@ -835,34 +764,30 @@ GvcMixerDialog .vertical.dialog-vbox .notebook .frame.flat GtkScrolledWindow.fra * Eom * *******/ -EomWindow .vertical.primary-toolbar .horizontal.toolbar { - border-bottom-color: @theme_bg_dark_color; -} - -EomThumbNav .button.flat { +.eom-window .vertical .vertical .vertical .horizontal button.flat { border-width: 1px; border-color: @button_border; border-image: none; } -EomThumbNav .button.flat:first-child { +.eom-window .vertical .vertical .vertical .horizontal button.flat:first-child { border-radius: 5px 0px 0px 5px; border-right-width: 0px; } -EomThumbNav .button.flat:last-child { +.eom-window .vertical .vertical .vertical .horizontal button.flat:last-child { border-radius: 0px 5px 5px 0px; border-left-width: 0px; } -EomThumbNav .button.flat:hover { +.eom-window .vertical .vertical .vertical .horizontal button.flat:hover { box-shadow: inset 0px 1px shade (@theme_selected_bg_color, 1.3), inset 1px 0px shade (@theme_selected_bg_color, 1.3), inset -1px 0px shade (@theme_selected_bg_color, 1.3), inset 0px -1px shade (@theme_selected_bg_color, 1.3); } -EomThumbNav .button.flat:disabled { +.eom-window .vertical .vertical .vertical .horizontal button.flat:disabled { border-color: transparent; } -- cgit v1.2.1