Skip to content

Commit 75421af

Browse files
authored
Fix github workflows (#712)
* Fix Prettier workflow * Run prettier
1 parent 8beb3e7 commit 75421af

File tree

7 files changed

+73
-36
lines changed

7 files changed

+73
-36
lines changed

.github/workflows/check_prettier.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Check Prettier has been run
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
7-
branches: [master]
7+
branches: [main]
88

99
jobs:
1010
prettier:

css/calendar.scss

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,12 @@ $TeX-Purple: #9d68dc;
4646
margin-bottom: 10px;
4747
display: none;
4848

49-
h1, h2, h3, h4, h5, h6,
49+
h1,
50+
h2,
51+
h3,
52+
h4,
53+
h5,
54+
h6,
5055
li,
5156
p {
5257
color: black;

css/main.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ body {
4343

4444
.xmas-banner {
4545
background-color: #035443;
46-
46+
4747
* {
48-
color: #E9E2D2;
48+
color: #e9e2d2;
4949
}
5050
}
5151

css/sponsor.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,5 +172,5 @@ td:nth-child(4) {
172172
gap: 20px;
173173
grid-auto-flow: column;
174174
width: 100%;
175-
margin: 0 30px 30px 0
175+
margin: 0 30px 30px 0;
176176
}

css/type.scss

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -75,65 +75,80 @@ pre.ascii {
7575
font-weight: inherit;
7676
}
7777
}
78-
78+
7979
&.tdov {
80-
.d1,.d2,.d11,.d12 {
80+
.d1,
81+
.d2,
82+
.d11,
83+
.d12 {
8184
i {
82-
color: #5BCEFA !important;
85+
color: #5bcefa !important;
8386
}
8487
}
8588

86-
.d3,.d4,.d9,.d10 {
89+
.d3,
90+
.d4,
91+
.d9,
92+
.d10 {
8793
i {
88-
color: #F5A9B8 !important;
94+
color: #f5a9b8 !important;
8995
}
9096
}
9197

92-
.d5,.d6,.d7,.d8 {
98+
.d5,
99+
.d6,
100+
.d7,
101+
.d8 {
93102
i {
94-
color: #FFFFFF !important;
103+
color: #ffffff !important;
95104
}
96105
}
97106
}
98107

99108
&.pride {
100-
.d1,.d2 {
109+
.d1,
110+
.d2 {
101111
i {
102-
color: #FF5755 !important;
112+
color: #ff5755 !important;
103113
}
104114
}
105115

106-
.d3,.d4 {
116+
.d3,
117+
.d4 {
107118
i {
108-
color: #FF924C !important;
119+
color: #ff924c !important;
109120
}
110121
}
111-
112-
.d5,.d6 {
122+
123+
.d5,
124+
.d6 {
113125
i {
114-
color: #FFEE58 !important;
126+
color: #ffee58 !important;
115127
}
116128
}
117129

118-
.d7,.d8 {
130+
.d7,
131+
.d8 {
119132
i {
120-
color: #81E056 !important;
133+
color: #81e056 !important;
121134
}
122135
}
123136

124-
.d9,.d10 {
137+
.d9,
138+
.d10 {
125139
i {
126-
color: #5272FE !important;
140+
color: #5272fe !important;
127141
}
128142
}
129143

130-
.d11,.d12 {
144+
.d11,
145+
.d12 {
131146
i {
132-
color: #9253FF !important;
147+
color: #9253ff !important;
133148
}
134149
}
135150
}
136-
151+
137152
&.christmas {
138153
[c="_"],
139154
[c="$"] {

js/calendar.js

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,26 @@ function parseHTML(html, otherValidTags = null, otherValidProperties = null) {
305305
}
306306

307307
const validTags = [
308-
"a", "b", "br", "code", "em", "i", "p", "span", "strong", "sup", "u",
309-
"h1", "h2", "h3", "h4", "h5", "h6",
310-
"ul", "ol", "li",
308+
"a",
309+
"b",
310+
"br",
311+
"code",
312+
"em",
313+
"i",
314+
"p",
315+
"span",
316+
"strong",
317+
"sup",
318+
"u",
319+
"h1",
320+
"h2",
321+
"h3",
322+
"h4",
323+
"h5",
324+
"h6",
325+
"ul",
326+
"ol",
327+
"li",
311328
];
312329
const validProperties = new Map([["a", ["href"]]]);
313330
html = sanitizeTags(

js/colourOverride.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
* 31st March: Trans Day of Visibility ("tdov")
55
* Month of June: Pride ("pride")
66
* 18th December onwards: Christmas ("christmas")
7-
*
7+
*
88
* Classes are defined in:
99
* css/type.scss
1010
*/
1111
document.addEventListener("DOMContentLoaded", () => {
1212
let asciiElement = document.getElementsByClassName("ascii")[0];
13-
13+
1414
if (!asciiElement) {
1515
return;
1616
}
17-
17+
1818
const currentDate = new Date();
1919

20-
// 31st March
20+
// 31st March
2121
if (currentDate.getMonth() === 2 && currentDate.getDate() === 31) {
2222
asciiElement.classList.add("tdov");
2323
}
2424

25-
// June
25+
// June
2626
if (currentDate.getMonth() === 5) {
2727
asciiElement.classList.add("pride");
2828
}
@@ -31,4 +31,4 @@ document.addEventListener("DOMContentLoaded", () => {
3131
if (currentDate.getMonth() === 11 && currentDate.getDate() >= 18) {
3232
asciiElement.classList.add("christmas");
3333
}
34-
});
34+
});

0 commit comments

Comments
 (0)