Skip to content

Added colors in a logic way #18

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

Merged
merged 3 commits into from
Nov 25, 2020
Merged

Added colors in a logic way #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96b13f5
Added colors in a logic way
EranNL Nov 24, 2020
14717b4
Changed button text to corresponding color
EranNL Nov 25, 2020
02e3c54
Made all buttons block buttons
EranNL Nov 25, 2020
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
27 changes: 18 additions & 9 deletions src/components/utils/Variant.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,22 @@ export enum Variant {
PRIMARY_GHOST = 'primary-ghost',
SECONDARY = 'secondary',
DANGER = 'danger',
DANGER_GHOST = 'danger-ghost'
DANGER_GHOST = 'danger-ghost',
RED = 'red',
PINK = 'pink',
PURPLE = 'purple',
DEEP_PURPLE = 'deep-purple',
INDIGO = 'indigo',
BLUE = 'blue',
LIGHT_BLUE = 'light-blue',
TEAL = 'teal',
GREEN = 'green',
LIGHT_GREEN = 'light-green',
LIME = 'lime',
YELLOW = 'yellow',
AMBER = 'amber',
ORANGE = 'orange',
BROWN = 'brown',
GRAY = 'gray',
BLUE_GRAY = 'blue-gray'
}

export const variantList: string[] = [
'primary',
'primary-ghost',
'secondary',
'danger',
'danger-ghost'
];
6 changes: 3 additions & 3 deletions src/style/base/_mixins.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@use "colors";
@use "variables";

