Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add inherit to color palette #5597

Merged
merged 1 commit into from
Sep 26, 2021
Merged

Add inherit to color palette #5597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add inherit to color palette 
Re-implementation of #2706.

Co-Authored-By: Jorge González <[email protected]>
  • Loading branch information
@adamwathan @iksaku @RobinMalfait
2 people authored and RobinMalfait committed Sep 26, 2021
commit 3acec894c3f4824caa4586e23730e0beddf04c07
3 changes: 2 additions & 1 deletion src/public/colors.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ function warn({ version, from, to }) {
}

export default {
transparent: 'transparent',
inherit: 'inherit',
current: 'currentColor',
transparent: 'transparent',
black: '#000',
white: '#fff',
slate: {
Expand Down
3 changes: 2 additions & 1 deletion stubs/defaultConfig.stub.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ module.exports = {
'2xl': '1536px',
},
colors: ({ colors }) => ({
transparent: colors.transparent,
inherit: colors.inherit,
current: colors.current,
transparent: colors.transparent,
black: colors.black,
white: colors.white,
slate: colors.slate,
Expand Down