archive-gh-me/tailwindcss
1
0
Fork 0
mirror of https://github.com/tailwindlabs/tailwindcss.git synced 2025-12-08 21:36:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix cascading shadow/ring bug, ensure default ring color

Browse Source
This commit is contained in:
Adam Wathan 2020-11-16 19:47:45 -05:00
parent 5e50367172
commit e40079a457
8 changed files with 78 additions and 1727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

439
__tests__/fixtures/tailwind-output-flagged.css
View File

File diff suppressed because it is too large Load Diff

445
__tests__/fixtures/tailwind-output-important.css
View File

File diff suppressed because it is too large Load Diff

439
__tests__/fixtures/tailwind-output-no-color-opacity.css
View File

File diff suppressed because it is too large Load Diff

439
__tests__/fixtures/tailwind-output.css
View File

File diff suppressed because it is too large Load Diff

14
__tests__/plugins/boxShadow.test.js
View File

@ -31,10 +31,10 @@ test('box shadow can use DEFAULT keyword and negative prefix syntax', () => {
return getConfigValue(`variants.${path}`, defaultValue)
},
addUtilities(utilities, variants) {
addUtilities(utilities, options) {
addedUtilities.push({
utilities,
variants,
options,
})
},
}
@ -42,6 +42,14 @@ test('box shadow can use DEFAULT keyword and negative prefix syntax', () => {
plugin()(pluginApi)
expect(addedUtilities).toEqual([
{
utilities: {
'*': {
'--tw-shadow': '0 0 #0000',
},
},
options: { respectImportant: false },
},
{
utilities: {
'.shadow': {
@ -65,7 +73,7 @@ test('box shadow can use DEFAULT keyword and negative prefix syntax', () => {
'var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow)',
},
},
variants: ['responsive'],
options: ['responsive'],
},
])
})

9
src/plugins/boxShadow.js
View File

@ -3,6 +3,15 @@ import nameClass from '../util/nameClass'
export default function () {
return function ({ addUtilities, theme, variants }) {
addUtilities(
{
'*': {
'--tw-shadow': '0 0 #0000',
},
},
{ respectImportant: false }
)
const utilities = _.fromPairs(
_.map(theme('boxShadow'), (value, modifier) => {
return [

18
src/plugins/ringWidth.js
View File

@ -16,15 +16,25 @@ export default function () {
return `rgba(${r}, ${g}, ${b}, ${theme('ringOpacity.DEFAULT', '0.5')})`
})(safeCall(() => toRgba(theme('ringColor.DEFAULT')), ['147', '197', '253']))
addUtilities(
{
'*': {
'--tw-ring-inset': 'var(--tw-empty,/*!*/ /*!*/)',
'--tw-ring-offset-width': '0px',
'--tw-ring-offset-color': '#fff',
'--tw-ring-color': ringColorDefault,
'--tw-ring-offset-shadow': '0 0 #0000',
'--tw-ring-shadow': '0 0 #0000',
},
},
{ respectImportant: false }
)
const utilities = _.fromPairs(
_.map(theme('ringWidth'), (value, modifier) => {
return [
nameClass('ring', modifier),
{
'--tw-ring-inset': 'var(--tw-empty,/*!*/ /*!*/)',
'--tw-ring-offset-width': '0px',
'--tw-ring-offset-color': '#fff',
'--tw-ring-color': ringColorDefault,
'--tw-ring-offset-shadow': `var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color)`,
'--tw-ring-shadow': `var(--tw-ring-inset) 0 0 0 calc(${value} + var(--tw-ring-offset-width)) var(--tw-ring-color)`,
'box-shadow': [

2
stubs/defaultConfig.stub.js
View File

@ -535,7 +535,7 @@ module.exports = {
placeholderColor: (theme) => theme('colors'),
placeholderOpacity: (theme) => theme('opacity'),
ringColor: (theme) => ({
DEFAULT: theme('colors.blue.500'),
DEFAULT: theme('colors.blue.500', '#3b82f6'),
...theme('colors'),
}),
ringOffsetColor: (theme) => theme('colors'),