@function color($color, $variant: 500) {
@return map-get(map-get(colors.$colors, $color), $variant);
@function color($color, $variant: 'default') {
@return map-get(map-get(variables.$colors, $color), $variant);
}
18 changes: 10 additions & 8 deletions src/style/base/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "mixins";
@use "variables";

/* inter-100 - latin */
@font-face {
Expand Down Expand Up @@ -97,46 +98,47 @@

h1 {
font-size: 2rem;
color: mixins.color('gray', 900);
color: variables.$base-font-color;
font-weight: normal;
margin: 0;
}

h2 {
font-size: 1.8rem;
margin: 0 0 1rem;
color: mixins.color('gray', 900);
color: variables.$base-font-color;
}

h3 {
font-size: 1.6rem;
margin: 0 0 1rem;
color: mixins.color('gray', 900);
color: variables.$base-font-color;
}

h4 {
font-size: 1.4rem;
margin: 0 0 1rem;
color: mixins.color('gray', 900);
color: variables.$base-font-color;
font-weight: normal;
}

h5 {
font-size: 1.2rem;
margin: 0 0 1rem;
color: mixins.color('gray', 900);
color: variables.$base-font-color;
font-weight: 600;
}

h6 {
font-size: 1.1rem;
margin: 0 0 1rem;
color: mixins.color('gray', 900);
color: variables.$base-font-color;
}

.text-danger {
color: mixins.color('red', 700);
color: variables.color('red', 'default');
}

.text-secondary {
color: mixins.color('gray', 600);
color: variables.color('gray', 'default');
}
190 changes: 153 additions & 37 deletions src/style/base/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,143 @@
@use "mixins";
@use "colors";
/**
* 1. Colors
*/
$colors: (
'red': (
'background': hsl(351, 100%, 96%),
'background-hover': hsl(354, 100%, 94%),
'default': hsl(0, 65%, 51%),
'hover': hsl(0, 66%, 47%),
'active': hsl(0, 73%, 41%),
'default-font-color': #fff, //AA
),
'pink': (
'background': hsl(340, 80%, 94%),
'default': hsl(338, 78%, 48%),
'hover': hsl(336, 78%, 43%),
'active': hsl(334, 79%, 38%),
'default-font-color': #fff, //AA
),
'purple': (
'background': hsl(292, 44%, 93%),
'default': hsl(287, 65%, 40%),
'hover': hsl(282, 68%, 38%),
'active': hsl(277, 70%, 35%),
'default-font-color': #fff, //AAAA
),
'deep-purple': (
'background': hsl(264, 45%, 94%),
'background-hover': hsl(263, 45%, 90%),
'default': hsl(260, 54%, 45%),
'hover': hsl(258, 58%, 42%),
'active': hsl(251, 69%, 34%),
'default-font-color': #fff,
),
'indigo': (
'background': hsl(231, 44%, 94%),
'default': hsl(232, 50%, 45%),
'hover': hsl(232, 54%, 41%),
'active': hsl(233, 57%, 37%),
'default-font-color': #fff, //AAA
),
'blue': (
'background': hsl(205, 87%, 94%),
'default': hsl(210, 79%, 46%),
'hover': hsl(212, 80%, 42%),
'active': hsl(216, 85%, 34%),
'default-font-color': #fff, //AA
),
'light-blue': (
'background': hsl(199, 94%, 94%),
'default': hsl(199, 91%, 64%),
'hover': hsl(199, 92%, 56%),
'active': hsl(199, 98%, 48%),
'default-font-color': #000, //AAA
),
'teal': (
'background': hsl(177, 72%, 93%),
'default': hsl(187, 100%, 38%),
'hover': hsl(186, 100%, 33%),
'active': hsl(185, 100%, 28%),
'default-font-color': #000, //AAA
),
'green': (
'background': hsl(125, 39%, 94%),
'default': hsl(123, 41%, 45%),
'hover': hsl(123, 43%, 39%),
'active': hsl(123, 46%, 34%),
'default-font-color': #000, //AA
),
'light-green': (
'background': hsl(88, 52%, 94%),
'default': hsl(89, 46%, 48%),
'hover': hsl(92, 48%, 42%),
'active': hsl(95, 49%, 36%),
'default-font-color': #000, //AAA
),
'lime': (
'background': hsl(66, 71%, 95%),
'default': hsl(64, 60%, 50%),
'hover': hsl(62, 61%, 44%),
'active': hsl(60, 63%, 38%),
'default-font-color': #000, //AAA
),
'yellow': (
'background': hsl(55, 100%, 95%),
'default': hsl(49, 98%, 60%),
'hover': hsl(43, 96%, 58%),
'active': hsl(37, 95%, 56%),
'default-font-color': #000, //AAA
),
'amber': (
'background': hsl(46, 100%, 94%),
'default': hsl(42, 100%, 50%),
'hover': hsl(38, 100%, 50%),
'active': hsl(34, 100%, 50%),
'default-font-color': #000, //AAA
),
'orange': (
'background': hsl(37, 100%, 94%),
'default': hsl(33, 100%, 49%),
'hover': hsl(30, 100%, 48%),
'active': hsl(27, 100%, 47%),
'default-font-color': #000, //AAA
),
'brown': (
'background': hsl(20, 16%, 93%),
'default': hsl(15, 25%, 34%),
'hover': hsl(14, 26%, 29%),
'active': hsl(11, 26%, 24%),
'default-font-color': #fff, //AAA
),
'gray': (
'background': hsl(0, 0%, 98%),
'default': hsl(0, 0%, 46%),
'hover': hsl(0, 0%, 38%),
'active': hsl(0, 0%, 26%),
'default-font-color': #fff, //AA
),
'blue-gray': (
'background': hsl(204, 15%, 94%),
'default': hsl(199, 18%, 33%),
'hover': hsl(200, 18%, 26%),
'active': hsl(200, 19%, 18%),
'default-font-color': #fff, //AAA
)
);

@function color($color, $variant: 'default') {
@return map-get(map-get($colors, $color), $variant);
}

/**
* 1. Base
* 2. Base
*/
$base-background-color: mixins.color('gray', 50);
$base-background-color: color('gray', 'background');
$base-body-gutter: 0;
$base-font-color: mixins.color('blueGray', 900);
$base-font-color: hsl(200, 19%, 18%);
$base-font-family: 'Inter, apple-sf-pro-text, Helvetica, Arial, sans-serif';
$base-border-color: mixins.color('gray', 300);
$bse-border-hover-color: mixins.color('gray', 400);
$base-border-color: hsl(0, 0%, 88%);
$base-border-hover-color: hsl(0, 0%, 74%);
$base-border-radius: 4px;
$base-gutter: 1rem;
$base-gutter-steps: 0.25;
Expand All @@ -27,42 +155,31 @@ $breakpoints: (
--base-font-color: #{$base-font-color};
--base-font-family: #{$base-font-family};
--base-border-color: #{$base-border-color};
--base-border-hover-color: #{$bse-border-hover-color};
--base-border-hover-color: #{$base-border-hover-color};
--base-border-radius: #{$base-border-radius};
--base-gutter: #{$base-gutter};
}

/**
* 2. Colors
*/
$primary-color: mixins.color('deepPurple', 600);
$primary-color-hover: mixins.color('deepPurple', 700);
$primary-color-active: mixins.color('deepPurple', 800);
$primary-color-light-background: mixins.color('deepPurple', 50);

$secondary-color: mixins.color('red', 600);
$secondary-color-hover: mixins.color('red', 700);
$secondary-color-active: mixins.color('red', 800);
$primary-color: color('deep-purple', 'default');
$primary-color-hover: color('deep-purple', 'hover');
$primary-color-active: color('deep-purple', 'active');
$primary-color-light-background: color('deep-purple', 'background');

$danger-color: mixins.color('red', 700);
$danger-color-hover: mixins.color('red', 800);
$danger-color-active: mixins.color('red', 900);
$danger-color-light-background: mixins.color('red', 50);
$danger-color: color('red', 'default');
$danger-color-hover: color('red', 'hover');
$danger-color-active: color('red', 'active');
$danger-color-light-background: color('red', 'default');

$success-color: mixins.color('green', 700);
$success-color-hover: mixins.color('green', 800);
$success-color-active: mixins.color('green', 900);
$success-color: color('green', 'default');
$success-color-hover: color('green', 'hover');
$success-color-active: color('green', 'active');

:root {
--primary-color: #{$primary-color};
--primary-color-hover: #{$primary-color-hover};
--primary-color-active: #{$primary-color-active};
--primary-color-light-background: #{$primary-color-light-background};

--secondary-color: #{$secondary-color};
--secondary-color-hover: #{$secondary-color-hover};
--secondary-color-active: #{$secondary-color-active};

--danger-color: #{$danger-color};
--danger-color-hover: #{$danger-color-hover};
--danger-color-active: #{$danger-color-active};
Expand Down Expand Up @@ -100,15 +217,15 @@ $button-padding: 1rem;
$button-font-weight: 600;
$button-font-size: 1rem;

$primary-button-ghost-hover-background: mixins.color('deepPurple', 50);
$primary-button-ghost-active-background: mixins.color('deepPurple', 75);
$primary-button-ghost-hover-background: color('deep-purple', 'background');
$primary-button-ghost-active-background: color('deep-purple', 'background-hover');

$secondary-button-background: transparent;
$secondary-button-hover-background: mixins.color('deepPurple', 50);
$secondary-button-active-background: mixins.color('deepPurple', 75);
$secondary-button-hover-background: color('deep-purple', 'background');
$secondary-button-active-background: color('deep-purple', 'background-hover');

$danger-button-ghost-hover-background: mixins.color('red', 50);
$danger-button-ghost-active-background: mixins.color('red', 75);
$danger-button-ghost-hover-background: color('red', 'background');
$danger-button-ghost-active-background: color('red', 'background-hover');

:root {
--button-padding: #{$button-padding};
Expand Down Expand Up @@ -418,7 +535,6 @@ $icons: (
'wifi': '\e9f3',
);


@function icon($name) {
@return map-get($icons, $name);
}
Expand Down
20 changes: 20 additions & 0 deletions src/style/components/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@use "../base/variables";

.btn {
background: transparent;
border: solid 1px transparent;
Expand Down Expand Up @@ -93,6 +95,24 @@
}
}

@each $color, $_ in variables.$colors {
&.btn-#{$color} {
border-color: variables.color($color, 'default');
background: variables.color($color, 'default');
color: variables.color($color, 'default-font-color');

&:hover {
border-color: variables.color($color, 'hover');
background: variables.color($color, 'hover');
}

&:active {
border-color: variables.color($color, 'active');
background: variables.color($color, 'active');
}
}
}

.icon-container {
display: flex;
align-items: center;
Expand Down
4 changes: 2 additions & 2 deletions src/style/components/_elevation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@use "../base/mixins";
@use "../base/variables";

@for $i from 1 through 5 {
.elevated-#{$i} {
box-shadow: 0 2px #{$i * 2 + 3}px 0px hsla(hue(mixins.color('gray', 500)), saturation(mixins.color('gray', 500)), lightness(mixins.color('gray', 500)), 0.2);
box-shadow: 0 2px #{$i * 2 + 3}px 0px hsla(hue(variables.color('gray', 'default')), saturation(variables.color('gray', 'default')), lightness(variables.color('gray', 'default')), 0.2);
}
}
3 changes: 1 addition & 2 deletions src/style/components/_form-fields.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@use "../base/mixins";
@use "../base/variables";
@use "icons";

Expand Down Expand Up @@ -66,7 +65,7 @@
font: {
size: var(--form-field-font-size);
}
color: mixins.color('gray', 700);
color: variables.color('gray', 'default');
position: absolute;
top: 50%;
left: var(--form-field-padding);
Expand Down
Loading