mirror of
https://github.com/tabler/tabler.git
synced 2026-10-13 21:57:00 +04:00
Consolidate focus states into the focus-ring() mixin (#2972)
Step 1 of #2972, output-neutral. `focus-ring()` is now the one implementation — `outline` + `box-shadow: $focus-ring-box-shadow`, with `$shadow` (validation colour, range extra layer) and `$outline` (skip the reset on sibling / `:focus-within` selectors) parameters. Every direct `box-shadow: $*-focus-box-shadow` consumer calls it; the 14 `$*-focus-box-shadow` variables stay as `!default` aliases. Compiled CSS byte-identical to `v2-dev`; html-diff, test:scss and lint green.
This commit is contained in:
1 parent
d199ea812e
commit
f8a293d1b9
14 files changed
+48
-22
No files matched your search
@@ -0,0 +1,5 @@
|
||||
---
|
||||
"@tabler/core": patch
|
||||
---
|
||||
|
||||
Updated `focus-ring()` to be the single focus-indicator mixin; the `$*-focus-box-shadow` variables stay as aliases.
|
||||
@@ -253,6 +253,12 @@ of `color-scheme`, the token-dump verification harness) but not its code.
|
||||
- Decide on `$spacers`: adopting the v6 0–9 scale silently changes every `.p-3` / `.m-4` in every
|
||||
Tabler template. Recommendation: keep the v5 scale, add finer steps at new keys.
|
||||
- Replace all `$*-focus-box-shadow` with one `focus-ring()` mixin over `--focus-ring*` tokens.
|
||||
Step 1 done (#2972): `focus-ring()` reads `$focus-ring-box-shadow` and every focus consumer calls
|
||||
it; the `$*-focus-box-shadow` variables stay as `!default` aliases; CSS byte-identical. Tabler
|
||||
keeps the two-layer `box-shadow` look, not v6's `outline`, and the `forced-colors` fallback in
|
||||
`layout/_accessibility.scss` stays. `.form-select` is still a single-layer exception. Step 2
|
||||
(emit `--focus-ring-box-shadow` on `:root`, fix the `.focus-ring` helper, decide the
|
||||
`.form-select` ring) is a follow-up.
|
||||
- Consider the layered shadow scale (`.shadow-xs`…`.shadow-xl`) and `.border-keyline`.
|
||||
- Skip the `.fs-*` renaming — it inverts the scale direction and breaks every page.
|
||||
|
||||
|
||||
@@ -41,8 +41,7 @@
|
||||
}
|
||||
|
||||
&:focus-visible {
|
||||
outline: 0;
|
||||
box-shadow: $nav-link-focus-box-shadow;
|
||||
@include focus-ring($shadow: $nav-link-focus-box-shadow);
|
||||
}
|
||||
|
||||
// Disabled state lightens text
|
||||
|
||||
@@ -61,8 +61,7 @@
|
||||
|
||||
&:focus {
|
||||
border-color: $form-check-input-focus-border;
|
||||
outline: 0;
|
||||
box-shadow: $form-check-input-focus-box-shadow;
|
||||
@include focus-ring($shadow: $form-check-input-focus-box-shadow);
|
||||
}
|
||||
|
||||
&:checked {
|
||||
|
||||
@@ -19,10 +19,10 @@
|
||||
// Pseudo-elements must be split across multiple rulesets to have an effect.
|
||||
// No box-shadow() mixin for focus accessibility.
|
||||
&::-webkit-slider-thumb {
|
||||
box-shadow: $form-range-thumb-focus-box-shadow;
|
||||
@include focus-ring($shadow: $form-range-thumb-focus-box-shadow, $outline: null);
|
||||
}
|
||||
&::-moz-range-thumb {
|
||||
box-shadow: $form-range-thumb-focus-box-shadow;
|
||||
@include focus-ring($shadow: $form-range-thumb-focus-box-shadow, $outline: null);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -77,14 +77,15 @@
|
||||
gap: var(--list-gap);
|
||||
}
|
||||
|
||||
@mixin focus-ring($show-border: false) {
|
||||
outline: 0;
|
||||
box-shadow:
|
||||
0 0 0 2px var(--primary),
|
||||
0 0 $focus-ring-blur $focus-ring-width color-transparent(var(--primary), 0.25);
|
||||
@mixin focus-ring($shadow: $focus-ring-box-shadow, $show-border: false, $outline: 0) {
|
||||
@if $outline != null {
|
||||
outline: $outline;
|
||||
}
|
||||
|
||||
@if ($show-border) {
|
||||
border-color: color-transparent(var(--primary), 0.25);
|
||||
box-shadow: $shadow;
|
||||
|
||||
@if $show-border {
|
||||
border-color: $focus-ring-color;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
@use '../../settings' as *;
|
||||
@use '../../variables' as *;
|
||||
@use '../functions' as *;
|
||||
@use '../mixins' as *;
|
||||
@use 'breakpoints' as *;
|
||||
// This mixin uses an `if()` technique to be compatible with Dart Sass
|
||||
// See https://github.com/sass/sass/issues/1873#issuecomment-152293725 for more details
|
||||
@@ -70,7 +71,7 @@
|
||||
@if $enable-shadows {
|
||||
@include box-shadow($input-box-shadow, $focus-box-shadow);
|
||||
} @else {
|
||||
box-shadow: $focus-box-shadow;
|
||||
@include focus-ring($shadow: $focus-box-shadow, $outline: null);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -105,7 +106,7 @@
|
||||
@if $enable-shadows {
|
||||
@include box-shadow($form-select-box-shadow, $focus-box-shadow);
|
||||
} @else {
|
||||
box-shadow: $focus-box-shadow;
|
||||
@include focus-ring($shadow: $focus-box-shadow, $outline: null);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -128,7 +129,7 @@
|
||||
}
|
||||
|
||||
&:focus {
|
||||
box-shadow: $focus-box-shadow;
|
||||
@include focus-ring($shadow: $focus-box-shadow, $outline: null);
|
||||
}
|
||||
|
||||
~ .form-check-label {
|
||||
|
||||
@@ -140,6 +140,21 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@include it('passes $shadow through and skips the outline reset with $outline: null') {
|
||||
@include assert() {
|
||||
@include output() {
|
||||
.t {
|
||||
@include focus-ring($shadow: 0 0 0 1px red, $outline: null);
|
||||
}
|
||||
}
|
||||
@include expect() {
|
||||
.t {
|
||||
box-shadow: 0 0 0 1px red;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@include describe('media-print mixin') {
|
||||
|
||||
@@ -207,7 +207,7 @@ Input group
|
||||
|
||||
.input-group-flat {
|
||||
&:focus-within {
|
||||
box-shadow: $input-focus-box-shadow;
|
||||
@include focus-ring($shadow: $input-focus-box-shadow, $outline: null);
|
||||
@include border-radius($input-border-radius);
|
||||
|
||||
.form-control,
|
||||
|
||||
@@ -46,7 +46,7 @@ Color Input
|
||||
|
||||
.form-colorinput-input:focus ~ & {
|
||||
border-color: var(--primary);
|
||||
box-shadow: $input-btn-focus-box-shadow;
|
||||
@include focus-ring($shadow: $input-btn-focus-box-shadow, $outline: null);
|
||||
}
|
||||
|
||||
@at-root .form-colorinput-light & {
|
||||
|
||||
@@ -28,7 +28,7 @@ Image check
|
||||
|
||||
.form-imagecheck-input:focus ~ & {
|
||||
border-color: var(--primary);
|
||||
box-shadow: $input-btn-focus-box-shadow;
|
||||
@include focus-ring($shadow: $input-btn-focus-box-shadow, $outline: null);
|
||||
}
|
||||
|
||||
.form-imagecheck-input:checked ~ & {
|
||||
|
||||
@@ -111,7 +111,7 @@ Select group
|
||||
z-index: 2;
|
||||
color: var(--primary);
|
||||
border-color: var(--primary);
|
||||
box-shadow: $input-btn-focus-box-shadow;
|
||||
@include focus-ring($shadow: $input-btn-focus-box-shadow, $outline: null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Vendored
+1
-1
@@ -17,7 +17,7 @@ input.clr-color {
|
||||
border-color: var(--border-color);
|
||||
|
||||
&:focus {
|
||||
@include focus-ring(true);
|
||||
@include focus-ring($show-border: true);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Vendored
+1
-1
@@ -43,7 +43,7 @@
|
||||
|
||||
&.noUi-active,
|
||||
&:focus {
|
||||
box-shadow: $form-range-thumb-focus-box-shadow;
|
||||
@include focus-ring($shadow: $form-range-thumb-focus-box-shadow, $outline: null);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user