submarine: few fixes for buttons in titlebar and popovers

2 files changed, 62 insertions, 2 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 876df5e0..fefd8dc3 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -1123,7 +1123,8 @@ button.color {
 }

 

 .titlebar .path-bar > button.toggle,

-.titlebar .path-bar > button.toggle:hover {

+.titlebar .path-bar > button.toggle:hover,

+.titlebar .path-bar > button.toggle:checked:active {

     border-radius: 0px;

     border-width: 1px 0px;

 }

@@ -5724,6 +5725,7 @@ modelbutton.flat:only-child {
     color: @theme_fg_dark_color;

     border-radius: 6px;

     padding: 6px 0px 6px 6px;

+    outline-style: none;

 }

 

 modelbutton.flat:checked,

@@ -5761,6 +5763,17 @@ popover > box > button.text-button { /* ie. gedit menu button popover */
     border-radius: 6px;

 }

 

+/* use box-shadow for outlines */

+modelbutton.flat:focus,

+modelbutton.flat:focus:first-child,

+modelbutton.flat:focus:last-child,

+modelbutton.flat:focus:only-child {

+    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);

+}

+

 modelbutton.flat:checked:hover:only-child,

 modelbutton.flat:checked:hover:active:only-child,

 modelbutton.flat:focus:hover:active:only-child,

@@ -5806,6 +5819,7 @@ popover > box > button.text-button:checked:hover:active {
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

+popover .linked button:focus,

 .linked button.image-button.model,

 .linked button.image-button.model:focus,

 .linked button.image-button.model:first-child,

@@ -5821,6 +5835,21 @@ popover > box > button.text-button:checked:hover:active {
     border-radius: 3px;

 }

 

+popover .linked button:focus,

+popover .linked button:focus:first-child,

+popover .linked button:focus:last-child,

+popover .linked button:focus:only-child,

+.linked button.image-button.model:focus,

+.linked button.image-button.model:focus:first-child,

+.linked button.image-button.model:focus:last-child {

+    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);

+}

+

+popover .linked button:hover,

+popover .linked button:focus:hover,

 .linked button.image-button.model:checked,

 .linked button.image-button.model:hover,

 .linked button.image-button.model:hover:active,

@@ -6032,6 +6061,7 @@ headerbar:backdrop button {
 headerbar button:hover,

 headerbar button:checked,

 headerbar button:hover:active,

+headerbar button:focus:hover:active,

 headerbar button.text-button:hover:active,

 headerbar button:checked:hover,

 headerbar button:checked:hover:active,

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 4f1d5c32..fd67c50a 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -1125,7 +1125,8 @@ button.color {
 }

 

 .titlebar .path-bar > button.toggle,

-.titlebar .path-bar > button.toggle:hover {

+.titlebar .path-bar > button.toggle:hover,

+.titlebar .path-bar > button.toggle:checked:active {

     border-radius: 0px;

     border-width: 1px 0px;

 }

@@ -5722,6 +5723,7 @@ modelbutton.flat:only-child {
     color: @theme_fg_dark_color;

     border-radius: 6px;

     padding: 6px 0px 6px 6px;

+    outline-style: none;

 }

 

 modelbutton.flat:checked,

@@ -5760,6 +5762,17 @@ popover > box > button.text-button { /* ie. gedit menu button popover */
     border-radius: 6px;

 }

 

+/* use box-shadow for outlines */

+modelbutton.flat:focus,

+modelbutton.flat:focus:first-child,

+modelbutton.flat:focus:last-child,

+modelbutton.flat: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);

+}

+

 modelbutton.flat:checked:hover:only-child,

 modelbutton.flat:checked:hover:active:only-child,

 modelbutton.flat:focus:hover:active:only-child,

@@ -5805,6 +5818,7 @@ popover > box > button.text-button:checked:hover:active {
                 inset  0px -1px shade(@selected_bg_color, 0.93);

 }

 

+popover .linked button:focus,

 .linked button.image-button.model,

 .linked button.image-button.model:focus,

 .linked button.image-button.model:first-child,

@@ -5820,6 +5834,21 @@ popover > box > button.text-button:checked:hover:active {
     border-radius: 3px;

 }

 

+popover .linked button:focus,

+popover .linked button:focus:first-child,

+popover .linked button:focus:last-child,

+popover .linked button:focus:only-child,

+.linked button.image-button.model:focus,

+.linked button.image-button.model:focus:first-child,

+.linked button.image-button.model:focus:last-child {

+    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);

+}

+

+popover .linked button:hover,

+popover .linked button:focus:hover,

 .linked button.image-button.model:checked,

 .linked button.image-button.model:hover,

 .linked button.image-button.model:hover:active,

@@ -6032,6 +6061,7 @@ headerbar:backdrop button {
 headerbar button:hover,

 headerbar button:checked,

 headerbar button:hover:active,

+headerbar button:focus:hover:active,

 headerbar button.text-button:hover:active,

 headerbar button:checked:hover,

 headerbar button:checked:hover:active,