Skip to content

Commit e3920cb

Browse files
committed
style: Remove some helper classes and finalize(?) changelogs
1 parent f1962cd commit e3920cb

7 files changed

Lines changed: 21 additions & 42 deletions

File tree

public/index.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<div class="left-side" id="leftSide">
1717
<img class="cookie pointer" id="cookie" src="img/cookie.png" alt="cookie" draggable="false">
1818
<div class="cookie-counter-wrapper">
19-
<h3 class="cookie-counter shadow">Cookies: <span id="cookieCount">0</span></h3>
19+
<h3 class="cookie-counter">Cookies: <span id="cookieCount">0</span></h3>
2020
<h4 class="cookies-per-second-counter">Cookies Per Second: <span id="cookiesPerSecondCount">0</span></h4>
2121
</div>
2222
<p class="saving-indicator" id="savingIndicator">Saved!</p>
@@ -128,14 +128,14 @@ <h2>Miscellaneous:</h2>
128128
<button class="data-button pointer" id="listModsButton" style="margin-top:3px; margin-left:0px;">List Mods</button>
129129
</div>
130130
</div>
131-
<div class="tooltip absolute no-display" id="tooltip">
131+
<div class="tooltip no-display" id="tooltip">
132132
<div class="tooltip-content">
133-
<p class="tooltip-name black" id="tooltipName">Name</p>
134-
<p class="tooltip-price absolute black" id="tooltipPrice">Price</p>
135-
<p class="tooltip-description black" id="tooltipDesc">Description</p> <!-- Hidden when buildings are hovered since they have no description -->
136-
<p class="tooltip-quote black" id="tooltipQuote">"Quote"</p>
137-
<p class="tooltip-stats black" id="tooltipProduces">Produces</p><!-- Hidden when upgrades are hovered since they have no produces/producing -->
138-
<p class="tooltip-stats black" id="tooltipProducing">Producing</p>
133+
<p class="tooltip-name" id="tooltipName">Name</p>
134+
<p class="tooltip-price" id="tooltipPrice">Price</p>
135+
<p class="tooltip-description" id="tooltipDesc">Description</p> <!-- Hidden when buildings are hovered since they have no description -->
136+
<p class="tooltip-quote" id="tooltipQuote">"Quote"</p>
137+
<p class="tooltip-stats" id="tooltipProduces">Produces</p><!-- Hidden when upgrades are hovered since they have no produces/producing -->
138+
<p class="tooltip-stats" id="tooltipProducing">Producing</p>
139139
</div>
140140
</div>
141141
</div> <!-- end middle -->

src/scss/buildings.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
.building-price {
3131
margin: 0;
32-
margin-left: 0.6px; // todo: keep?
3332
}
3433

3534
.buildings-bought {

src/scss/main.scss

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,38 +34,19 @@ body {
3434
-webkit-touch-callout: none; /* mobile-only */
3535
}
3636

37-
/* todo 0.7.1: find why these are here and how we can make their elements assigned to their own specific class instead of making every element have these properties*/
38-
a {
37+
a { // links should inherit color and be bold always unless otherwise specified
3938
font-weight: bold;
4039
color: inherit;
4140
}
4241

43-
/* todo 0.7.1: i don't like these anymore, keep a few like pointer and no-display but remove stuff like red. */
42+
/* todo 0.7.1: keep these two helpers? */
4443
/* helper classes */
4544
.no-display {
4645
display: none;
4746
}
4847
.pointer {
4948
cursor: pointer;
5049
}
51-
.red {
52-
color: red;
53-
}
54-
.black {
55-
color: black;
56-
}
57-
.blue {
58-
color: blue;
59-
}
60-
.absolute {
61-
position: absolute;
62-
}
63-
.shadow {
64-
text-shadow: variables.$shadow;
65-
}
66-
.visible {
67-
opacity: 1 !important;
68-
}
6950

7051
/* important things */
7152
.left-side {

src/scss/tooltip.scss

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
.tooltip {
44
width: 285px;
55
height: 125px;
6+
position: absolute;
7+
right: 346px;
8+
z-index: 1; /* legit nothing has a higher-than-normal z-index, so this will show above EVERYTHING */
69
border: solid 3px black;
710
border-right-width: 0px;
811
background-color: variables.$colored-container;
12+
color: black; // for children
913
pointer-events: none; /* if it's hovered over it won't do the flickering thing */
10-
right: 346px;
11-
z-index: 1; /* legit nothing has a higher-than-normal z-index, so this will show above EVERYTHING */
1214
}
1315
.tooltip-content {
1416
padding: 0px 3px 0px 3px;
@@ -19,6 +21,7 @@
1921
margin-bottom: 0px;
2022
}
2123
.tooltip-price {
24+
position: absolute;
2225
font-size: 15px;
2326
right: 0px;
2427
top: 0px;

src/ts/changelogs.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,20 +269,16 @@ export const versionChangelogs: Changelog[] = [
269269
{
270270
type: "patch",
271271
version: "0.7.1",
272-
name: "tbd",
272+
name: "the little things",
273273
added: [
274-
"Metadata is now visible in the modlist (#61, todo)",
275-
"ESLint is used for code linting and formatting via ESLint Stylistic."
274+
"ESLint is used for code linting and formatting via ESLint Stylistic (#70)"
276275
],
277276
changed: [
278277
"Switched to SCSS (#59)",
279278
"Many styles have been adjusted for consistent sizing and spacing. As a result, some elements may appear slightly different.",
280-
"Advanced Popup content is now easier to create (#31, todo)",
279+
"Advanced Popup content is now easier to create (#31)",
281280
"All project files are now compliant with ESLint rules."
282281
],
283-
fixed: [
284-
"Loading saves allowed saves from other version branches (#68, todo)"
285-
],
286282
release: "tbd"
287283
}
288284
];

src/ts/handlers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ export class ModHandler extends UniqueKeyHandler<Mod<unknown>> {
332332
const popup = new AdvancedPopup(500,350,/*html*/`<h1>Add Mod</h1>
333333
<h5 style='color:red; margin-bottom:3px; margin-top:5px;'>WARNING!</h5>
334334
<h5 style='color:red; margin-top:0px; margin-bottom:0px;'>Adding mods without verifying their legitimacy can result in unintended side effects! We are not responsible for any damages that may be caused by mods!</h5>
335-
<h5 style='margin-top:5px; margin-bottom:0px;'>For information regarding mods, <a href='https://github.com/clickercookie/clickercookie.github.io/wiki/Modding' class='blue' target="_blank">read the documentation</a>.</h5>
335+
<h5 style='margin-top:5px; margin-bottom:0px;'>For information regarding mods, <a href='https://github.com/clickercookie/clickercookie.github.io/wiki/Modding' target="_blank" style="color: blue;">read the documentation</a>.</h5>
336336
<form onsubmit='return false;' id='addModURLForm' style='margin-top:22px;'>
337337
<label for='addModURL'>From URL: </label>
338338
<input id='addModURL'>

src/ts/saving.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ export class Savinator {
7979

8080
// Update saving notification
8181
const indicator = document.getElementById("savingIndicator");
82-
indicator.classList.add("visible");
82+
indicator.style.opacity = "1";
8383

8484
setTimeout(function() {
85-
indicator.classList.remove("visible");
85+
indicator.style.opacity = "0";
8686
}, 1500);
8787
}
8888

0 commit comments

Comments
 (0)