From 37e39cfe1bee68f29f1baaa76f8414ca50f2f3f7 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Tue, 8 Oct 2019 18:35:49 +0200 Subject: Menta: fix button.destructive-action:backdrop state - don't draw background image and color - drop text-shadow - adjust transition timing --- .../BlueMenta/gtk-3.0/gtk-widgets-borders.css | 1 + desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css | 24 ++++++++++++++++------ .../Menta/gtk-3.0/gtk-widgets-borders.css | 1 + desktop-themes/Menta/gtk-3.0/gtk-widgets.css | 24 ++++++++++++++++------ 4 files changed, 38 insertions(+), 12 deletions(-) diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css index 865900e4..05584ca7 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css @@ -79,6 +79,7 @@ toolbar.inline-toolbar.vertical button.default:checked { button, button.default:backdrop, button.suggested-action:backdrop, +button.destructive-action:backdrop, combobox button.combo { border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css index ad449a47..c565c0d7 100644 --- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css @@ -4270,6 +4270,11 @@ button.suggested-action label:disabled { text-shadow: none; } +button.suggested-action label, +button.destructive-action label { + transition: all 50ms ease-out; +} + /****************************** * Destructive action buttons * ******************************/ @@ -4298,16 +4303,23 @@ button.destructive-action:checked { } button.destructive-action { - text-shadow: 0 1px @destructive_action_button_shadow; -gtk-icon-shadow: 0 1px @destructive_action_button_shadow; } button.destructive-action:hover:active, button.destructive-action:checked { - text-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15); -gtk-icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15); } +button.destructive-action:backdrop { + background-image: linear-gradient(to bottom, + @button_gradient_backdrop_color_a, + @button_gradient_backdrop_color_b); + background-color: transparent; + color: @theme_unfocused_fg_color; + text-shadow: none; +} + /************************** * Selection Mode classes * **************************/ @@ -4704,7 +4716,8 @@ treeview.view:hover { } iconview, -textview text { +textview text, +textview selection { transition: all 400ms ease-out; } @@ -4740,9 +4753,8 @@ label selection:disabled { color: @insensitive_fg_color; } -label, -textview selection { - transition: all 400ms ease-out; +label { + transition: all 300ms ease-out; } label:backdrop, diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css index 865900e4..05584ca7 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css @@ -79,6 +79,7 @@ toolbar.inline-toolbar.vertical button.default:checked { button, button.default:backdrop, button.suggested-action:backdrop, +button.destructive-action:backdrop, combobox button.combo { border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch; border-radius: 4px; diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css index 09aaad0e..155af694 100644 --- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css @@ -4274,6 +4274,11 @@ button.suggested-action label:disabled { text-shadow: none; } +button.suggested-action label, +button.destructive-action label { + transition: all 50ms ease-out; +} + /****************************** * Destructive action buttons * ******************************/ @@ -4302,16 +4307,23 @@ button.destructive-action:checked { } button.destructive-action { - text-shadow: 0 1px @destructive_action_button_shadow; -gtk-icon-shadow: 0 1px @destructive_action_button_shadow; } button.destructive-action:hover:active, button.destructive-action:checked { - text-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15); -gtk-icon-shadow: 0 1px shade(@destructive_action_button_shadow, 1.15); } +button.destructive-action:backdrop { + background-image: linear-gradient(to bottom, + @button_gradient_backdrop_color_a, + @button_gradient_backdrop_color_b); + background-color: transparent; + color: @theme_unfocused_fg_color; + text-shadow: none; +} + /************************** * Selection Mode classes * **************************/ @@ -4708,7 +4720,8 @@ treeview.view:hover { } iconview, -textview text { +textview text, +iconview selection { transition: all 400ms ease-out; } @@ -4744,9 +4757,8 @@ label selection:disabled { color: @insensitive_fg_color; } -label, -textview selection { - transition: all 400ms ease-out; +label { + transition: all 300ms ease-out; } label:backdrop, -- cgit v1.2.1