Skip to content

Commit 1fd91dd

Browse files
committed
style: More cleanup and consistent sizing
1 parent afae1c3 commit 1fd91dd

2 files changed

Lines changed: 14 additions & 41 deletions

File tree

public/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ <h5 class="version-number-holder pointer" id="versionNumberHolder">Version: <spa
4949
<!-- middle text html -->
5050
<div class="middle-main" id="statsMiddleText">
5151
<div class="middle-x pointer">
52-
<img src="img/white-x.png" alt="x button" width="38" height="38" class="no-margin">
52+
<img src="img/white-x.png" alt="x button" width="38" height="38">
5353
</div>
5454
<h1>Statistics</h1>
5555
<p class="middle-text-gray" id="cookiesStat">Cookies: 0</p> <!-- can statistics be cool and instead be registered programmatically? -->
@@ -68,7 +68,7 @@ <h2>Upgrades:</h2>
6868
</div>
6969
<div class="middle-main" id="infoMiddleText">
7070
<div class="middle-x pointer">
71-
<img src="img/white-x.png" alt="x button" width="38" height="38" class="no-margin">
71+
<img src="img/white-x.png" alt="x button" width="38" height="38">
7272
</div>
7373
<h1>Infomation</h1>
7474
<h2>About:</h2>
@@ -82,7 +82,7 @@ <h2>Changelog:</h2>
8282
</div>
8383
<div class="middle-main" id="optionsMiddleText">
8484
<div class="middle-x pointer">
85-
<img src="img/white-x.png" alt="x button" width="38" height="38" class="no-margin">
85+
<img src="img/white-x.png" alt="x button" width="38" height="38"=>
8686
</div>
8787
<h1>Options</h1>
8888
<h2>Customization:</h2>
@@ -144,7 +144,7 @@ <h1>Store</h1>
144144
<h3>Upgrades</h3>
145145
<div class="upgrades-holder-background">
146146
<div class="upgrades-holder" id="upgradesHolder">
147-
147+
148148
</div>
149149
</div>
150150
<h3>Buildings</h3>

src/scss/main.scss

Lines changed: 10 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,6 @@ a {
3939
font-weight: bold;
4040
color: inherit;
4141
}
42-
ul {
43-
margin-top: 6px;
44-
margin-bottom: 6px;
45-
}
46-
small {
47-
margin-left: auto;
48-
margin-right: auto;
49-
}
5042

5143
/* todo 0.7.1: i don't like these anymore, keep a few like pointer and no-display but remove stuff like red. */
5244
/* helper classes */
@@ -68,16 +60,6 @@ small {
6860
.absolute {
6961
position: absolute;
7062
}
71-
.no-select { /* this contains a random list of properties that supposedly make thing not drag and stuff? It seems to work so yay? */
72-
user-select: none; /* General all-browser solution for this */
73-
-webkit-touch-callout: none; /* I think only images but I dont have an iPhone so idk */
74-
-webkit-user-select: none; /* Still required on Safari? */
75-
margin-left: auto; /* idk what on earth these do but i'm scared to remove them */
76-
margin-right: auto;
77-
}
78-
.no-margin {
79-
margin: 0px;
80-
}
8163
.shadow {
8264
text-shadow: variables.$shadow;
8365
}
@@ -265,12 +247,10 @@ small {
265247
radial-gradient(transparent 80%, rgba(4, 4, 4, 0.3)),
266248
url("img/dark-noise.png");
267249

268-
// todo: random margins?
269250
h1 {
270251
font-size: 2rem;
271252
font-family: monospace;
272-
margin-top: 12px;
273-
margin-bottom: 15px;
253+
margin: 0.75rem 0;
274254
text-decoration: underline;
275255
text-underline-offset: 0.15em;
276256
font-weight: bold;
@@ -279,26 +259,19 @@ small {
279259
h2 {
280260
font-size: 1.5rem;
281261
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
282-
margin-top: 12px;
283-
margin-bottom: 15px;
262+
margin: 1rem 0;
284263
font-weight: bold;
285-
text-align: left;
286264
}
287265
h3 {
288266
font-size: 1.2rem;
289-
margin: 6px 0px 8px 0px;
290-
text-align: left;
291-
-webkit-user-select: none;
292-
user-select: none;
267+
margin: 0.5rem 0;
293268
}
294269
h4 {
295270
font-size: 1rem;
296-
margin-bottom: 6px;
297-
margin-top: 6px;
271+
margin: 0.25rem 0;
298272
}
299273
.middle-text-gray {
300-
margin-bottom: 6px;
301-
margin-top: 6px;
274+
margin: 0.5rem 0;
302275
color: gray;
303276
letter-spacing: 1px;
304277
font-weight: bold;
@@ -326,7 +299,7 @@ small {
326299
}
327300

328301
form {
329-
margin: 0.25rem 0
302+
margin: 0.25rem 0;
330303
}
331304

332305
// only in Info
@@ -335,8 +308,9 @@ small {
335308
font-size: 0.875em;
336309
}
337310

338-
ul { // for changelog entries so they're smaller than their headers
339-
font-size: 0.875rem;
311+
ul {
312+
font-size: 0.875rem; // so changelog entries are smaller than their headers
313+
margin: 0.5rem 0;
340314
}
341315
}
342316
}
@@ -358,8 +332,7 @@ small {
358332
}
359333

360334
h3 {
361-
margin-top: 8px;
362-
margin-bottom: 8px;
335+
margin: 0.5rem 0;
363336
text-align: center;
364337
}
365338

0 commit comments

Comments
 (0)