Skip to content
Snippets Groups Projects
Commit 35d6d9cc authored by xaralis's avatar xaralis
Browse files

Revamp color scheme

parent 8a0079d1
Branches
No related tags found
No related merge requests found
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
} }
td { td {
@apply border border-grey-150; @apply border border-grey-125;
} }
} }
......
.calendar-table-row { .calendar-table-row {
@apply border-b border-grey-150; @apply border-b border-grey-125;
&:first-of-type { &:first-of-type {
@apply border-t; @apply border-t;
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
} }
.calendar-table-row__col { .calendar-table-row__col {
@apply h-full border-r border-grey-150 p-2 flex justify-center items-center; @apply h-full border-r border-grey-125 p-2 flex justify-center items-center;
&:first-child { &:first-child {
@apply border-l; @apply border-l;
......
...@@ -23,13 +23,13 @@ ...@@ -23,13 +23,13 @@
} }
.candidate-card__affiliation { .candidate-card__affiliation {
@apply text-sm bg-grey-50 flex border-t border-b border-grey-150; @apply text-sm bg-grey-50 flex border-t border-b border-grey-125;
> div { > div {
@apply py-2 px-4 flex items-center; @apply py-2 px-4 flex items-center;
&:not(:first-child) { &:not(:first-child) {
@apply border-l border-grey-150; @apply border-l border-grey-125;
} }
&:last-child { &:last-child {
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
} }
.candidate-table-row__bio { .candidate-table-row__bio {
@apply border-l border-grey-150 py-0 px-8; @apply border-l border-grey-125 py-0 px-8;
} }
.candidate-table-row__affiliation { .candidate-table-row__affiliation {
......
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
&.switch__item--active, &.switch__item--active,
&.switch__item--active:hover { &.switch__item--active:hover {
@apply bg-green-100; @apply bg-cyan-300;
} }
} }
...@@ -12,5 +12,5 @@ ...@@ -12,5 +12,5 @@
} }
.region-map__region--current { .region-map__region--current {
fill: theme('colors.black'); fill: theme('colors.violet.400');
} }
...@@ -157,41 +157,27 @@ module.exports = function (options) { ...@@ -157,41 +157,27 @@ module.exports = function (options) {
}, },
}, },
..._.map(options.colors, (colorOptions, name) => { ..._.map(options.colors, (colorOptions, name) => {
const bg = getThemeColor(colorOptions.background, '#000');
return { return {
// Standard colorized variant // Standard colorized variant
[`.btn--${e(name)} .btn__body, .btn--${e(name)} .btn__icon`]: { [`.btn--${e(name)} .btn__body, .btn--${e(name)} .btn__icon`]: {
backgroundColor: getThemeColor(colorOptions.background), backgroundColor: getThemeColor(colorOptions.background),
color: getThemeColor(colorOptions.text), color: getThemeColor(colorOptions.text),
// '&:focus': {
// outline: 0,
// boxShadow: `0 0 0 .2em ${Color(colorOptions.background).alpha(.5).rgb().toString()}`,
// },
// '&:hover': {
// backgroundColor: _.get(colorOptions, 'hoverBackground', Color(colorOptions.background).darken(0.1).hex().toString()),
// color: _.get(colorOptions, 'hoverText', colorOptions.text),
// },
// '&:active': {
// backgroundColor: _.get(colorOptions, 'activeBackground', Color(colorOptions.background).darken(0.1).hex().toString()),
// color: _.get(colorOptions, 'activeText', colorOptions.text),
// }
}, },
[`.btn--${e(name)} .btn__icon`]: { [`.btn--${e(name)} .btn__icon`]: {
borderColor: getThemeColor(colorOptions.iconBorder, darken(getThemeColor(colorOptions.background, '#000'), 0.1)), borderColor: getThemeColor(colorOptions.iconBorder, darken(bg, 0.1)),
backgroundColor: getThemeColor(colorOptions.iconBackground, getThemeColor(colorOptions.background, '#000')), backgroundColor: getThemeColor(colorOptions.iconBackground, bg),
}, },
// Hover state unless set with --to-* variant. // Hover state unless set with --to-* variant.
[`.btn--${e(name)}.btn--hoveractive:not([class^="btn--to-"]):hover`]: { [`.btn--${e(name)}.btn--hoveractive:not([class^="btn--to-"]):hover`]: {
'.btn__body, .btn__icon': { '.btn__body, .btn__icon': {
backgroundColor: getThemeColor(colorOptions.hoverBackground, '#000'), backgroundColor: getThemeColor(colorOptions.hoverBackground, darken(bg, 0.2)),
color: getThemeColor(colorOptions.hoverText, '#fff'), color: getThemeColor(colorOptions.hoverText, '#fff'),
}, },
'.btn__icon': { '.btn__icon': {
borderColor: getThemeColor( borderColor: getThemeColor(
colorOptions.hoverIconBorder, colorOptions.hoverIconBorder,
lighten( darken(bg, 0.3)
getThemeColor(colorOptions.hoverBackground, '#000'),
0.1
)
), ),
}, },
'.btn__icon svg, .btn__icon i': { '.btn__icon svg, .btn__icon i': {
......
...@@ -66,7 +66,6 @@ module.exports = { ...@@ -66,7 +66,6 @@ module.exports = {
'50': '#f7f7f7', '50': '#f7f7f7',
'100': '#f3f3f3', '100': '#f3f3f3',
'125': '#f0f0f0', '125': '#f0f0f0',
'150': '#00000012',
'200': '#adadad', '200': '#adadad',
'300': '#4c4c4c', '300': '#4c4c4c',
'400': '#343434', '400': '#343434',
...@@ -75,21 +74,41 @@ module.exports = { ...@@ -75,21 +74,41 @@ module.exports = {
'700': '#202020', '700': '#202020',
'800': '#1f1f1f', '800': '#1f1f1f',
}, },
'red': {
'100': '#d6151b',
'200': darken('#d6151b', 0.1),
},
'green': { 'green': {
'100': '#29bc51', '100': '#d6e8b3',
'200': darken('#29bc51', 0.1), '200': '#92c6ab',
'300': darken('#29bc51', 0.18), '300': darken('#92c6ab', 0.1),
}, },
'brands': { 'brands': {
'facebook': '#067ceb', 'facebook': '#067ceb',
'twitter': '#00c9ff', 'twitter': '#00c9ff',
'gmail': '#ec230e', 'gmail': '#ec230e',
'linkedin': '#0066a9', 'linkedin': '#0066a9',
} },
'blue': {
'100': '#abcdef',
'200': '#76b4cf',
'300': '#027da8',
},
'cyan': {
'100': '#a7d4d1',
'200': '#57b3bd',
'300': '#3e8793',
'400': '#497280',
'500': '#004958',
},
'orange': {
'100': '#f2d29f',
'200': '#f1ae7b',
'300': '#ed9654',
},
'violet': {
'100': '#edc8bd',
'200': '#d28c94',
'300': '#8d415f',
'400': '#840048',
'500': '#670047',
},
}, },
container: { container: {
center: true, center: true,
...@@ -139,56 +158,54 @@ module.exports = { ...@@ -139,56 +158,54 @@ module.exports = {
text: 'white', text: 'white',
background: 'black', background: 'black',
iconBorder: 'grey.400', iconBorder: 'grey.400',
iconBackground: 'grey.800',
hoverIconBorder: 'grey.600',
},
'grey-800': {
text: 'white',
background: 'grey.800',
iconBorder: 'grey.500',
hoverIconBorder: 'grey.600', hoverIconBorder: 'grey.600',
}, },
'grey-700': { 'grey-700': {
text: 'white', text: 'white',
background: 'grey.700', background: 'grey.700',
iconBorder: 'grey.800', iconBorder: 'grey.500',
hoverBackground: 'grey.400',
hoverIconBorder: 'grey.600', hoverIconBorder: 'grey.600',
}, },
'grey-500': { 'grey-500': {
text: 'white', text: 'white',
background: 'grey.500', background: 'grey.500',
iconBorder: 'grey.300', iconBorder: 'grey.300',
hoverIconBorder: 'grey.600', hoverBackground: 'grey.300',
}, hoverIconBorder: 'grey.400',
'grey-300': {
text: 'white',
background: 'grey.300',
iconBorder: 'grey.150',
hoverIconBorder: 'grey.600',
}, },
'grey-125': { 'grey-125': {
text: 'black', text: 'black',
background: 'grey.125', background: 'grey.125',
iconBorder: 'grey.150',
hoverIconBorder: 'grey.600',
}, },
'white': { 'white': {
text: 'black', text: 'black',
background: 'white', background: 'white',
iconBorder: 'grey.100', iconBorder: 'grey.100',
hoverIconBorder: 'grey.600',
}, },
'green-100': { 'blue-300': {
text: 'white', text: 'white',
background: 'green.100', background: 'blue.300',
iconBorder: 'green.200',
hoverIconBorder: 'grey.600',
}, },
'red-100': { 'cyan-200': {
text: 'white', text: 'white',
background: 'red.100', background: 'cyan.200',
iconBorder: 'red.200', },
hoverIconBorder: 'grey.600', 'green-200': {
text: 'white',
background: 'green.200',
},
'orange-300': {
text: 'white',
background: 'orange.300',
},
'violet-400': {
text: 'white',
background: 'violet.400',
},
'violet-500': {
text: 'white',
background: 'violet.500',
}, },
'brands-facebook': { 'brands-facebook': {
text: 'white', text: 'white',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment