diff --git a/.github/workflows/check_prettier.yml b/.github/workflows/check_prettier.yml index 75782d32..ccd039c7 100644 --- a/.github/workflows/check_prettier.yml +++ b/.github/workflows/check_prettier.yml @@ -2,9 +2,9 @@ name: Check Prettier has been run on: push: - branches: [master] + branches: [main] pull_request: - branches: [master] + branches: [main] jobs: prettier: diff --git a/css/calendar.scss b/css/calendar.scss index 2d5713ad..b53752a6 100644 --- a/css/calendar.scss +++ b/css/calendar.scss @@ -46,7 +46,12 @@ $TeX-Purple: #9d68dc; margin-bottom: 10px; display: none; - h1, h2, h3, h4, h5, h6, + h1, + h2, + h3, + h4, + h5, + h6, li, p { color: black; diff --git a/css/main.scss b/css/main.scss index 2d530afe..402b0015 100644 --- a/css/main.scss +++ b/css/main.scss @@ -43,9 +43,9 @@ body { .xmas-banner { background-color: #035443; - + * { - color: #E9E2D2; + color: #e9e2d2; } } diff --git a/css/sponsor.scss b/css/sponsor.scss index 5c3cde33..c0c511a5 100644 --- a/css/sponsor.scss +++ b/css/sponsor.scss @@ -172,5 +172,5 @@ td:nth-child(4) { gap: 20px; grid-auto-flow: column; width: 100%; - margin: 0 30px 30px 0 + margin: 0 30px 30px 0; } diff --git a/css/type.scss b/css/type.scss index b715a97b..71988695 100644 --- a/css/type.scss +++ b/css/type.scss @@ -75,65 +75,80 @@ pre.ascii { font-weight: inherit; } } - + &.tdov { - .d1,.d2,.d11,.d12 { + .d1, + .d2, + .d11, + .d12 { i { - color: #5BCEFA !important; + color: #5bcefa !important; } } - .d3,.d4,.d9,.d10 { + .d3, + .d4, + .d9, + .d10 { i { - color: #F5A9B8 !important; + color: #f5a9b8 !important; } } - .d5,.d6,.d7,.d8 { + .d5, + .d6, + .d7, + .d8 { i { - color: #FFFFFF !important; + color: #ffffff !important; } } } &.pride { - .d1,.d2 { + .d1, + .d2 { i { - color: #FF5755 !important; + color: #ff5755 !important; } } - .d3,.d4 { + .d3, + .d4 { i { - color: #FF924C !important; + color: #ff924c !important; } } - - .d5,.d6 { + + .d5, + .d6 { i { - color: #FFEE58 !important; + color: #ffee58 !important; } } - .d7,.d8 { + .d7, + .d8 { i { - color: #81E056 !important; + color: #81e056 !important; } } - .d9,.d10 { + .d9, + .d10 { i { - color: #5272FE !important; + color: #5272fe !important; } } - .d11,.d12 { + .d11, + .d12 { i { - color: #9253FF !important; + color: #9253ff !important; } } } - + &.christmas { [c="_"], [c="$"] { diff --git a/js/calendar.js b/js/calendar.js index 195cc538..222a4309 100644 --- a/js/calendar.js +++ b/js/calendar.js @@ -305,9 +305,26 @@ function parseHTML(html, otherValidTags = null, otherValidProperties = null) { } const validTags = [ - "a", "b", "br", "code", "em", "i", "p", "span", "strong", "sup", "u", - "h1", "h2", "h3", "h4", "h5", "h6", - "ul", "ol", "li", + "a", + "b", + "br", + "code", + "em", + "i", + "p", + "span", + "strong", + "sup", + "u", + "h1", + "h2", + "h3", + "h4", + "h5", + "h6", + "ul", + "ol", + "li", ]; const validProperties = new Map([["a", ["href"]]]); html = sanitizeTags( diff --git a/js/colourOverride.js b/js/colourOverride.js index 5449711e..8e0333bf 100644 --- a/js/colourOverride.js +++ b/js/colourOverride.js @@ -4,25 +4,25 @@ * 31st March: Trans Day of Visibility ("tdov") * Month of June: Pride ("pride") * 18th December onwards: Christmas ("christmas") - * + * * Classes are defined in: * css/type.scss */ document.addEventListener("DOMContentLoaded", () => { let asciiElement = document.getElementsByClassName("ascii")[0]; - + if (!asciiElement) { return; } - + const currentDate = new Date(); - // 31st March + // 31st March if (currentDate.getMonth() === 2 && currentDate.getDate() === 31) { asciiElement.classList.add("tdov"); } - // June + // June if (currentDate.getMonth() === 5) { asciiElement.classList.add("pride"); } @@ -31,4 +31,4 @@ document.addEventListener("DOMContentLoaded", () => { if (currentDate.getMonth() === 11 && currentDate.getDate() >= 18) { asciiElement.classList.add("christmas"); } -}); \ No newline at end of file +});