Skip to content

Commit e8c3587

Browse files
committed
Move all light theme variables to new design grayscale
1 parent 7c54b71 commit e8c3587

File tree

5 files changed

+15
-14
lines changed

5 files changed

+15
-14
lines changed

client/styles/abstracts/_placeholders.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
background-color: map-get($theme-map, 'modal-background-color');
187187
border: 1px solid map-get($theme-map, 'modal-border-color');
188188
box-shadow: 0 0 18px 0 getThemifyVariable('shadow-color');
189-
color: getThemifyVariable('dropdown-color');
189+
color: getThemifyVariable('primary-text-color');
190190
}
191191
text-align: left;
192192
width: #{180 / $base-font-size}rem;
@@ -207,7 +207,7 @@
207207
& button,
208208
& a {
209209
@include themify() {
210-
color: getThemifyVariable('dropdown-color');
210+
color: getThemifyVariable('primary-text-color');
211211
}
212212
width: 100%;
213213
text-align: left;

client/styles/abstracts/_variables.scss

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $base-font-size: 12;
33
//colors
44
$p5js-pink: #ed225d;
55
$processing-blue: #007BBB;
6+
$p5js-active-pink: #f10046;
67
$white: #fff;
78
$black: #000;
89
$yellow: #F5DC23;
@@ -50,7 +51,7 @@ $themes: (
5051
toolbar-button-color: $p5js-pink,
5152
toolbar-button-background-color: $medium-light,
5253
button-background-hover-color: $p5js-pink,
53-
button-background-active-color: #f10046,
54+
button-background-active-color: $p5js-active-pink,
5455
button-nav-inactive-color: $middle-gray,
5556
button-hover-color: $white,
5657
button-active-color: $white,
@@ -79,37 +80,37 @@ $themes: (
7980
search-clear-background-color: $light,
8081
search-hover-text-color: $lightest,
8182
search-hover-background-color: $medium-dark,
82-
dropdown-color: #414141,
83+
dropdown-color: $dark,
8384
keyboard-shortcut-color: $middle-gray,
8485
nav-hover-color: $p5js-pink,
8586
nav-border-color: $middle-light,
8687
error-color: $p5js-pink,
87-
table-row-stripe-color: #d6d6d6,
88+
table-row-stripe-color: $medium-light,
8889
codefold-icon-open: url(../images/triangle-arrow-down.svg),
8990
codefold-icon-closed: url(../images/triangle-arrow-right.svg),
9091

9192
primary-button-color: $lightest,
9293
primary-button-background-color: $p5js-pink,
9394

9495
table-button-color: $white,
95-
table-button-background-color: #979797,
96+
table-button-background-color: $middle-gray,
9697
table-button-active-color: $white,
9798
table-button-background-active-color: #00A1D3,
9899
table-button-hover-color: $white,
99100
table-button-background-hover-color: $p5js-pink,
100101

101-
progress-bar-background-color: #979797,
102-
progress-bar-active-color: #f10046,
102+
progress-bar-background-color: $middle-gray,
103+
progress-bar-active-color: $p5js-active-pink,
103104

104105
form-title-color: rgba(51, 51, 51, 0.87),
105106
form-secondary-title-color: $middle-dark,
106107
form-input-text-color: $dark,
107108
form-input-placeholder-text-color: $middle-light,
108-
form-border-color: #b5b5b5,
109+
form-border-color: $middle-light,
109110
form-button-background-color: $white,
110-
form-button-color: #f10046,
111+
form-button-color: $p5js-active-pink,
111112
form-button-background-hover-color: $p5js-pink,
112-
form-button-background-active-color: #f10046,
113+
form-button-background-active-color: $p5js-active-pink,
113114
form-button-hover-color: $white,
114115
form-button-active-color: $white,
115116
form-navigation-options-color: $middle-dark

client/styles/components/_asset-list.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383

8484
@include themify() {
8585
& polygon {
86-
fill: getThemifyVariable('dropdown-color');
86+
fill: getThemifyVariable('inactive-text-color');
8787
}
8888
}
8989
}

client/styles/components/_collection-popover.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
background-color: map-get($theme-map, 'modal-background-color');
1717
border: 1px solid map-get($theme-map, 'modal-border-color');
1818
box-shadow: 0 0 18px 0 getThemifyVariable('shadow-color');
19-
color: getThemifyVariable('dropdown-color');
19+
color: getThemifyVariable('primary-text-color');
2020
}
2121

2222
text-align: left;

client/styles/components/_sketch-list.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
height:#{25 / $base-font-size}rem;
9797
@include themify() {
9898
& polygon {
99-
fill: getThemifyVariable('dropdown-color');
99+
fill: getThemifyVariable('inactive-text-color');
100100
}
101101
}
102102
}

0 commit comments

Comments
 (0)