From 91f6fe3c542e8968cd9b8a802d21c4e33c9ff900 Mon Sep 17 00:00:00 2001 From: Edward Hibbert Date: Wed, 1 Feb 2023 11:11:58 +0000 Subject: [PATCH 1/5] Some CSS images lost by shift. --- resources/global/css/components/_buttons.scss | 2 +- resources/global/css/components/_card-talk.scss | 2 +- resources/global/css/components/_custom-check-tick.scss | 2 +- resources/global/css/components/_forms.scss | 8 ++++---- resources/global/css/components/_lists.scss | 2 +- resources/global/css/components/_navigation-bar.scss | 2 +- resources/global/css/components/_row-columns.scss | 2 +- resources/global/css/components/_tables.scss | 2 +- resources/global/css/components/_tabs.scss | 2 +- resources/global/css/helpers/_hr.scss | 2 +- resources/wiki/css/components/_edit-page-button.scss | 2 +- resources/wiki/css/components/_row-arrows.scss | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/resources/global/css/components/_buttons.scss b/resources/global/css/components/_buttons.scss index 8361b4895d..fec70a499e 100644 --- a/resources/global/css/components/_buttons.scss +++ b/resources/global/css/components/_buttons.scss @@ -291,7 +291,7 @@ width: 100%; height: 100%; text-align: center; - background-image: url('/images/svgs/check-tick.svg'); + background-image: url('/images//check-tick.svg'); background-repeat: no-repeat; background-position: center center; content: ""; diff --git a/resources/global/css/components/_card-talk.scss b/resources/global/css/components/_card-talk.scss index 7baf4213b4..58c274e3c6 100644 --- a/resources/global/css/components/_card-talk.scss +++ b/resources/global/css/components/_card-talk.scss @@ -123,7 +123,7 @@ width: 20px; height: 20px; text-align: center; - background-image: url('/images/svgs/reply_icon.svg'); + background-image: url('/images//reply_icon.svg'); background-repeat: no-repeat; background-position: center center; display: inline-block; diff --git a/resources/global/css/components/_custom-check-tick.scss b/resources/global/css/components/_custom-check-tick.scss index 33123b6411..3ccfba5bf4 100644 --- a/resources/global/css/components/_custom-check-tick.scss +++ b/resources/global/css/components/_custom-check-tick.scss @@ -7,7 +7,7 @@ } .form-check-input:checked + .form-check-label::before { - background-image: url('/images/svgs/check-tick.svg'); + background-image: url('/images//check-tick.svg'); background-color: $white; color: $white; background-repeat: no-repeat; diff --git a/resources/global/css/components/_forms.scss b/resources/global/css/components/_forms.scss index 1e063cd2a1..5700455c10 100644 --- a/resources/global/css/components/_forms.scss +++ b/resources/global/css/components/_forms.scss @@ -65,7 +65,7 @@ label.form-check-label { border-right: none !important; .select2-selection__arrow b { - background-image: url('/images/svgs/dropdown-arrow.svg') !important; + background-image: url('/images//dropdown-arrow.svg') !important; background-repeat: no-repeat !important; border-width: 0 0 0 0 !important; left: -50%; @@ -81,7 +81,7 @@ label.form-check-label { .select2-container--open { .select2-selection__arrow b { - background-image: url('/images/svgs/dropdown-arrow-up.svg') !important; + background-image: url('/images//dropdown-arrow-up.svg') !important; } } @@ -130,7 +130,7 @@ label.form-check-label { border: 0; border-color: unset !important; border-style: unset !important; - background-image: url('/images/svgs/dropdown-arrow.svg'); + background-image: url('/images//dropdown-arrow.svg'); width: 14px !important; height: 8px !important; left: 10% !important; @@ -216,7 +216,7 @@ select.form-control:not([class*="select2"]) { -moz-appearance: none; background-position: 96% 50%; background-repeat: no-repeat; - background-image: url('/images/svgs/dropdown-arrow.svg') !important; + background-image: url('/images//dropdown-arrow.svg') !important; } .custom-file-input ~ .custom-file-label::after { diff --git a/resources/global/css/components/_lists.scss b/resources/global/css/components/_lists.scss index 3a6db4671c..f785577aaf 100644 --- a/resources/global/css/components/_lists.scss +++ b/resources/global/css/components/_lists.scss @@ -15,7 +15,7 @@ width: 23px; color: white; font-weight: bold; - background-image: url('/images/svgs/arrow-right-doodle.svg'); + background-image: url('/images//arrow-right-doodle.svg'); background-repeat: no-repeat; background-position: center; position: absolute; diff --git a/resources/global/css/components/_navigation-bar.scss b/resources/global/css/components/_navigation-bar.scss index 188efecfc2..34e634a081 100644 --- a/resources/global/css/components/_navigation-bar.scss +++ b/resources/global/css/components/_navigation-bar.scss @@ -59,7 +59,7 @@ position: absolute; width: 18px; height: 18px; - background-image: url(/images/svgs/cross-icon.svg); + background-image: url(/images//cross-icon.svg); top: 50%; left: 50%; transform: translate(-50%, -50%); diff --git a/resources/global/css/components/_row-columns.scss b/resources/global/css/components/_row-columns.scss index bd12183a2d..65b5c279a7 100644 --- a/resources/global/css/components/_row-columns.scss +++ b/resources/global/css/components/_row-columns.scss @@ -2,7 +2,7 @@ &::before { content: ""; position: absolute; - background-image: url('/images/svgs/rectangle.svg'); + background-image: url('/images//rectangle.svg'); left: -3px; top: 0; background-position: top; diff --git a/resources/global/css/components/_tables.scss b/resources/global/css/components/_tables.scss index d868dc6438..4d620c21d3 100644 --- a/resources/global/css/components/_tables.scss +++ b/resources/global/css/components/_tables.scss @@ -394,7 +394,7 @@ @extend .border-0; margin-left: 7px; - background-image: url('/images/svgs/dropdown-arrow.svg'); + background-image: url('/images//dropdown-arrow.svg'); background-repeat: no-repeat; background-size: cover; background-position: center; diff --git a/resources/global/css/components/_tabs.scss b/resources/global/css/components/_tabs.scss index 80a0baca12..8ade27c702 100644 --- a/resources/global/css/components/_tabs.scss +++ b/resources/global/css/components/_tabs.scss @@ -214,7 +214,7 @@ background-position: center; width: 15px; height: 8px; - background-image: url('/images/svgs/dropdown-arrow-up.svg') !important; + background-image: url('/images//dropdown-arrow-up.svg') !important; border: 0; margin-left: 8px; transform: rotate(181deg) translateY(50%); diff --git a/resources/global/css/helpers/_hr.scss b/resources/global/css/helpers/_hr.scss index 00674bfa18..b2e513b589 100644 --- a/resources/global/css/helpers/_hr.scss +++ b/resources/global/css/helpers/_hr.scss @@ -15,7 +15,7 @@ &-dashed { @extend .border-0; - background-image: url('/images/svgs/rectangle.svg'); + background-image: url('/images//rectangle.svg'); background-color: transparent; background-repeat: repeat; background-position: left; diff --git a/resources/wiki/css/components/_edit-page-button.scss b/resources/wiki/css/components/_edit-page-button.scss index 747a26c82b..ab72dc0f37 100644 --- a/resources/wiki/css/components/_edit-page-button.scss +++ b/resources/wiki/css/components/_edit-page-button.scss @@ -25,7 +25,7 @@ background: #000 !important; &::before { - background-image: url('/images/svgs/edit_icon_hover.svg'); + background-image: url('/images//edit_icon_hover.svg'); } } } diff --git a/resources/wiki/css/components/_row-arrows.scss b/resources/wiki/css/components/_row-arrows.scss index c2b98d05e9..4f9d2ab5e3 100644 --- a/resources/wiki/css/components/_row-arrows.scss +++ b/resources/wiki/css/components/_row-arrows.scss @@ -11,7 +11,7 @@ &::after { content: ''; - background-image: url('/images/svgs/rectangle.svg'); + background-image: url('/images//rectangle.svg'); background-repeat: repeat; background-position: left; height: 3px; @@ -37,7 +37,7 @@ width: 23px; color: white; font-weight: bold; - background-image: url('/images/svgs/arrow-right-doodle.svg'); + background-image: url('/images//arrow-right-doodle.svg'); background-repeat: no-repeat; background-position: center; display: inline-block; From abafb85c72e95152a64cf9aa4ebd558850553336 Mon Sep 17 00:00:00 2001 From: Edward Hibbert Date: Wed, 1 Feb 2023 12:34:31 +0000 Subject: [PATCH 2/5] Some CSS images lost by shift. --- resources/global/css/components/_lists.scss | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/global/css/components/_lists.scss b/resources/global/css/components/_lists.scss index f785577aaf..adbb5951b7 100644 --- a/resources/global/css/components/_lists.scss +++ b/resources/global/css/components/_lists.scss @@ -1,8 +1,8 @@ .list-doodle { - list-style-type: none; - margin: 0; - padding: 0; - margin-left: 35px; + list-style-type: none !important; + margin: 0 !important;; + padding: 0 !important;; + margin-left: 35px !important;; li { position: relative; From 059ff0bff0b8492bd19e205b388366900508d7c9 Mon Sep 17 00:00:00 2001 From: Edward Hibbert Date: Wed, 1 Feb 2023 13:19:42 +0000 Subject: [PATCH 3/5] Some CSS images lost by shift. --- resources/global/css/components/_buttons.scss | 2 +- resources/global/css/components/_card-talk.scss | 2 +- resources/global/css/components/_custom-check-tick.scss | 2 +- resources/global/css/components/_forms.scss | 8 ++++---- resources/global/css/components/_lists.scss | 5 +++-- resources/global/css/components/_navigation-bar.scss | 2 +- resources/global/css/components/_row-columns.scss | 2 +- resources/global/css/components/_tables.scss | 2 +- resources/global/css/components/_tabs.scss | 2 +- resources/global/css/helpers/_hr.scss | 2 +- resources/wiki/css/components/_edit-page-button.scss | 4 ++-- resources/wiki/css/components/_row-arrows.scss | 4 ++-- 12 files changed, 19 insertions(+), 18 deletions(-) diff --git a/resources/global/css/components/_buttons.scss b/resources/global/css/components/_buttons.scss index fec70a499e..0762582a14 100644 --- a/resources/global/css/components/_buttons.scss +++ b/resources/global/css/components/_buttons.scss @@ -291,7 +291,7 @@ width: 100%; height: 100%; text-align: center; - background-image: url('/images//check-tick.svg'); + background-image: url('/images/check-tick.svg'); background-repeat: no-repeat; background-position: center center; content: ""; diff --git a/resources/global/css/components/_card-talk.scss b/resources/global/css/components/_card-talk.scss index 58c274e3c6..e903284ca9 100644 --- a/resources/global/css/components/_card-talk.scss +++ b/resources/global/css/components/_card-talk.scss @@ -123,7 +123,7 @@ width: 20px; height: 20px; text-align: center; - background-image: url('/images//reply_icon.svg'); + background-image: url('/images/reply_icon.svg'); background-repeat: no-repeat; background-position: center center; display: inline-block; diff --git a/resources/global/css/components/_custom-check-tick.scss b/resources/global/css/components/_custom-check-tick.scss index 3ccfba5bf4..fee696805f 100644 --- a/resources/global/css/components/_custom-check-tick.scss +++ b/resources/global/css/components/_custom-check-tick.scss @@ -7,7 +7,7 @@ } .form-check-input:checked + .form-check-label::before { - background-image: url('/images//check-tick.svg'); + background-image: url('/images/check-tick.svg'); background-color: $white; color: $white; background-repeat: no-repeat; diff --git a/resources/global/css/components/_forms.scss b/resources/global/css/components/_forms.scss index 5700455c10..b83a153b05 100644 --- a/resources/global/css/components/_forms.scss +++ b/resources/global/css/components/_forms.scss @@ -65,7 +65,7 @@ label.form-check-label { border-right: none !important; .select2-selection__arrow b { - background-image: url('/images//dropdown-arrow.svg') !important; + background-image: url('/images/dropdown-arrow.svg') !important; background-repeat: no-repeat !important; border-width: 0 0 0 0 !important; left: -50%; @@ -81,7 +81,7 @@ label.form-check-label { .select2-container--open { .select2-selection__arrow b { - background-image: url('/images//dropdown-arrow-up.svg') !important; + background-image: url('/images/dropdown-arrow-up.svg') !important; } } @@ -130,7 +130,7 @@ label.form-check-label { border: 0; border-color: unset !important; border-style: unset !important; - background-image: url('/images//dropdown-arrow.svg'); + background-image: url('/images/dropdown-arrow.svg'); width: 14px !important; height: 8px !important; left: 10% !important; @@ -216,7 +216,7 @@ select.form-control:not([class*="select2"]) { -moz-appearance: none; background-position: 96% 50%; background-repeat: no-repeat; - background-image: url('/images//dropdown-arrow.svg') !important; + background-image: url('/images/dropdown-arrow.svg') !important; } .custom-file-input ~ .custom-file-label::after { diff --git a/resources/global/css/components/_lists.scss b/resources/global/css/components/_lists.scss index adbb5951b7..eb0cd406d5 100644 --- a/resources/global/css/components/_lists.scss +++ b/resources/global/css/components/_lists.scss @@ -1,4 +1,4 @@ -.list-doodle { +.mediawiki .main-page ul { list-style-type: none !important; margin: 0 !important;; padding: 0 !important;; @@ -6,6 +6,7 @@ li { position: relative; + list-style: none !important; &::before { content: ''; @@ -15,7 +16,7 @@ width: 23px; color: white; font-weight: bold; - background-image: url('/images//arrow-right-doodle.svg'); + background-image: url('/images/arrow-right-doodle.svg'); background-repeat: no-repeat; background-position: center; position: absolute; diff --git a/resources/global/css/components/_navigation-bar.scss b/resources/global/css/components/_navigation-bar.scss index 34e634a081..70ded90599 100644 --- a/resources/global/css/components/_navigation-bar.scss +++ b/resources/global/css/components/_navigation-bar.scss @@ -59,7 +59,7 @@ position: absolute; width: 18px; height: 18px; - background-image: url(/images//cross-icon.svg); + background-image: url(/images/cross-icon.svg); top: 50%; left: 50%; transform: translate(-50%, -50%); diff --git a/resources/global/css/components/_row-columns.scss b/resources/global/css/components/_row-columns.scss index 65b5c279a7..4832de11fb 100644 --- a/resources/global/css/components/_row-columns.scss +++ b/resources/global/css/components/_row-columns.scss @@ -2,7 +2,7 @@ &::before { content: ""; position: absolute; - background-image: url('/images//rectangle.svg'); + background-image: url('/images/rectangle.svg'); left: -3px; top: 0; background-position: top; diff --git a/resources/global/css/components/_tables.scss b/resources/global/css/components/_tables.scss index 4d620c21d3..9b9c0a5a88 100644 --- a/resources/global/css/components/_tables.scss +++ b/resources/global/css/components/_tables.scss @@ -394,7 +394,7 @@ @extend .border-0; margin-left: 7px; - background-image: url('/images//dropdown-arrow.svg'); + background-image: url('/images/dropdown-arrow.svg'); background-repeat: no-repeat; background-size: cover; background-position: center; diff --git a/resources/global/css/components/_tabs.scss b/resources/global/css/components/_tabs.scss index 8ade27c702..ea984ac5e3 100644 --- a/resources/global/css/components/_tabs.scss +++ b/resources/global/css/components/_tabs.scss @@ -214,7 +214,7 @@ background-position: center; width: 15px; height: 8px; - background-image: url('/images//dropdown-arrow-up.svg') !important; + background-image: url('/images/dropdown-arrow-up.svg') !important; border: 0; margin-left: 8px; transform: rotate(181deg) translateY(50%); diff --git a/resources/global/css/helpers/_hr.scss b/resources/global/css/helpers/_hr.scss index b2e513b589..0a79ac2b5a 100644 --- a/resources/global/css/helpers/_hr.scss +++ b/resources/global/css/helpers/_hr.scss @@ -15,7 +15,7 @@ &-dashed { @extend .border-0; - background-image: url('/images//rectangle.svg'); + background-image: url('/images/rectangle.svg'); background-color: transparent; background-repeat: repeat; background-position: left; diff --git a/resources/wiki/css/components/_edit-page-button.scss b/resources/wiki/css/components/_edit-page-button.scss index ab72dc0f37..0368a6994a 100644 --- a/resources/wiki/css/components/_edit-page-button.scss +++ b/resources/wiki/css/components/_edit-page-button.scss @@ -13,7 +13,7 @@ position: absolute; width: 30px; height: 30px; - background-image: url('/iamges/svgs/edit_icon.svg'); + background-image: url('/images/edit_icon.svg'); position: absolute; top: 50%; left: 50%; @@ -25,7 +25,7 @@ background: #000 !important; &::before { - background-image: url('/images//edit_icon_hover.svg'); + background-image: url('/images/edit_icon_hover.svg'); } } } diff --git a/resources/wiki/css/components/_row-arrows.scss b/resources/wiki/css/components/_row-arrows.scss index 4f9d2ab5e3..892a340941 100644 --- a/resources/wiki/css/components/_row-arrows.scss +++ b/resources/wiki/css/components/_row-arrows.scss @@ -11,7 +11,7 @@ &::after { content: ''; - background-image: url('/images//rectangle.svg'); + background-image: url('/images/rectangle.svg'); background-repeat: repeat; background-position: left; height: 3px; @@ -37,7 +37,7 @@ width: 23px; color: white; font-weight: bold; - background-image: url('/images//arrow-right-doodle.svg'); + background-image: url('/images/arrow-right-doodle.svg'); background-repeat: no-repeat; background-position: center; display: inline-block; From 2a7d753b5f413b1139bf0b66da041ee7d9234eee Mon Sep 17 00:00:00 2001 From: Edward Hibbert Date: Wed, 1 Feb 2023 13:44:39 +0000 Subject: [PATCH 4/5] Fix wiki front page. --- resources/global/css/components/_lists.scss | 1 + resources/wiki/css/app.scss | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/resources/global/css/components/_lists.scss b/resources/global/css/components/_lists.scss index eb0cd406d5..b8439b36fa 100644 --- a/resources/global/css/components/_lists.scss +++ b/resources/global/css/components/_lists.scss @@ -3,6 +3,7 @@ margin: 0 !important;; padding: 0 !important;; margin-left: 35px !important;; + margin-bottom: 25px !important; li { position: relative; diff --git a/resources/wiki/css/app.scss b/resources/wiki/css/app.scss index be235a9be7..7b0bdb21c3 100644 --- a/resources/wiki/css/app.scss +++ b/resources/wiki/css/app.scss @@ -26,6 +26,25 @@ body { font-family: "Asap", sans-serif; } +.main-page { + counter-reset: section 0; + counter-increment: chapter; + + h2::before { + content: counter(chapter); + + width: 50px; + height: 50px; + background: $black; + color: $white; + text-align: center; + font-size: 36px; + display: inline-block; + padding: 4px; + margin-right: 12px; + } +} + .mw-parser-output { counter-reset: chapter 0 section 0; From a5b4c8dd4003edb811c78ef54400011a4b3e6e20 Mon Sep 17 00:00:00 2001 From: Edward Hibbert Date: Wed, 1 Feb 2023 15:22:35 +0000 Subject: [PATCH 5/5] Fix wiki front page. --- resources/wiki/css/app.scss | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/resources/wiki/css/app.scss b/resources/wiki/css/app.scss index 7b0bdb21c3..5664348f1f 100644 --- a/resources/wiki/css/app.scss +++ b/resources/wiki/css/app.scss @@ -27,21 +27,22 @@ body { } .main-page { - counter-reset: section 0; - counter-increment: chapter; - - h2::before { - content: counter(chapter); - - width: 50px; - height: 50px; - background: $black; - color: $white; - text-align: center; - font-size: 36px; - display: inline-block; - padding: 4px; - margin-right: 12px; + counter-reset: chapter 0; + + .mw-collapsible { + h2::before { + content: counter(chapter); + + width: 50px; + height: 50px; + background: $black; + color: $white; + text-align: center; + font-size: 36px; + display: inline-block; + padding: 4px; + margin-right: 12px; + } } }