GTK+-3.20 submarine themes: fix button color in meld toolbar + toolbar cleanup

2 files changed, 64 insertions, 84 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 cc1232c4..3f4c1916 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -2552,28 +2552,19 @@ toolbar.primary-toolbar button:disabled {
     border-color: transparent;

 }

 

-toolbar button *:disabled {

+toolbar button:disabled {

     color: mix(@toolbar_gradient_base, @toolbar_fg_color, 0.60);

     text-shadow: none;

 }

 

-toolbar.primary-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 {

-    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 (@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);

-}

-

+toolbar button:hover,

 toolbar button:hover:active,

+toolbar button:focus:hover:active,

 toolbar button:checked,

 toolbar button:checked:focus,

 toolbar button:checked:hover,

@@ -2610,27 +2601,24 @@ toolbar.primary-toolbar button:checked:hover:active {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-toolbar button *:hover,

-toolbar button *:active,

-toolbar button *:checked {

-/* edge */

-    color: shade(@toolbar_fg_color, 0.90);

+toolbar button:hover,

+toolbar button:checked,

+toolbar button:hover label,

+toolbar button:checked label {

+    color: shade (@theme_selected_bg_color, 1.6);

     text-shadow: 0px 1px @toolbar_shadow_color;

+    transition: all 400ms ease-out;

 }

 

 /* 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;

+toolbar.primary-toolbar button:hover,

+toolbar.primary-toolbar button:hover:active,

+toolbar.primary-toolbar button:checked,

+toolbar.primary-toolbar button:checked:hover {

+    color: shade (@theme_selected_bg_color, 1.6);

     text-shadow: 0px 1px @theme_shadow_dark_color;

 }

 

-toolbar button:active:disabled,

 toolbar button:checked:disabled,

 toolbar.primary-toolbar button:checked:disabled {

     background-image: none;

@@ -2645,13 +2633,14 @@ toolbar label {
     text-shadow: 0px 1px @theme_shadow_color;

 }

 

+toolbar toolitem label,

 toolbar menubar label,

 toolbar.primary-toolbar label {

     color: @theme_fg_dark_color;

     text-shadow: 0px 1px @theme_shadow_dark_color;

 }

 

-toolbar GtkSeparatorToolItem,

+toolbar toolitem separator,

 toolbar separator,

 toolbar separator:disabled {

     border-color:        alpha (#000, 0.24);

@@ -2771,23 +2760,23 @@ toolbar button.raised {
     -gtk-icon-shadow:  1px  1px @theme_shadow_dark_color;

 }

 

-toolbar menubar button *:hover,

-toolbar .raised button *:hover,

-toolbar button.raised *:hover,

-toolbar .raised button *:hover:active,

-toolbar button.raised *:hover:active,

-toolbar menubar button *:checked,

-toolbar .raised button *:checked,

-toolbar button.raised *:checked,

-toolbar .raised button *:checked:hover,

-toolbar button.raised *:checked:hover {

+toolbar menubar button:hover,

+toolbar .raised button:hover,

+toolbar button.raised:hover,

+toolbar .raised button:hover:active,

+toolbar button.raised:hover:active,

+toolbar menubar button:checked,

+toolbar .raised button:checked,

+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 button.raised *: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);

@@ -3820,7 +3809,7 @@ headerbar .subtitle {
     color: @theme_text_dark_color;

 }

 

-headerbar GtkSeparatorToolItem,

+headerbar toolitem separator,

 headerbar separator,

 headerbar separator:disabled,

 headerbar paned > separator {

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 eba5390b..47d78302 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -2550,32 +2550,24 @@ toolbar.primary-toolbar button:disabled {
     border-color: transparent;

 }

 

-toolbar button *:disabled {

+toolbar button:disabled {

     color: mix(@toolbar_gradient_base, @toolbar_fg_color, 0.60);

     text-shadow: none;

 }

 

-toolbar.primary-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 {

-    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 button:hover,

 toolbar button:hover:active,

+toolbar button:focus: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)),

@@ -2608,27 +2600,25 @@ toolbar.primary-toolbar button:checked:hover:active {
                 inset  0px -1px shade(@selected_bg_color, 0.93);

 }

 

-toolbar button *:hover,

-toolbar button *:active,

-toolbar button *:checked {

-/* edge */

-    color: shade(@toolbar_fg_color, 0.90);

+toolbar button:hover,

+toolbar button:checked,

+toolbar button:hover label,

+toolbar button:checked label {

+    color: shade (@theme_selected_bg_color, 1.6);

     text-shadow: 0px 1px @toolbar_shadow_color;

+    transition: all 400ms ease-out;

 }

 

+

 /* 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;

+toolbar.primary-toolbar button:hover,

+toolbar.primary-toolbar button:hover:active,

+toolbar.primary-toolbar button:checked,

+toolbar.primary-toolbar button:checked:hover {

+    color: shade (@theme_selected_bg_color, 1.6);

     text-shadow: 0px 1px @theme_shadow_dark_color;

 }

 

-toolbar button:active:disabled,

 toolbar button:checked:disabled,

 toolbar.primary-toolbar button:checked:disabled {

     background-image: none;

@@ -2643,13 +2633,14 @@ toolbar label {
     text-shadow: 0px 1px @theme_shadow_color;

 }

 

+toolbar toolitem label,

 toolbar menubar label,

 toolbar.primary-toolbar label {

     color: @theme_fg_dark_color;

     text-shadow: 0px 1px @theme_shadow_dark_color;

 }

 

-toolbar GtkSeparatorToolItem,

+toolbar toolitem separator,

 toolbar separator,

 toolbar separator:disabled {

     border-color:        alpha (#000, 0.24);

@@ -2769,23 +2760,23 @@ toolbar button.raised {
     -gtk-icon-shadow:  1px  1px @theme_shadow_dark_color;

 }

 

-toolbar menubar button *:hover,

-toolbar .raised button *:hover,

-toolbar button.raised *:hover,

-toolbar .raised button *:hover:active,

-toolbar button.raised *:hover:active,

-toolbar menubar button *:checked,

-toolbar .raised button *:checked,

-toolbar button.raised *:checked,

-toolbar .raised button *:checked:hover,

-toolbar button.raised *:checked:hover {

+toolbar menubar button:hover,

+toolbar .raised button:hover,

+toolbar button.raised:hover,

+toolbar .raised button:hover:active,

+toolbar button.raised:hover:active,

+toolbar menubar button:checked,

+toolbar .raised button:checked,

+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 button.raised *: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);

@@ -3817,7 +3808,7 @@ headerbar .subtitle {
     color: @theme_text_dark_color;

 }

 

-headerbar GtkSeparatorToolItem,

+headerbar toolitem separator,

 headerbar separator,

 headerbar separator:disabled,

 headerbar paned > separator {