From 2c5eab56002c3b0ce67ee427ba550a2f1d81b462 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 7 Feb 2015 18:36:48 +0100 Subject: BlackMate GTK3: fix view of mate-control-center - adjust some buttons, less blinky - change transition time --- desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css | 222 ++++++++++++--------- .../BlackMATE/gtk-3.0/mate-applications.css | 60 +++--- 2 files changed, 157 insertions(+), 125 deletions(-) diff --git a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css index 816f6bbb..09a84da9 100644 --- a/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css @@ -1023,20 +1023,14 @@ GtkTreeView .button { column-header .button { background-image: linear-gradient(to bottom, - shade(@button_gradient_color_a, 1.5), - shade(@button_gradient_color_a, 0.7) 39%, - @theme_bg_color 40%, + shade(@less_dark_color, 1.3), shade(@less_dark_color, 0.4)); } GtkTreeView .button { - background-image: -gtk-gradient (radial, - 0.5 -2.0, 2.0, - 0.5 -2.0, 3.0, - from (shade(@button_gradient_color_a, 1.5)), - color-stop (0.42, shade(@button_gradient_color_a, 0.7)), - color-stop (0.43, @theme_bg_color), - to (shade(@less_dark_color, 0.4))); + background-image: linear-gradient(to bottom, + shade(@less_dark_color, 1.3), + shade(@less_dark_color, 0.4)); } column-header .button:hover, @@ -1047,7 +1041,9 @@ GtkTreeView .button:hover { border-style: solid; border-color: @less_dark_color; background-image: linear-gradient(to bottom, - shade(@less_dark_color, 1.3), + shade(@button_gradient_color_a, 1.5), + shade(@button_gradient_color_a, 0.7) 39%, + @theme_bg_color 40%, shade(@less_dark_color, 0.4)); } @@ -1161,6 +1157,14 @@ GtkComboBox .separator { } GtkComboBox .button { + padding: 3px; + /* These buttons may be wide. */ + background-image: linear-gradient(to bottom, + @button_hover_gradient_color_a, + @button_hover_gradient_color_b); +} + +GtkComboBox .button:hover { padding: 3px; /* These buttons may be wide. */ background-image: linear-gradient(to bottom, @@ -1186,25 +1190,46 @@ GtkComboBox .menu { ***********/ .button { -GtkWidget-focus-line-width: 0; - /* Due to a bug somewhere in gtk or cairo, - a padding of zero (or even one) doesn't work always!!! */ - padding: 2px; - - border-radius: 3px; - border-width: 1px; - border-style: solid; - text-shadow: 0 -1px black; - - color: @theme_fg_color; - background-image: linear-gradient(to bottom, - @button_hover_gradient_color_a, - @button_hover_gradient_color_b); - transition: all 200ms ease-out; + /* Due to a bug somewhere in gtk or cairo, + a padding of zero (or even one) doesn't work always!!! */ + padding: 2px; + border-radius: 3px; + border-width: 1px; + border-style: solid; + text-shadow: 0 -1px black; + color: @theme_fg_color; + background-image: linear-gradient(to bottom, + @button_hover_gradient_color_a, + @button_hover_gradient_color_b); + transition: all 400ms ease-out; } .button.image-button, .primary-toolbar.toolbar .button.image-button { - padding: 3px 4px 4px; + padding: 3px 4px 4px; +} + +.button.default { + transition: all 400ms ease-out; + text-shadow: none; + color: @theme_fg_color; +} + +/* ie. mate-control-center */ +.button.flat { + transition: all 400ms ease-out; + padding: 0px; + border-color: transparent; + background-color: transparent; + background-image: none; + box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0); + text-shadow: none; + icon-shadow: none; + border-image: none; +} + +.button.flat:hover { + border-radius: 8px; } .button GtkImage, @@ -1495,142 +1520,140 @@ GtkComboBox .menu { /* this controls the general appearance of the menubar */ .menubar { - background-image: none; - background-color: @theme_bg_color; - border-width: 0px; - border-style: none; - padding: 0px; - color: @theme_text_color; - - -GtkWidget-window-dragging: true; - /*-GtkMenuBar-internal-padding: 0;*/ + background-image: none; + background-color: @theme_bg_color; + border-width: 0px; + border-style: none; + padding: 0px; + color: @theme_text_color; + -GtkWidget-window-dragging: true; + /*-GtkMenuBar-internal-padding: 0;*/ } /*.menubar * { - background-color: transparent; + background-color: transparent; }*/ .menubar .menuitem { - transition: all 200ms ease-out; - padding: 3px 7px; + transition: all 300ms ease-out; + padding: 3px 7px; } .menu .menuitem { - transition: all 200ms ease-out; - padding: 3px 4px; + transition: all 300ms ease-out; + padding: 3px 4px; } .menubar .menuitem, .menu .menuitem { - border-width: 0px; - border-style: none; - background-color: transparent; + border-width: 0px; + border-style: none; + background-color: transparent; } .menubar .menuitem:hover { - background-image: none; - background-color: @theme_selected_bg_color; - - border-style: solid; - border-image: none; - /* join menuitem to menu */ - border-radius: 3px 3px 0px 0px; - border-width: 0px; - border-color: @theme_selected_bg_color; + background-image: none; + background-color: @theme_selected_bg_color; + border-style: solid; + border-image: none; + /* join menuitem to menu */ + border-radius: 3px 3px 0px 0px; + border-width: 0px; + border-color: @theme_selected_bg_color; } .menubar .menuitem *:insensitive, /* gdebi bug? */ .menubar .menuitem *:hover { - color: @theme_text_color; + color: @theme_text_color; } .menu, .menubar .menu, .menuitem .menu { - background-color: shade(@theme_selected_bg_color, 0.8); - background-image: linear-gradient(to bottom, - @theme_selected_bg_color, - shade(@theme_selected_bg_color, 0.5)); + background-color: shade(@theme_selected_bg_color, 0.8); + background-image: linear-gradient(to bottom, + @theme_selected_bg_color, + shade(@theme_selected_bg_color, 0.5)); - border-style: none; - border-width: 0px; - border-radius: 0; - padding: 1px; + border-style: none; + border-width: 0px; + border-radius: 0; + padding: 1px; } /*.menu *{ - background-color: transparent; + background-color: transparent; }*/ .menuitem, .menuitem * { - -GtkMenuItem-arrow-scaling: 0.5; - padding: 2px 0px; + -GtkMenuItem-arrow-scaling: 0.5; + padding: 2px 0px; } /* scroll arrows */ .menu.button { - border-image: none; - color: @theme_fg_color; - background-image: linear-gradient(to bottom, - @button_hover_gradient_color_a, - @button_hover_gradient_color_b); + border-image: none; + color: @theme_fg_color; + background-image: linear-gradient(to bottom, + @button_hover_gradient_color_a, + @button_hover_gradient_color_b); } .menu.button:hover { - color: @theme_main_color; - background-image: linear-gradient(to bottom, - shade(@theme_selected_bg_color, 1.3), - shade(@theme_selected_bg_color, 0.5)); + color: @theme_main_color; + background-image: linear-gradient(to bottom, + shade(@theme_selected_bg_color, 1.3), + shade(@theme_selected_bg_color, 0.5)); } .menu.button:insensitive { - background-image: none; - background-color: transparent; - border-style: none; + background-image: none; + background-color: transparent; + border-style: none; } .menuitem:hover, .menu .menuitem:hover { - background-image: linear-gradient(to bottom, - #999999, - #404040); - /*color: @theme_main_color;*/ - color: #000000; - border-style: solid; - border-width: 1px; - border-radius: 3px; - border-image: url("assets/menu-border-dark.svg") 2 / 2px stretch; + background-image: linear-gradient(to bottom, + #999999, + #404040); + /*color: @theme_main_color;*/ + color: #000000; + border-style: solid; + border-width: 1px; + border-radius: 3px; + border-image: url("assets/menu-border-dark.svg") 2 / 2px stretch; } .menuitem *:hover, .menu .menuitem *:hover { - color: #000000; + color: #000000; } .menu .menuitem:insensitive, .menu .menuitem *:insensitive { - color: @insensitive_fg_color; + color: @insensitive_fg_color; } .menuitem.separator { - padding: 4px; - border-style: none; - border-color: @theme_selected_bg_color; - -GtkMenuItem-horizontal-padding: 0; - -GtkWidget-separator-height: 1; + padding: 4px; + border-style: none; + border-color: @theme_selected_bg_color; + -GtkMenuItem-horizontal-padding: 0; + -GtkWidget-separator-height: 1; } .menuitem.accelerator, .menu .menuitem.accelerator { - color: alpha(@theme_main_color, 0.66); + color: alpha(@theme_main_color, 0.66); } .menuitem.accelerator:hover, .menuitem.accelerator:active, .menu .menuitem.accelerator:hover, .menu .menuitem.accelerator:active { - color: alpha(@theme_text_color, 0.45); + color: alpha(@theme_text_color, 0.45); } /*************** @@ -1638,7 +1661,7 @@ GtkComboBox .menu { ***************/ /* compensation for combo shadow */ GtkMenuButton .menu { - text-shadow: none; + text-shadow: none; } /************ @@ -1702,8 +1725,13 @@ GtkMenuButton .menu { border-style: solid; border-color: shade(@button_border, 1.1); border-radius: 3px; - background-image: none; - background-color: @theme_bg_color; + background-image: -gtk-gradient (radial, + 0.5 -2.0, 2.0, + 0.5 -2.0, 3.0, + from (shade(@button_gradient_color_a, 1.5)), + color-stop (0.42, shade(@button_gradient_color_a, 0.7)), + color-stop (0.43, @theme_bg_color), + to (shade(@button_gradient_color_b, 0.7))); } .toolbar .button:checked, diff --git a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css index 343ee431..b5b3039a 100644 --- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css +++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css @@ -47,6 +47,12 @@ CajaWindow GtkScrolledWindow.frame { CajaWindow .button { border-image: url("assets/button-border-dark1.svg") 3 / 3px stretch; + background-image: linear-gradient(to bottom, + shade(@less_dark_color, 1.3), + shade(@less_dark_color, 0.4)); +} + +CajaWindow .button:hover { background-image: -gtk-gradient (radial, 0.5 -2.0, 2.0, 0.5 -2.0, 3.0, @@ -54,12 +60,6 @@ CajaWindow .button { color-stop (0.42, shade(@button_gradient_color_a, 0.7)), color-stop (0.43, @theme_bg_color), to (shade(@less_dark_color, 0.4))); -} - -CajaWindow .button:hover { - background-image: linear-gradient(to bottom, - shade(@less_dark_color, 1.3), - shade(@less_dark_color, 0.4)); } @@ -303,8 +303,8 @@ PanelMenuBar.menubar .menu .menuitem:hover { transition: all 300ms ease-out; } -PanelApplet { - border-width: 0; +MatePanelApplet { + border-width: 0px; } PanelSeparator { @@ -320,29 +320,25 @@ PanelSeparator { /* desktop-applet, clockapplet, drivemount, character-map, dictionary */ MatePanelApplet .button { + border-radius: 1px; + transition: all 400ms ease-out; /* Due to a bug somewhere in gtk or cairo, a padding of zero (or even one) doesn't work always!!! */ padding: 2px; - - border-radius: 3px; border-width: 1px; border-style: solid; text-shadow: 0 -1px black; - color: @theme_fg_color; - background-image: -gtk-gradient (radial, - 0.5 -2.0, 2.0, - 0.5 -2.0, 3.0, - from (shade(@button_gradient_color_a, 1.5)), - color-stop (0.42, shade(@button_gradient_color_a, 0.7)), - color-stop (0.43, @theme_bg_color), - to (shade(@button_gradient_color_b, 0.7))); + background-image: linear-gradient(to bottom, + @button_hover_gradient_color_a, + @button_hover_gradient_color_b); } MatePanelApplet .button:checked:hover, MatePanelApplet .button:checked, MatePanelApplet .button:active:hover, MatePanelApplet .button:active { + border-radius: 1px; color: @theme_fg_color; border-style: solid; background-image: linear-gradient(to bottom, @@ -352,25 +348,29 @@ MatePanelApplet .button:active { } MatePanelApplet .button:hover { + border-radius: 1px; border-image: none; border-style: solid; border-color: shade(@button_border, 1.1); - background-image: linear-gradient(to bottom, - @button_hover_gradient_color_a, - @button_hover_gradient_color_b); + background-image: -gtk-gradient (radial, + 0.5 -2.0, 2.0, + 0.5 -2.0, 3.0, + from (shade(@button_gradient_color_a, 1.5)), + color-stop (0.42, shade(@button_gradient_color_a, 0.7)), + color-stop (0.43, @theme_bg_color), + to (shade(@button_gradient_color_b, 0.7))); } /*Wncklist */ WnckTasklist .button { + transition: all 400ms ease-out; /* Due to a bug somewhere in gtk or cairo, a padding of zero (or even one) doesn't work always!!! */ padding: 2px; - - border-radius: 3px; + border-radius: 1px; border-width: 1px; border-style: solid; text-shadow: 0 -1px black; - color: @theme_fg_color; background-image: -gtk-gradient (radial, 0.5 -2.0, 2.0, @@ -385,6 +385,7 @@ WnckTasklist .button:checked:hover, WnckTasklist .button:checked, WnckTasklist .button:active:hover, WnckTasklist .button:active { + border-radius: 1px; color: @theme_fg_color; border-style: solid; background-image: linear-gradient(to bottom, @@ -394,12 +395,15 @@ WnckTasklist .button:active { } WnckTasklist .button:hover { + border-radius: 1px; border-image: none; border-style: solid; border-color: shade(@button_border, 1.1); background-image: linear-gradient(to bottom, - @button_hover_gradient_color_a, - @button_hover_gradient_color_b); + shade(@button_gradient_color_a, 1.5), + shade(@button_gradient_color_a, 0.7) 39%, + @theme_bg_color 40%, + shade(@less_dark_color, 0.4)); } /* set selected button WnckSelector */ @@ -450,7 +454,7 @@ MatePanelApplet *:hover { } NaTrayApplet { -/* -NaTrayApplet-icon-padding: 12; - -NaTrayApplet-icon-size: 16;*/ + -NaTrayApplet-icon-padding: 12; + -NaTrayApplet-icon-size: 16; } -- cgit v1.2.1