From 2a62b3c4b6bd39438ca7e56ee30922d2d6aab98a Mon Sep 17 00:00:00 2001 From: KCas <78678795+CKodes@users.noreply.github.com> Date: Thu, 10 Oct 2024 12:10:06 +0800 Subject: [PATCH 01/35] chore: add Oobee brand colours and fonts to root --- src/static/ejs/partials/styles/styles.ejs | 45 +++++++++++++++++++++-- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/src/static/ejs/partials/styles/styles.ejs b/src/static/ejs/partials/styles/styles.ejs index ac7ea43e..e0723e2e 100644 --- a/src/static/ejs/partials/styles/styles.ejs +++ b/src/static/ejs/partials/styles/styles.ejs @@ -97,6 +97,45 @@ --needs-review-icon: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 20 20' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M17.1429 0H2.85714C1.27919 0 0 1.27919 0 2.85714V17.1429C0 18.7208 1.27919 20 2.85714 20H17.1429C18.7208 20 20 18.7208 20 17.1429V2.85714C20 1.27919 18.7208 0 17.1429 0Z' fill='%236A8A95'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M8.09759 7.26594C8.23445 6.67496 8.46462 6.23328 8.7881 5.9409C9.14891 5.65474 9.57815 5.51166 10.0758 5.51166C10.5984 5.51166 11.0152 5.64852 11.3262 5.92224C11.6372 6.19596 11.7928 6.53188 11.7928 6.93002C11.7928 7.22862 11.7057 7.48367 11.5315 7.69518C11.4195 7.84448 11.0712 8.15552 10.4864 8.6283C9.90785 9.11353 9.51594 9.54277 9.31065 9.91602C9.12403 10.3079 9.03072 10.7745 9.03072 11.3157V11.7449L9.04938 11.8569C9.04938 11.9316 9.06026 12 9.08204 12.0622C9.10381 12.1244 9.12558 12.1742 9.14736 12.2115C9.16913 12.2488 9.20645 12.2815 9.25933 12.3095C9.31221 12.3375 9.35264 12.3593 9.38064 12.3748C9.40863 12.3904 9.45995 12.4012 9.5346 12.4075C9.60925 12.4137 9.66058 12.4168 9.68857 12.4168H9.85187H10.0012C10.2065 12.4168 10.3589 12.409 10.4584 12.3935C10.5579 12.3779 10.6466 12.3313 10.7243 12.2535C10.8021 12.1757 10.841 12.056 10.841 11.8942C10.841 11.6827 10.8534 11.465 10.8783 11.2411C10.897 11.0109 10.9343 10.8305 10.9903 10.6998C11.0712 10.5008 11.3324 10.2208 11.7741 9.86003C12.6077 9.15707 13.1427 8.61587 13.3791 8.23639C13.6279 7.83204 13.7523 7.41524 13.7523 6.986C13.7523 6.17729 13.4102 5.48678 12.7259 4.91446C12.0603 4.30482 11.1458 4 9.9825 4C8.88763 4 8.00428 4.2986 7.33243 4.8958C6.71656 5.41835 6.36198 6.07154 6.26866 6.85537C6.25622 6.89269 6.25 6.9549 6.25 7.04199C6.25 7.29705 6.3402 7.51633 6.52061 7.69984C6.70101 7.88336 6.91563 7.97512 7.16446 7.97512C7.37597 7.97512 7.56571 7.90824 7.73367 7.77449C7.90163 7.64075 8.0105 7.47123 8.06026 7.26594H8.09759ZM10.0012 13.2939C9.62791 13.2939 9.30754 13.4246 9.04005 13.6858C8.77255 13.9471 8.6388 14.2644 8.6388 14.6376C8.6388 15.0047 8.77255 15.3235 9.04005 15.5941C9.30754 15.8647 9.62791 16 10.0012 16C10.3744 16 10.6948 15.8647 10.9623 15.5941C11.2298 15.3235 11.3635 15.0047 11.3635 14.6376C11.3635 14.2644 11.2298 13.9471 10.9623 13.6858C10.6948 13.4246 10.3744 13.2939 10.0012 13.2939Z' fill='white'/%3E%3C/svg%3E%0A"); --passed-icon: url("data:image/svg+xml,%3Csvg width='20' height='20' viewBox='0 0 20 20' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M17.1429 0H2.85714C1.27919 0 0 1.27919 0 2.85714V17.1429C0 18.7208 1.27919 20 2.85714 20H17.1429C18.7208 20 20 18.7208 20 17.1429V2.85714C20 1.27919 18.7208 0 17.1429 0Z' fill='%23039855'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M15.1781 5.3131C15.7942 5.80597 15.8941 6.70496 15.4012 7.32105L9.68694 14.4639C9.19407 15.08 8.29508 15.1799 7.67899 14.687C7.0629 14.1941 6.96301 13.2951 7.45589 12.6791L13.1702 5.5362C13.663 4.92011 14.562 4.82023 15.1781 5.3131Z' fill='white'/%3E%3Cpath fill-rule='evenodd' clip-rule='evenodd' d='M4.70415 9.70455C5.26204 9.14666 6.16656 9.14666 6.72446 9.70455L9.5816 12.5617C10.1395 13.1196 10.1395 14.0241 9.5816 14.582C9.02371 15.1399 8.11919 15.1399 7.56129 14.582L4.70415 11.7249C4.14626 11.167 4.14626 10.2624 4.70415 9.70455Z' fill='white'/%3E%3C/svg%3E%0A"); + + /* Oobee Brand Colours and Fonts */ + --a11y-purple-50: #f8d6ff; + --a11y-purple-70: #e5a6f2; + --a11y-purple-100-light: #9021a6; /* Primary Purple Light Mode */ + --a11y-purple-100-dark: #d54dff; /* Primary Purple Dark Mode */ + --a11y-purple-150: #642272; + --a11y-purple-highlight: #c000e5; + + /* Accents - RGBY */ + --coral-red-50: #ffb7a6; + --coral-red-70: #f27961; + --coral-red-100: #f26949; + --coral-red-150: #a53419; + --leaf-green-50: #ace5c3; + --leaf-green-70: #5cc487; + --leaf-green-100: #3aa566; + --leaf-green-150: #146635; + --sky-blue-50: #9ee0f2; + --sky-blue-70: #73d5e5; + --sky-blue-100: #2bafd8; + --sky-blue-150: #006b8c; + --sunshine-yellow-50: #ffdfa6; + --sunshine-yellow-70: #ffd066; + --sunshine-yellow-100: #ffb200; + --sunshine-yellow-150: #a56600; + + /* Neutral Colours */ + --true-white: #ffffff; + --a11y-black-5: #f4f4f4; + --a11y-black-15: #dededd; + --a11y-black-25: #c9c8c6; + --a11y-black-50: #93928d; + --a11y-black-80: #525048; + --a11y-black-90: #3c3a32; + --a11y-black-100: #26241b; + + /* Fonts */ + --a11y-regular-paragraph: 'PT Sans'; } * { @@ -534,7 +573,8 @@ width: 100%; } - #pagesScannedModalToggle, #pagesScannedModalToggleTxt { + #pagesScannedModalToggle, + #pagesScannedModalToggleTxt { background-color: transparent; color: #0047fa; border: none; @@ -1045,8 +1085,7 @@ background-color: #7f56d9; } - .conformance-bubble.wcag22aa - { + .conformance-bubble.wcag22aa { background-color: #7f56d9; } From 6cf1de37e01cc1c00a073b6861a4640e3d7b5764 Mon Sep 17 00:00:00 2001 From: KCas <78678795+CKodes@users.noreply.github.com> Date: Thu, 10 Oct 2024 13:47:27 +0800 Subject: [PATCH 02/35] chore: update colours --- src/static/ejs/partials/styles/styles.ejs | 128 +++++++++++----------- 1 file changed, 64 insertions(+), 64 deletions(-) diff --git a/src/static/ejs/partials/styles/styles.ejs b/src/static/ejs/partials/styles/styles.ejs index e0723e2e..e425baa7 100644 --- a/src/static/ejs/partials/styles/styles.ejs +++ b/src/static/ejs/partials/styles/styles.ejs @@ -4,7 +4,7 @@ /* Bootstrap CSS overrides */ #accessibility-site-report:root { - --bs-border-color: #b5c5ca; + --bs-border-color: var(--a11y-black-25); --bs-border-radius: 0.25rem; } @@ -29,14 +29,14 @@ #accessibility-site-report html { all: unset; font-family: 'Open Sans', 'Helvetica', sans-serif; - background-color: #f6f8f9; + background-color: var(--a11y-black-5); margin: 0; min-height: 100vh; line-height: 1.75rem; } #accessibility-site-report hr { - border-color: #b5c5ca; + border-color: var(--a11y-black-25); opacity: 1; } @@ -60,7 +60,7 @@ font-weight: 700; font-size: 2rem; margin-top: 0; - color: #333333; + color: var(--a11y-black-100); line-height: 2.5rem; } @@ -79,7 +79,7 @@ } #accessibility-site-report a { - color: #0047fa; + color: var(--sky-blue-150); text-decoration: none; } @@ -139,7 +139,7 @@ } * { - color: #333; + color: var(--a11y-black-100); } a[target='_blank']:after { @@ -154,7 +154,7 @@ padding: 1.5rem 1rem; display: flex; align-items: center; - border-bottom: 1px solid #b5c5ca; + border-bottom: 1px solid var(--a11y-black-25); box-shadow: 0 3px 5px 0 #736ccb1a; } @@ -186,7 +186,7 @@ .search-warning { background: rgb(229, 237, 255); - border: 1px solid var(--A11Y-Grey-400, #648fff); + border: 1px solid var(#648fff); margin-bottom: 2rem; text-align: center; } @@ -214,8 +214,8 @@ flex-wrap: nowrap; height: 76px; border-radius: 0px 0px 4px 4px; - border: 1px solid var(--A11Y-Grey-400, #b5c5ca); - background: var(--A11Y-Grey-100, #f6f8f9); + border: 1px solid var(--a11y-black-25); + background: var(--a11y-black-5); max-width: 100%; min-width: 100%; border-top: 0; @@ -227,8 +227,8 @@ height: 44px; gap: 10px; border-radius: 5px; - border: 1px solid var(--A11Y-Grey-400, #b5c5ca); - background: #f6f8f9; + border: 1px solid var(--a11y-black-25); + background: var(--a11y-black-5); box-sizing: border-box; text-align: center; justify-content: center; @@ -243,8 +243,8 @@ height: 44px; gap: 10px; border-radius: 4px; - border: 1px solid var(--A11Y-Grey-400, #b5c5ca); - background: #f6f8f9; + border: 1px solid var(--a11y-black-25); + background: var(--a11y-black-5); box-sizing: border-box; text-align: center; justify-content: center; @@ -260,8 +260,8 @@ height: 44px; gap: 10px; border-radius: 4px; - border: 1px solid var(--A11Y-Grey-400, #b5c5ca); - background: #f6f8f9; + border: 1px solid var(--a11y-black-25); + background: var(--a11y-black-5); box-sizing: border-box; text-align: center; justify-content: center; @@ -277,18 +277,18 @@ } .filter-options-group input[type='radio']:checked + label { - border: 2px solid var(--A11Y-Primary-Blue-600, #0047fa); + border: 2px solid var(--A11Y-Primary-Blue-600, var(--sky-blue-150)); background: #fff; - color: #0047fa; + color: var(--sky-blue-150); } .filter-words:hover { background: #f2f6ff; - border: 1px solid #0047fa; + border: 1px solid var(--sky-blue-150); } .filter-words { - color: #333333; + color: var(--a11y-black-100); font-size: 16px; font-family: 'Open Sans', sans-serif; font-weight: 400; @@ -335,7 +335,7 @@ position: absolute; left: -50px; font-size: 18px; - color: #0047fa; + color: var(--sky-blue-150); } .toggle:after { @@ -343,7 +343,7 @@ position: absolute; right: -48px; font-size: 18px; - color: #333333; + color: var(--a11y-black-100); } .toggle__handler { @@ -461,7 +461,7 @@ } input:checked + .toggle:before { - color: #333333; + color: var(--a11y-black-100); } input:checked + .toggle:after { @@ -576,7 +576,7 @@ #pagesScannedModalToggle, #pagesScannedModalToggleTxt { background-color: transparent; - color: #0047fa; + color: var(--sky-blue-150); border: none; padding: 0; text-align: left; @@ -607,7 +607,7 @@ display: flex; flex-direction: column; padding: 0.5rem; - border-bottom: 1px solid #b5c5ca; + border-bottom: 1px solid var(--a11y-black-25); } #pagesScannedModal .nav-tabs { border-width: 2px !important; @@ -618,18 +618,18 @@ margin-bottom: -1px; } #pagesScannedModal .nav-link.active { - border-bottom: 2px solid #0047fa; + border-bottom: 2px solid var(--sky-blue-150); } #pagesScannedModal .nav-link { border: none; - color: #333333; + color: var(--a11y-black-100); display: flex; align-items: center; gap: 0.5rem; } #pagesScannedModal .badge { background-color: #e7ecee; - color: #333333; + color: var(--a11y-black-100); text-align: center; border-radius: 8px; padding: 0.25rem 0.5rem; @@ -637,7 +637,7 @@ line-height: 1rem; } #pagesScannedModal .nav-link.active > .badge { - background-color: #0047fa; + background-color: var(--sky-blue-150); color: white; } #pagesScannedModal .not-scanned-url { @@ -678,13 +678,13 @@ #scanabout-compliance-card { box-shadow: none; border-width: 1.5px; - border-color: #b5c5ca; + border-color: var(--a11y-black-25); } .wcag-compliance-passes-panel { margin: 1.5rem 0; padding: 1rem; - border: 1px solid #b5c5ca; + border: 1px solid var(--a11y-black-25); border-radius: 0.25rem; } @@ -698,7 +698,7 @@ } #wcag-compliance-passes-bar-progress { - background-color: #785ef0; + background-color: var(--a11y-purple-100-light); position: absolute; left: 0; height: 100%; @@ -706,7 +706,7 @@ } .wcag-compliance-passes-bar-progress { - background-color: #785ef0; + background-color: var(--a11y-purple-100-light); position: absolute; left: 0; height: 100%; @@ -735,7 +735,7 @@ border: 0; padding: 0; float: right; - color: #0047fa; + color: var(--sky-blue-150); } button#wcagModalToggle:hover { @@ -803,13 +803,13 @@ } #top-five-card li:not(:last-of-type) { - border-bottom: 1px solid #b5c5ca; + border-bottom: 1px solid var(--a11y-black-25); padding-bottom: 0.5rem; margin-bottom: 0.5rem; } .category-selector { - border: 1px solid #b5c5ca; + border: 1px solid var(--a11y-black-25); background-color: white; border-radius: 0.25rem; padding: 1rem; @@ -820,7 +820,7 @@ } .category-selector.selected { - border: 2px solid #0047fa; + border: 2px solid var(--sky-blue-150); padding: calc(1rem - 1px); cursor: default; } @@ -828,7 +828,7 @@ .category-selector:not(.selected):hover { cursor: pointer; background-color: #f2f6ff; - border: 1px solid #0047fa; + border: 1px solid var(--sky-blue-150); } .category-selector .category-name { @@ -848,7 +848,7 @@ } .category-selector.selected .category-name { - color: #0047fa; + color: var(--sky-blue-150); } .category-selector.mustFix .category-name::before { @@ -916,7 +916,7 @@ width: 300px; padding: 1.5rem 1rem; word-break: break-all; - border-right: 1px solid #b5c5ca; + border-right: 1px solid var(--a11y-black-25); } #scan-about ul { @@ -978,7 +978,7 @@ width: 100%; background-color: transparent; border: 0; - border-bottom: 1px solid #b5c5ca; + border-bottom: 1px solid var(--a11y-black-25); } .rule-item:hover { @@ -1054,8 +1054,8 @@ } #expandedRule .offcanvas-body { - background-color: #f6f8f9; - border-top: 1px solid #b5c5ca; + background-color: var(--a11y-black-5); + border-top: 1px solid var(--a11y-black-25); padding: 2rem 1.5rem; overflow-y: unset; } @@ -1160,7 +1160,7 @@ #expandedRuleCategoryContent .accordion-button .counter { padding: 0.5rem; min-width: 61px; - border: 1px solid #b5c5ca; + border: 1px solid var(--a11y-black-25); border-radius: 0.375rem; padding: 0.25rem 0.5rem; font-weight: bold; @@ -1207,7 +1207,7 @@ #expandedRuleCategoryContent .accordion-body .card .needsReview { color: #4a6168; - background-color: #f6f8f9; + background-color: var(--a11y-black-5); border-bottom: 1px solid #d1dbde; padding: 0.5rem 1rem; display: flex; @@ -1243,7 +1243,7 @@ .ai-response-card { padding: 1rem; - border: 1px solid #b5c5ca; + border: 1px solid var(--a11y-black-25); background-color: #f7f6fe; border-radius: 4px; } @@ -1307,8 +1307,8 @@ #expandedRuleCategoryContent .accordion-body pre, .bg-grey-w-border { - background-color: #f6f8f9; - border: 1px solid #b5c5ca; + background-color: var(--a11y-black-5); + border: 1px solid var(--a11y-black-25); font-size: 1rem; padding: 0.5rem; white-space: normal; @@ -1347,17 +1347,17 @@ } #expandedRuleCategoryContent .page-items-count { - border: 1px solid #b5c5ca; + border: 1px solid var(--a11y-black-25); border-radius: 0.475rem; margin-left: 0.5rem; padding: 0 0.5rem; } #summary-table-header { - border-bottom: 3px solid #785ef0 !important; - border-top: 1px solid #b5c5ca; - border-left: 1px solid #b5c5ca; - border-right: 1px solid #b5c5ca; + border-bottom: 3px solid var(--a11y-purple-100-light) !important; + border-top: 1px solid var(--a11y-black-25); + border-left: 1px solid var(--a11y-black-25); + border-right: 1px solid var(--a11y-black-25); border-style: solid; padding-left: 16px; padding-top: 14px; @@ -1455,8 +1455,8 @@ } .aiGenerateResponseButton:disabled { - border: 1px solid #b5c5ca; - color: #b5c5ca; + border: 1px solid var(--a11y-black-25); + color: var(--a11y-black-25); } .aiGenerateResponseButton:hover:not(:disabled) { @@ -1517,8 +1517,8 @@ .codeForAiResponse { display: inline-block; - background-color: #f6f8f9; - border: 1px solid #b5c5ca; + background-color: var(--a11y-black-5); + border: 1px solid var(--a11y-black-25); font-size: 1rem; padding: 0.5rem; white-space: normal; @@ -1530,7 +1530,7 @@ #expandedRuleAiFeedback { margin-top: 2rem; background-color: #f7f6fe; - border: 1px solid #785ef0; + border: 1px solid var(--a11y-purple-100-light); border-radius: 4px; padding: 1rem; } @@ -1655,8 +1655,8 @@ background-color: rgb(255, 255, 255); &[aria-selected='true']::after { - border-bottom: 1px solid #333; - border-right: 1px solid #333; + border-bottom: 1px solid var(--a11y-black-100); + border-right: 1px solid var(--a11y-black-100); content: ''; height: 16px; position: absolute; @@ -1667,12 +1667,12 @@ } &:hover { - border-color: #b5c5ca; + border-color: var(--a11y-black-25); background-color: #f2f6ff; } &:focus { - border-color: #b5c5ca; + border-color: var(--a11y-black-25); background-color: #f2f6ff; } } @@ -1703,8 +1703,8 @@ .expanded-rule-issue-type-combobox-button::after, .ally-toggle-button-2::after { - border-bottom: 1px solid #333; - border-right: 1px solid #333; + border-bottom: 1px solid var(--a11y-black-100); + border-right: 1px solid var(--a11y-black-100); content: ''; display: block; height: 12px; From 7ffe63d2069c2f290fba83f37ea4904483e83210 Mon Sep 17 00:00:00 2001 From: KCas <78678795+CKodes@users.noreply.github.com> Date: Thu, 10 Oct 2024 13:52:49 +0800 Subject: [PATCH 03/35] chore: add and update font --- src/static/ejs/partials/styles/styles.ejs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/static/ejs/partials/styles/styles.ejs b/src/static/ejs/partials/styles/styles.ejs index e425baa7..3ea45f58 100644 --- a/src/static/ejs/partials/styles/styles.ejs +++ b/src/static/ejs/partials/styles/styles.ejs @@ -1,6 +1,8 @@ diff --git a/src/static/ejs/report.ejs b/src/static/ejs/report.ejs index fd72d58a..33ea9c0d 100644 --- a/src/static/ejs/report.ejs +++ b/src/static/ejs/report.ejs @@ -154,7 +154,7 @@ 'd', 'M11.9528 2.05329C9.22079 -0.68205 4.78867 -0.68477 2.0533 2.04718C-0.682042 4.7792 -0.684795 9.21135 2.04722 11.9467C4.77917 14.6821 9.21135 14.6848 11.9467 11.9528C14.682 9.22085 14.6848 4.78863 11.9528 2.05329ZM7.00216 11.2406C6.6319 11.2406 6.33174 10.9405 6.33174 10.5702C6.33174 10.1999 6.63187 9.89976 7.00216 9.89976C7.37243 9.89976 7.67259 10.1999 7.67259 10.5702C7.67255 10.9405 7.37243 11.2406 7.00216 11.2406ZM8.09214 7.20401C7.70918 7.42788 7.67645 7.7033 7.6748 8.49691C7.6747 8.54938 7.67453 8.60233 7.67423 8.65558C7.67185 9.03068 7.36712 9.33312 6.99253 9.33312C6.99105 9.33312 6.98957 9.33312 6.98813 9.33312C6.61159 9.33074 6.3083 9.02356 6.31066 8.64699C6.31099 8.59568 6.31109 8.54468 6.31119 8.49415C6.31287 7.67852 6.31492 6.66352 7.40395 6.02694C8.27777 5.51613 8.3879 5.18059 8.28543 4.74029C8.16503 4.2231 7.69273 4.08907 7.32418 4.1312C7.20042 4.14541 6.58322 4.24724 6.58322 4.85783C6.58322 5.23431 6.27795 5.5396 5.90141 5.5396C5.52487 5.5396 5.21964 5.23431 5.21964 4.85783C5.21964 3.76416 6.02107 2.90831 7.16859 2.77656C8.35043 2.64099 9.35515 3.32135 9.61338 4.4312C9.99939 6.08915 8.61379 6.89911 8.09214 7.20401Z', ); - path.setAttribute('fill', '#B5C5CA'); + path.setAttribute('fill', '#c9c8c6'); clipPath.appendChild(rect); svgIcon.appendChild(clipPath); From f69768b12aa5dfce8cd28eddac51d828b5398438 Mon Sep 17 00:00:00 2001 From: KCas <78678795+CKodes@users.noreply.github.com> Date: Thu, 10 Oct 2024 14:55:51 +0800 Subject: [PATCH 09/35] chore: prettier --- .../ejs/partials/components/reportSearch.ejs | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/static/ejs/partials/components/reportSearch.ejs b/src/static/ejs/partials/components/reportSearch.ejs index a3115026..456ac38a 100644 --- a/src/static/ejs/partials/components/reportSearch.ejs +++ b/src/static/ejs/partials/components/reportSearch.ejs @@ -1,9 +1,15 @@ -

Issues

-