Skip to content

Commit 757157d

Browse files
authored
Focus Behaviour Improvements (#466)
* Improved focus behaviour.
1 parent 5c899e6 commit 757157d

File tree

9 files changed

+26
-1
lines changed

9 files changed

+26
-1
lines changed

config/storybook/neu-theme-variables.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ $s-color-base-background-hover: #F7F3F4;
2424
$s-color-base-disabled: #FDF7FB;
2525
$s-color-base-on-disabled: #A19A9D;
2626
$s-color-base-on-accent: #FFFFFF;
27+
$s-color-outline: rgba(0, 0, 0, 0.5);
2728
// Utility colors
2829
$s-color-utility-body: #F7F3F4;
2930
$s-color-utility-surface: #FDF7FB;
@@ -63,6 +64,7 @@ $s-size-mini: 24px;
6364
--s-color-base-disabled: #{$s-color-base-disabled};
6465
--s-color-base-on-disabled: #{$s-color-base-on-disabled};
6566
--s-color-base-on-accent: #{$s-color-base-on-accent};
67+
--s-color-outline: #{$s-color-outline};
6668
--s-color-utility-body: #{$s-color-utility-body};
6769
--s-color-utility-surface: #{$s-color-utility-surface};
6870
--s-color-utility-overlay: #{$s-color-utility-overlay};

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@soramitsu/soramitsu-js-ui",
3-
"version": "1.0.37",
3+
"version": "1.0.38",
44
"private": false,
55
"publishConfig": {
66
"registry": "https://nexus.iroha.tech/repository/npm-soramitsu/"

src/styles/neumorphism/button.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ $neu-button-padding-mini: 3px 6px !default;
173173
transition: $neu-button-transition;
174174
text-transform: uppercase;
175175

176+
&.s-primary, &.s-secondary, &.s-tertiary, &.s-action, &.s-link {
177+
@include focus-outline;
178+
}
179+
176180
@include size('big', $neu-button-padding-big);
177181
@include size('medium', $neu-button-padding-medium);
178182
@include size('small', $neu-button-padding-small);

src/styles/neumorphism/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
@import "./mixins";
12
@import "./button";
23
@import "./input";
34
@import "./card";

src/styles/neumorphism/input.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ $neu-input-padding: $s-basic-spacing $s-basic-spacing * 2 !default;
1616
height: initial;
1717
min-height: $s-size-big;
1818

19+
@include focus-outline(true);
20+
1921
&.s-size-small {
2022
padding-top: $s-basic-spacing / 2;
2123
padding-bottom: $s-basic-spacing / 2;

src/styles/neumorphism/mixins.scss

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@mixin focus-outline($focusWithin: false) {
2+
@if $focusWithin == true {
3+
&:focus-within {
4+
outline: 1px solid var(--s-color-outline);
5+
}
6+
} @else {
7+
&:focus {
8+
outline: 1px solid var(--s-color-outline);
9+
}
10+
}
11+
}

src/styles/root.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
--s-color-base-disabled: #{$s-color-base-disabled};
2121
--s-color-base-on-disabled: #{$s-color-base-on-disabled};
2222
--s-color-base-on-accent: #{$s-color-base-on-accent};
23+
--s-color-outline: #{$s-color-outline};
2324
--s-color-utility-body: #{$s-color-utility-body};
2425
--s-color-utility-surface: #{$s-color-utility-surface};
2526
--s-color-utility-overlay: #{$s-color-utility-overlay};
@@ -50,6 +51,7 @@
5051
--s-color-base-disabled--dark: #{$s-color-base-disabled--dark};
5152
--s-color-base-on-disabled--dark: #{$s-color-base-on-disabled--dark};
5253
--s-color-base-on-accent--dark: #{$s-color-base-on-accent--dark};
54+
--s-color-outline--dark: #{$s-color-outline--dark};
5355
--s-color-utility-body--dark: #{$s-color-utility-body--dark};
5456
--s-color-utility-surface--dark: #{$s-color-utility-surface--dark};
5557
--s-color-utility-overlay--dark: #{$s-color-utility-overlay--dark};
@@ -170,6 +172,7 @@
170172
--s-color-base-disabled: var(--s-color-base-disabled--dark);
171173
--s-color-base-on-disabled: var(--s-color-base-on-disabled--dark);
172174
--s-color-base-on-accent: var(--s-color-base-on-accent--dark);
175+
--s-color-outline: var(--s-color-outline--dark);
173176
--s-color-utility-body: var(--s-color-utility-body--dark);
174177
--s-color-utility-surface: var(--s-color-utility-surface--dark);
175178
--s-color-utility-overlay: var(--s-color-utility-overlay--dark);

src/styles/theme/dark.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ $s-color-base-background-hover--dark: #693D81 !default; // ????
2222
$s-color-base-disabled--dark: rgba(#391057, .5) !default; // ????
2323
$s-color-base-on-disabled--dark: #5D2F73 !default; // ????
2424
$s-color-base-on-accent--dark: #391057 !default;
25+
$s-color-outline--dark: rgba(255, 255, 255, 0.5);
2526
// Utility colors
2627
$s-color-utility-body--dark: #5D2F73 !default;
2728
$s-color-utility-surface--dark: #592D71 !default;

src/styles/variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ $s-color-base-background-hover: #ECEFF0 !default;
2222
$s-color-base-disabled: #F5F7F8 !default;
2323
$s-color-base-on-disabled: #75787B !default;
2424
$s-color-base-on-accent: #FFFFFF !default;
25+
$s-color-outline: rgba(0, 0, 0, 0.5);
2526
// Utility colors
2627
$s-color-utility-body: #FFFFFF !default;
2728
$s-color-utility-surface: #FFFFFF !default;

0 commit comments

Comments
 (0)