Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add new
ring utilities for custom focus styles and rounded outlines (…
…#2747) * Add ring utilities * Remove redundant shadows, add 5% and 95% to opacity scale * Undo changes to build file * Update boxShadow.test.js
- Loading branch information
1 parent
d39ecc5
commit d4fcd2e
Showing
14 changed files
with
26,960 additions
and
1,856 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
7,374 changes: 6,912 additions & 462 deletions
7,374
__tests__/fixtures/tailwind-output-important.css
Large diffs are not rendered by default.
Oops, something went wrong.
6,510 changes: 6,048 additions & 462 deletions
6,510
__tests__/fixtures/tailwind-output-no-color-opacity.css
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| import _ from 'lodash' | ||
| import flattenColorPalette from '../util/flattenColorPalette' | ||
| import nameClass from '../util/nameClass' | ||
| import { toRgba } from '../util/withAlphaVariable' | ||
|
|
||
| export default function () { | ||
| return function ({ addUtilities, theme, variants }) { | ||
| const colors = flattenColorPalette(theme('ringColor')) | ||
| const utilities = _.fromPairs( | ||
| _.map(_.omit(colors, 'DEFAULT'), (value, modifier) => { | ||
| try { | ||
| const [r, g, b, a] = toRgba(value) | ||
| return [ | ||
| nameClass('ring', modifier), | ||
| { | ||
| '--ring-opacity': a === undefined ? '1' : a, | ||
| '--ring-color': `rgba(${r}, ${g}, ${b}, var(--ring-opacity))`, | ||
| }, | ||
| ] | ||
| } catch (_error) { | ||
| return [ | ||
| nameClass('ring', modifier), | ||
| { | ||
| '--ring-color': value, | ||
| }, | ||
| ] | ||
| } | ||
| }) | ||
| ) | ||
| addUtilities(utilities, variants('ringColor')) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| import _ from 'lodash' | ||
| import flattenColorPalette from '../util/flattenColorPalette' | ||
| import nameClass from '../util/nameClass' | ||
|
|
||
| export default function () { | ||
| return function ({ addUtilities, theme, variants }) { | ||
| const colors = flattenColorPalette(theme('ringOffsetColor')) | ||
| const utilities = _.fromPairs( | ||
| _.map(colors, (value, modifier) => { | ||
| return [ | ||
| nameClass('ring-offset', modifier), | ||
| { | ||
| '--ring-offset-color': value, | ||
| }, | ||
| ] | ||
| }) | ||
| ) | ||
| addUtilities(utilities, variants('ringOffsetColor')) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import _ from 'lodash' | ||
| import nameClass from '../util/nameClass' | ||
|
|
||
| export default function () { | ||
| return function ({ addUtilities, theme, variants }) { | ||
| const utilities = _.fromPairs( | ||
| _.map(theme('ringOffsetWidth'), (value, modifier) => { | ||
| return [ | ||
| nameClass('ring-offset', modifier), | ||
| { | ||
| '--ring-offset-width': value, | ||
| }, | ||
| ] | ||
| }) | ||
| ) | ||
| addUtilities(utilities, variants('ringOffsetWidth')) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| import _ from 'lodash' | ||
| import nameClass from '../util/nameClass' | ||
|
|
||
| export default function () { | ||
| return function ({ addUtilities, theme, variants }) { | ||
| const utilities = _.fromPairs( | ||
| _.map(_.omit(theme('ringOpacity'), 'DEFAULT'), (value, modifier) => { | ||
| return [ | ||
| nameClass('ring-opacity', modifier), | ||
| { | ||
| '--ring-opacity': value, | ||
| }, | ||
| ] | ||
| }) | ||
| ) | ||
| addUtilities(utilities, variants('ringOpacity')) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import _ from 'lodash' | ||
| import nameClass from '../util/nameClass' | ||
| import { toRgba } from '../util/withAlphaVariable' | ||
|
|
||
| export default function () { | ||
| return function ({ addUtilities, theme, variants }) { | ||
| function safeCall(callback, defaultValue) { | ||
| try { | ||
| return callback() | ||
| } catch (_error) { | ||
| return defaultValue | ||
| } | ||
| } | ||
|
|
||
| const ringColorDefault = (([r, g, b]) => { | ||
| return `rgba(${r}, ${g}, ${b}, ${theme('ringOpacity.DEFAULT', '0.5')})` | ||
| })(safeCall(() => toRgba(theme('ringColor.DEFAULT')), ['147', '197', '253'])) | ||
|
|
||
| const utilities = _.fromPairs( | ||
| _.map(theme('ringWidth'), (value, modifier) => { | ||
| return [ | ||
| nameClass('ring', modifier), | ||
| { | ||
| '--ring-width': value, | ||
| '--ring-color-default': ringColorDefault, | ||
| 'box-shadow': [ | ||
| `0 0 0 var(--ring-offset-width, 0) var(--ring-offset-color, #fff)`, | ||
| `0 0 0 calc(var(--ring-width) + var(--ring-offset-width, 0px)) var(--ring-color, var(--ring-color-default))`, | ||
| `var(--box-shadow, 0 0 #0000)`, | ||
| ].join(', '), | ||
| }, | ||
| ] | ||
| }) | ||
| ) | ||
| addUtilities(utilities, variants('ringWidth')) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters