Skip to content

Commit 79fe90b

Browse files
committed
Improve CSS variables
1 parent 3c5adde commit 79fe90b

3 files changed

Lines changed: 23 additions & 18 deletions

File tree

src/scss/_variables.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// colors
2+
$brown-border: rgb(121, 77, 46);
3+
$colored-container: rgb(255, 243, 209);
4+
5+
// common property values
6+
$shadow: 0px 1px 4px black;

src/scss/buildings.scss

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@use "_variables.scss";
2+
13
.building {
24
width: 96%;
35
height: 64px;
@@ -16,7 +18,7 @@
1618
justify-content: space-between;
1719
align-items: center;
1820
height: 100%;
19-
text-shadow: 0px 1px 4px black;
21+
text-shadow: variables.$shadow;
2022
padding-left: 4px;
2123

2224
/* in an unnamed div */

src/scss/main.scss

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
/* variables (mainly for colors) */
2-
$brown-border: rgb(121, 77, 46);
3-
$colored-container: rgb(255, 243, 209);
1+
@use "_variables.scss";
2+
@use "buildings.scss";
43

54
// non-SCSS variables that are used for anything that needs to be modified programmatically
65
:root {
76
--dialog-backdrop-opacity: 50%; /* default value for dialog opacity if something goes wrong (and for simple popups :D) */
87
}
98

10-
@use "buildings.scss";
11-
129
/* basic basis for most html elements */
1310
body {
1411
margin: 0px;
@@ -79,7 +76,7 @@ small {
7976
margin: 0px;
8077
}
8178
.shadow {
82-
text-shadow: 0px 1px 4px black;
79+
text-shadow: variables.$shadow;
8380
}
8481
.visible {
8582
opacity: 1 !important;
@@ -91,7 +88,7 @@ small {
9188
height: 100vh;
9289
border-style: solid;
9390
border-width: 0px 8px 0px 0px;
94-
border-color: $brown-border;
91+
border-color: variables.$brown-border;
9592
display: flex;
9693
flex-direction: column;
9794
background-image: url(img/backgrounds/background-blue.png);
@@ -103,7 +100,7 @@ small {
103100
height: 100vh;
104101
border-style: solid;
105102
border-width: 0px 0px 0px 8px;
106-
border-color: $brown-border;
103+
border-color: variables.$brown-border;
107104
display: flex;
108105
flex-direction: column;
109106
background-image: url(img/backgrounds/background-blue.png);
@@ -155,7 +152,7 @@ small {
155152
margin-bottom: 4px;
156153
font-size: 18px;
157154
color: white;
158-
text-shadow: 0px 1px 4px black;
155+
text-shadow: variables.$shadow;
159156
text-align: center;
160157
}
161158

@@ -164,7 +161,7 @@ small {
164161
margin-bottom: 4px;
165162
font-size: 14px;
166163
color: white;
167-
text-shadow: 0px 1px 4px black;
164+
text-shadow: variables.$shadow;
168165
text-align: center;
169166
}
170167

@@ -175,7 +172,7 @@ small {
175172
.middle-buttons {
176173
display: flex;
177174
height: 100px;
178-
border: 0px solid $brown-border;
175+
border: 0px solid variables.$brown-border;
179176
border-bottom-width: 8px;
180177
background-image: url(img/backgrounds/background-blue.png);
181178
}
@@ -198,7 +195,7 @@ small {
198195
overflow: hidden;
199196
border: 6px solid;
200197
border-width: 6px 0px 6px 0px;
201-
border-color: $brown-border;
198+
border-color: variables.$brown-border;
202199
}
203200
.upgrade {
204201
width: 59.6px;
@@ -272,7 +269,7 @@ small {
272269
font-size: 20px;
273270
color: white;
274271
font-family: monospace;
275-
text-shadow: 0px 1px 4px black;
272+
text-shadow: variables.$shadow;
276273
}
277274
.version-switch-info {
278275
display: none;
@@ -284,7 +281,7 @@ small {
284281
border: 3px solid black;
285282
font-size: 10px;
286283
color: black;
287-
background-color: $colored-container;
284+
background-color: variables.$colored-container;
288285
}
289286

290287
/* Infobox when hovering over a building */
@@ -293,7 +290,7 @@ small {
293290
height: 125px;
294291
border: solid 3px black;
295292
border-right-width: 0px;
296-
background-color: $colored-container;
293+
background-color: variables.$colored-container;
297294
pointer-events: none; /* if it's hovered over it won't do the flickering thing */
298295
right: 346px;
299296
z-index: 1; /* legit nothing has a higher-than-normal z-index, so this will show above EVERYTHING */
@@ -411,7 +408,7 @@ dialog::backdrop {
411408
font-size: 24px;
412409
font-family: "Lucida Console", "Courier New", monospace;
413410
color: white;
414-
text-shadow: 0px 1px 4px black;
411+
text-shadow: variables.$shadow;
415412
}
416413

417414
/* Middle Text CSS */
@@ -507,7 +504,7 @@ dialog::backdrop {
507504
height: 50px;
508505
border: 2px solid black;
509506
margin-left: auto;
510-
background-color: $colored-container;
507+
background-color: variables.$colored-container;
511508
color: black; /* this wasn't nessesary until 6/3/23? idk why */
512509
}
513510
.info-button {

0 commit comments

Comments
 (0)