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

feat(comp): new colors for radio, checkbox, slider #1568

Merged
merged 4 commits into from
Dec 17, 2021
Merged

feat(comp): new colors for radio, checkbox, slider #1568

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c3c726f
feat(comp): new colors for radio, checkbox, slider
ti10le Dec 16, 2021
ce0c38e
use 'orange60' where its possible
ti10le Dec 17, 2021
61a94f5
use colors from theme
ti10le Dec 17, 2021
c76e252
gray also refa
ti10le Dec 17, 2021
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
6 changes: 6 additions & 0 deletions grumpy-geckos-mate.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@marigold/theme-core": patch
"@marigold/theme-unicorn": patch
---

feat(comp): new colors for radio, checkbox, slider
16 changes: 8 additions & 8 deletions themes/theme-b2b/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,8 @@ const theme: BaseTheme = {
},
},
checked: {
fill: colors.blue60,
stroke: colors.blue70,
fill: 'orange60',
stroke: 'orange80',
disabled: {
fill: colors.gray30,
stroke: colors.gray30,
Expand Down Expand Up @@ -376,8 +376,8 @@ const theme: BaseTheme = {
},
},
checked: {
fill: colors.blue60,
stroke: colors.blue70,
fill: 'orange60',
stroke: 'orange80',
disabled: {
fill: colors.gray30,
stroke: colors.gray30,
Expand Down Expand Up @@ -716,7 +716,7 @@ const theme: BaseTheme = {
},
'&:focus::-webkit-slider-thumb': {
...sliderThumb,
border: '4px solid ' + colors.blue60,
border: '4px solid ' + colors.orange60,
},
'&:disabled::-webkit-slider-thumb': {
...sliderThumb,
Expand All @@ -728,7 +728,7 @@ const theme: BaseTheme = {
},
'&:focus::-webkit-slider-runnable-track': {
...sliderTrack,
background: colors.blue60,
background: colors.orange60,
},
'&:disabled::-webkit-slider-runnable-track': {
...sliderTrack,
Expand All @@ -743,7 +743,7 @@ const theme: BaseTheme = {
},
'&:focus::-moz-range-thumb': {
...sliderThumb,
border: '4px solid ' + colors.blue60,
border: '4px solid ' + colors.orange60,
},
'&:disabled::-moz-range-thumb': {
...sliderThumb,
Expand All @@ -759,7 +759,7 @@ const theme: BaseTheme = {
},
'&:focus::-moz-range-progress': {
...sliderTrack,
background: colors.blue60,
background: colors.orange60,
},
'&:disabled::-moz-range-progress': {
...sliderTrack,
Expand Down
20 changes: 10 additions & 10 deletions themes/theme-unicorn/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,10 @@ const theme: BaseTheme = {
},
colors: {
...colors,
text: '#070708',
background: '#fdfcfd',
primary: '#c9b1ff',
secondary: '#ffcaf2',
text: colors.gray90,
ti10le marked this conversation as resolved.
Show resolved Hide resolved
background: colors.gray00,
primary: '#673ab7',
secondary: '#9575cd',
disabled: '#e9e7eb',
error: '#ffb2b1',
warning: '#fff3ad',
Expand Down Expand Up @@ -344,7 +344,7 @@ const theme: BaseTheme = {
},
checked: {
fill: 'primary',
stroke: 'primary',
stroke: '#311b92',
disabled: {
fill: colors.gray30,
stroke: colors.gray30,
Expand Down Expand Up @@ -377,7 +377,7 @@ const theme: BaseTheme = {
},
checked: {
fill: 'primary',
stroke: 'primary',
stroke: '#311b92',
disabled: {
fill: colors.gray30,
stroke: colors.gray30,
Expand Down Expand Up @@ -734,7 +734,7 @@ const theme: BaseTheme = {
},
'&:focus::-webkit-slider-thumb': {
...sliderThumb,
border: '4px solid ' + colors.blue60,
border: '4px solid #673ab7',
},
'&:disabled::-webkit-slider-thumb': {
...sliderThumb,
Expand All @@ -746,7 +746,7 @@ const theme: BaseTheme = {
},
'&:focus::-webkit-slider-runnable-track': {
...sliderTrack,
background: colors.blue60,
background: '#673ab7',
},
'&:disabled::-webkit-slider-runnable-track': {
...sliderTrack,
Expand All @@ -761,7 +761,7 @@ const theme: BaseTheme = {
},
'&:focus::-moz-range-thumb': {
...sliderThumb,
border: '4px solid ' + colors.blue60,
border: '4px solid #673ab7',
},
'&:disabled::-moz-range-thumb': {
...sliderThumb,
Expand All @@ -777,7 +777,7 @@ const theme: BaseTheme = {
},
'&:focus::-moz-range-progress': {
...sliderTrack,
background: colors.blue60,
background: '#673ab7',
},
'&:disabled::-moz-range-progress': {
...sliderTrack,
Expand Down