[gtk/wip/jimmac/focus-ring-radii] Adwaita: draw bigger radius for focus rings



commit 24235f61ab7a3e16ec61d071257b7f957a38fbb6
Author: Jakub Steiner <jimmac gmail com>
Date:   Tue Mar 19 14:07:10 2019 +0100

    Adwaita: draw bigger radius for focus rings
    
    Fixes https://gitlab.gnome.org/GNOME/gtk/issues/1756

 gtk/theme/Adwaita/_common.scss           | 2 +-
 gtk/theme/Adwaita/gtk-contained-dark.css | 4 +++-
 gtk/theme/Adwaita/gtk-contained.css      | 4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index dd26261c73..2385e72876 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -32,7 +32,7 @@ flowboxchild:focus(visible) {
   outline-style: dashed;
   outline-offset: -3px;
   outline-width: 1px;
-  -gtk-outline-radius: 2px;
+  -gtk-outline-radius: $button-radius - 2;
 }
 
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 633f315f8a..e74e73704b 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1,6 +1,6 @@
 * { padding: 0; -gtk-secondary-caret-color: #15539e; }
 
-button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), 
scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: 
alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; 
-gtk-outline-radius: 2px; }
+button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), 
scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: 
alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; 
-gtk-outline-radius: 3px; }
 
 /*************** Base States * */
 .background { color: #eeeeec; background-color: #353535; }
@@ -132,6 +132,8 @@ spinbutton:not(.vertical) image:active, spinbutton.vertical text image:active, e
 
 spinbutton:not(.vertical) image:backdrop, spinbutton.vertical text image:backdrop, entry image:backdrop { 
color: #7e7e7d; }
 
+spinbutton.password:not(.vertical) image.caps-lock-indicator, spinbutton.vertical text.password 
image.caps-lock-indicator, entry.password image.caps-lock-indicator { color: #7e7e7d; }
+
 spinbutton:drop(active):focus:not(.vertical), spinbutton.vertical text:drop(active):focus, 
spinbutton:drop(active):not(.vertical), spinbutton.vertical text:drop(active), entry:drop(active):focus, 
entry:drop(active) { border-color: #4e9a06; box-shadow: inset 0 0 0 1px #4e9a06; }
 
 .osd spinbutton:not(.vertical), .osd spinbutton.vertical text, spinbutton.vertical .osd text, .osd entry { 
color: white; border-color: rgba(0, 0, 0, 0.7); background-color: rgba(0, 0, 0, 0.5); background-clip: 
padding-box; box-shadow: none; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 6ff629a804..e3c5e5656e 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1,6 +1,6 @@
 * { padding: 0; -gtk-secondary-caret-color: #3584e4; }
 
-button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), 
scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: 
alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; 
-gtk-outline-radius: 2px; }
+button:focus(visible), checkbutton:focus(visible), radiobutton:focus(visible), switch:focus(visible), 
scale:focus(visible), label:focus(visible), row:focus(visible), flowboxchild:focus(visible) { outline-color: 
alpha(currentColor,0.3); outline-style: dashed; outline-offset: -3px; outline-width: 1px; 
-gtk-outline-radius: 3px; }
 
 /*************** Base States * */
 .background { color: #2e3436; background-color: #f6f5f4; }
@@ -132,6 +132,8 @@ spinbutton:not(.vertical) image:active, spinbutton.vertical text image:active, e
 
 spinbutton:not(.vertical) image:backdrop, spinbutton.vertical text image:backdrop, entry image:backdrop { 
color: #a7aaaa; }
 
+spinbutton.password:not(.vertical) image.caps-lock-indicator, spinbutton.vertical text.password 
image.caps-lock-indicator, entry.password image.caps-lock-indicator { color: #a7aaaa; }
+
 spinbutton:drop(active):focus:not(.vertical), spinbutton.vertical text:drop(active):focus, 
spinbutton:drop(active):not(.vertical), spinbutton.vertical text:drop(active), entry:drop(active):focus, 
entry:drop(active) { border-color: #4e9a06; box-shadow: inset 0 0 0 1px #4e9a06; }
 
 .osd spinbutton:not(.vertical), .osd spinbutton.vertical text, spinbutton.vertical .osd text, .osd entry { 
color: white; border-color: rgba(0, 0, 0, 0.7); background-color: rgba(0, 0, 0, 0.5); background-clip: 
padding-box; box-shadow: none; text-shadow: 0 1px black; -gtk-icon-shadow: 0 1px black; }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]