Skip to content

Commit 936b4d5

Browse files
committed
enhance focus styles
1 parent 41d35b4 commit 936b4d5

File tree

5 files changed

+21
-9
lines changed

5 files changed

+21
-9
lines changed

src/renderer/attribute/length.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
(if (pos? (.-deltaY e))
4040
(rf/dispatch [:element/update-attr k - 1])
4141
(rf/dispatch [:element/update-attr k + 1])))}]
42-
[:div.flex {:style {:width "54px"}}
42+
[:div.flex {:style {:width "55px"}}
4343
[:button.button.ml-px.bg-primary.text-muted.h-full
4444
{:style {:width "26px"}
4545
:on-pointer-down #(rf/dispatch [:element/update-attr k - 1])}

src/renderer/dialog/events.cljs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
:dialog/cmdk
99
(fn [db [_]]
1010
(assoc db :dialog {:content [cmdk/root]
11-
:attrs {:class "dialog-content dialog-cmdk-content"}})))
11+
:attrs {:onOpenAutoFocus #()
12+
:class "dialog-content dialog-cmdk-content"}})))
1213

1314
(rf/reg-event-db
1415
:dialog/about

src/renderer/dialog/views.cljs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
[:div [:strong "Version: "] config/version]
2323
[:div [:strong "Browser: "] platform/user-agent]]]
2424
[:button.button.px-2.bg-primary.rounded.w-full
25-
{:on-click #(rf/dispatch [:dialog/close])}
25+
{:auto-focus true
26+
:on-click #(rf/dispatch [:dialog/close])}
2627
"OK"]
2728
[close-button]])
2829

@@ -36,7 +37,8 @@
3637
{:on-click #(rf/dispatch [:dialog/close])}
3738
"No"]
3839
[:button.button.px-2.bg-primary.rounded
39-
{:on-click #(do (rf/dispatch [:dialog/close])
40+
{:auto-focus true
41+
:on-click #(do (rf/dispatch [:dialog/close])
4042
(rf/dispatch action))}
4143
"Yes"]]
4244
[close-button]])
@@ -59,7 +61,8 @@
5961
{:on-click #(rf/dispatch [:dialog/close])}
6062
"Cancel"]
6163
[:button.button.px-2.bg-primary.rounded.flex-1
62-
{:on-click #(do (rf/dispatch [:dialog/close])
64+
{:auto-focus true
65+
:on-click #(do (rf/dispatch [:dialog/close])
6366
(rf/dispatch [:document/save-and-close]))}
6467
"Save"]]
6568
[close-button]]))
@@ -73,6 +76,7 @@
7376
[:> Dialog/Portal
7477
[:> Dialog/Overlay {:class "dialog-overlay"}]
7578
[:> Dialog/Content
76-
(merge {:class "dialog-content"}
79+
(merge {:class "dialog-content"
80+
:onOpenAutoFocus #(.preventDefault %)}
7781
(:attrs dialog))
7882
(:content dialog)]]]))

src/renderer/styles.css

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
.border-accent {
6767
border-color: var(--accent);
6868
}
69+
70+
.outline-shadow {
71+
box-shadow: inset 0 0 1px 1px var(--accent)
72+
}
6973
}
7074

7175
@layer components {
@@ -95,13 +99,12 @@
9599
}
96100

97101
.button {
98-
@apply inline-block relative cursor-pointer text-center;
102+
@apply inline-block relative cursor-pointer text-center outline-none;
99103
background-color: transparent;
100104
color: var(--font-color);
101105
fill: var(--font-color);
102106
font-family: var(--font-color);
103107
font-size: 1em;
104-
outline: none;
105108
height: 33px;
106109
line-height: 33px;
107110
-webkit-app-region: no-drag;
@@ -113,6 +116,10 @@
113116
color: var(--font-color-hovered);
114117
}
115118

119+
&:focus:not(:hover) {
120+
@apply outline-shadow;
121+
}
122+
116123
&.selected {
117124
@apply bg-accent !important;
118125
color: var(--accent-inverted);

src/renderer/toolbar/tools.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
[:span
2020
[comp/radio-icon-button
2121
{:active? selected?
22-
:class (when primary? "border border-accent")
22+
:class (when primary? "outline-shadow")
2323
:icon (:icon (tools/properties type))
2424
:action #(rf/dispatch [:set-tool type])}]]]
2525
[:> Tooltip/Portal

0 commit comments

Comments
 (0)