Skip to content

Commit 6b11adf

Browse files
committed
Continue to update dark theme, remove many unused theme variables
1 parent 3461c96 commit 6b11adf

File tree

5 files changed

+38
-44
lines changed

5 files changed

+38
-44
lines changed

client/styles/abstracts/_variables.scss

Lines changed: 21 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ $themes: (
7575
file-hover-color: $light,
7676
file-selected-color: $medium-light,
7777
input-text-color: $dark,
78+
input-background-color: $lightest,
7879
input-border-color: $middle-light,
7980
search-background-color: $lightest,
8081
search-clear-background-color: $light,
8182
search-hover-text-color: $lightest,
8283
search-hover-background-color: $medium-dark,
83-
dropdown-color: $dark,
8484
keyboard-shortcut-color: $middle-gray,
8585
nav-hover-color: $p5js-pink,
8686
nav-border-color: $middle-light,
@@ -103,16 +103,9 @@ $themes: (
103103
progress-bar-active-color: $p5js-active-pink,
104104

105105
form-title-color: rgba(51, 51, 51, 0.87),
106-
form-secondary-title-color: $middle-dark,
106+
form-secondary-title-color: $medium-dark,
107107
form-input-text-color: $dark,
108108
form-input-placeholder-text-color: $middle-light,
109-
form-border-color: $middle-light,
110-
form-button-background-color: $lightest,
111-
form-button-color: $p5js-active-pink,
112-
form-button-background-hover-color: $p5js-pink,
113-
form-button-background-active-color: $p5js-active-pink,
114-
form-button-hover-color: $lightest,
115-
form-button-active-color: $lightest,
116109
form-navigation-options-color: $middle-dark
117110
),
118111
dark: (
@@ -152,46 +145,39 @@ $themes: (
152145
console-error-background-color: $red,
153146
ide-border-color: $middle-dark,
154147
editor-gutter-color: $darker,
155-
file-hover-color: #404040,
156-
file-selected-color: #404040,
157-
input-text-color: #333,
158-
input-border-color: #b5b5b5,
159-
search-background-color: #ffffff,
160-
search-clear-background-color: #4f4f4f,
161-
search-hover-text-color: #ffffff,
148+
file-hover-color: $dark,
149+
file-selected-color: $medium-dark,
150+
input-text-color: $lightest,
151+
input-background-color: $dark,
152+
input-border-color: $middle-dark,
153+
search-background-color: $lightest,
154+
search-clear-background-color: $medium-dark,
155+
search-hover-text-color: $lightest,
162156
search-hover-background-color: $p5js-pink,
163-
dropdown-color: #dadada,
164-
keyboard-shortcut-color: #B5B5B5,
157+
keyboard-shortcut-color: $middle-light,
165158
nav-hover-color: $p5js-pink,
166159
nav-border-color: $middle-dark,
167160
error-color: $p5js-pink,
168-
table-row-stripe-color: #3f3f3f,
161+
table-row-stripe-color: $dark,
169162
codefold-icon-open: url(../images/triangle-arrow-down-white.svg),
170163
codefold-icon-closed: url(../images/triangle-arrow-right-white.svg),
171164

172-
primary-button-color: #fff,
165+
primary-button-color: $lightest,
173166
primary-button-background-color: $p5js-pink,
174167

175-
table-button-color: $white,
168+
table-button-color: $lightest,
176169
table-button-background-color: $middle-gray,
177-
table-button-active-color: $white,
170+
table-button-active-color: $lightest,
178171
table-button-background-active-color: #00A1D3,
179-
table-button-hover-color: $white,
172+
table-button-hover-color: $lightest,
180173
table-button-background-hover-color: $p5js-pink,
181174

182175
progress-bar-background-color: $middle-gray,
183-
progress-bar-active-color: #f10046,
176+
progress-bar-active-color: $p5js-active-pink,
184177

185-
form-title-color: $white,
186-
form-secondary-title-color: #b5b5b5,
187-
form-border-color: #b5b5b5,
188-
form-button-background-color: $black,
189-
form-button-color: #f10046,
190-
form-button-background-hover-color: $p5js-pink,
191-
form-button-background-active-color: #f10046,
192-
form-button-hover-color: $white,
193-
form-button-active-color: $white,
194-
form-navigation-options-color: #999999
178+
form-title-color: $lightest,
179+
form-secondary-title-color: $medium-light,
180+
form-navigation-options-color: $middle-light
195181
),
196182
contrast: (
197183
logo-color: $yellow,
@@ -233,12 +219,12 @@ $themes: (
233219
file-hover-color: #404040,
234220
file-selected-color: #404040,
235221
input-text-color: #333,
222+
input-background-color: $lightest,
236223
input-border-color: #b5b5b5,
237224
search-background-color: $white,
238225
search-clear-background-color: #444,
239226
search-hover-text-color: $black,
240227
search-hover-background-color: $yellow,
241-
dropdown-color: #e1e1e1,
242228
keyboard-shortcut-color: #e1e1e1,
243229
nav-hover-color: $yellow,
244230
nav-border-color: $middle-dark,
@@ -262,13 +248,6 @@ $themes: (
262248

263249
form-title-color: $white,
264250
form-secondary-title-color: #b5b5b5,
265-
form-border-color: #b5b5b5,
266-
form-button-background-color: $black,
267-
form-button-color: #f10046,
268-
form-button-background-hover-color: $p5-contrast-pink,
269-
form-button-background-active-color: #f10046,
270-
form-button-hover-color: $white,
271-
form-button-active-color: $white,
272251
form-navigation-options-color: #999999
273252
)
274253
);

client/styles/base/_base.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ textarea {
3939
padding: #{10 / $base-font-size}rem;
4040
@include themify() {
4141
color: getThemifyVariable('input-text-color');
42+
background-color: getThemifyVariable('input-background-color');
4243
border-color: getThemifyVariable('input-border-color');
4344
}
4445
}

client/styles/components/_console.scss

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@
5656
.preview-console__collapse {
5757
padding-top: #{3 / $base-font-size}rem;
5858
@include icon();
59+
@include themify() {
60+
& g,
61+
& polygon {
62+
fill: getThemifyVariable('secondary-text-color');
63+
}
64+
}
5965
.preview-console--collapsed & {
6066
display: none;
6167
}
@@ -64,6 +70,12 @@
6470
.preview-console__expand {
6571
padding-top: #{3 / $base-font-size}rem;
6672
@include icon();
73+
@include themify() {
74+
& g,
75+
& polygon {
76+
fill: getThemifyVariable('secondary-text-color');
77+
}
78+
}
6779
display: none;
6880
.preview-console--collapsed & {
6981
display: inline-block;
@@ -78,7 +90,7 @@
7890
.preview-console__clear {
7991
@include themify() {
8092
@extend %link;
81-
color: getThemifyVariable('inactive-text-color');
93+
// color: getThemifyVariable('inactive-text-color');
8294
// &:hover {
8395
// color: getThemifyVariable('console-header-color');
8496
// }

client/styles/components/_forms.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
font-size: #{16 / $base-font-size}rem;
5454
@include themify() {
5555
color: getThemifyVariable('form-input-text-color');
56+
background-color: getThemifyVariable('input-background-color');
5657
}
5758
}
5859

client/styles/components/_preferences.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,9 @@
104104
@include themify() {
105105
border: #{1 / $base-font-size}rem solid
106106
getThemifyVariable("button-border-color");
107-
background-color: getThemifyVariable("button-background-color");
107+
// background-color: getThemifyVariable("button-background-color");
108108
color: getThemifyVariable("input-text-color");
109+
background-color: getThemifyVariable('input-background-color');
109110
}
110111
text-align: center;
111112
border-radius: 0%;

0 commit comments

Comments
 (0)