Skip to content

Commit b917264

Browse files
committed
added Sass variables for the most used colors and cleaned up all the scss files
> > Co-authored-by: Nkmai <[email protected]> Co-authored-by: lind-tania <[email protected]> Co-authored-by: rtviner <[email protected]> Co-authored-by: caitlinchan23 <[email protected]>  
1 parent d7f9593 commit b917264

File tree

10 files changed

+490
-497
lines changed

10 files changed

+490
-497
lines changed

src/app/styles/abstracts/_variables.scss

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,38 @@ $text-font-stack: 'Roboto', sans-serif !default;
55

66
/// @type Color
77
$fiery-rose: #ff6569;
8+
$blue-brand: #62d6fb;
89

910
/// @type Color
1011
$blue-color-gradient: linear-gradient(145deg, #69e5ff, #58c1e2);
12+
$red-color-gradient: linear-gradient(145deg, #ff6569, #e65558);
13+
$grey-color-gradient: linear-gradient(145deg, #5c6068, #4d5157);
1114

1215
/// @type Color:
1316
$box-shadow-blue: inset 5px 5px 10px #53b6d5, inset -5px -5px 10px #71f6ff;
17+
$box-shadow-red: inset 5px 5px 10px #d95053, inset -5px -5px 10px #ff6c71;
1418

1519
/// @type Color
1620
$text-color: #e7e7e7;
1721

1822
/// @type Color
1923
$brand-color: #242529 !default;
2024

25+
/// @type Color
26+
$background-color: #333333 !default;
27+
$medium-background-color: #51565e !default;
28+
$light-background-color: #585d65 !default;
29+
2130
/// Light grey
2231
/// @type Color
2332
$light-grey-one: #474c55 !default;
2433

2534
/// @type Color
2635
$light-grey-two: #5f6369 !default;
2736

28-
$light-grey-three: rgb(101, 104, 110) !default;
37+
$light-grey-three: #65686e !default;
38+
39+
$light-grey-four: #4c4c4d !default;
2940

3041
/// @type Color
3142
$navbar-color: #44484e !default;
@@ -34,7 +45,14 @@ $navbar-color: #44484e !default;
3445
$head-color: #242529 !default;
3546

3647
/// @type Color
37-
$border-color: rgb(41, 41, 41) !default;
48+
$border-color: #292929 !default;
49+
50+
/// @type Color
51+
$border-slider: #57c5f7 !default;
52+
53+
/// @type Color
54+
$border-rc: #373737 !default;
55+
$background-rc-color: #e9e9e9 !default;
3856

3957
/// @type Color
4058
$highlight-color: rgba(224, 224, 224, 0.5) !default;

src/app/styles/base/_typography.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
body {
2-
color: $text-color;
3-
font: normal 13px $text-font-stack;
4-
// font: normal 125% / 1.4 $text-font-stack;
2+
color: $text-color;
3+
font: normal 13px $text-font-stack;
54
}

src/app/styles/components/_buttons.scss

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
font: 300 14px 'Roboto', sans-serif;
1515
font-size: $button-text-size;
1616
width: 120px;
17-
background: linear-gradient(145deg, #ff6569, #e65558);
17+
background: $red-color-gradient;
1818
}
1919
.empty-button:hover {
2020
color: black;
21-
box-shadow: inset 5px 5px 10px #d95053, inset -5px -5px 10px #ff6c71;
21+
box-shadow: $box-shadow-red;
2222
}
2323

2424
.state-dropdown {
@@ -43,7 +43,7 @@
4343
width: 70px;
4444
border: none;
4545
border-radius: 3px;
46-
background: linear-gradient(145deg, #5c6068, #4d5157);
46+
background: $grey-color-gradient;
4747
font: normal 11px 'Roboto', sans-serif;
4848
color: #b0b0b0;
4949
}
@@ -66,7 +66,6 @@
6666
.jump-button:hover {
6767
// remove the blue border when button is clicked
6868
color: white;
69-
// color: black;
7069
background-color: $fiery-rose;
7170

7271
cursor: pointer;
@@ -146,7 +145,7 @@
146145
}
147146

148147
.svg-inline--fa {
149-
color: #62d6fb;
148+
color: $blue-brand;
150149
margin-right: 0.75em;
151150
display: inline-block;
152151
font-size: inherit;
@@ -165,10 +164,10 @@
165164
font: 300 14px 'Roboto', sans-serif;
166165
font-size: $button-text-size;
167166

168-
background: rgb(36, 37, 41);
167+
background: $brand-color;
169168
border-radius: 5px;
170169
position: relative;
171-
border: 1px solid rgba(184, 196, 194, 0.25);
170+
border: 1px solid #b8c4c240;
172171

173172
@extend %disable-highlight;
174173
}

0 commit comments

Comments
 (0)