From 2e4005c2e32b6ae2bbc6b21cabba919185678368 Mon Sep 17 00:00:00 2001 From: Lucas Date: Wed, 29 May 2024 08:48:14 +0100 Subject: [PATCH 1/3] [Scorecards] Updated methodology pdf link --- scoring/templates/scoring/methodology/2025/_intro.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scoring/templates/scoring/methodology/2025/_intro.html b/scoring/templates/scoring/methodology/2025/_intro.html index afbe4b2c..b282c79c 100644 --- a/scoring/templates/scoring/methodology/2025/_intro.html +++ b/scoring/templates/scoring/methodology/2025/_intro.html @@ -37,7 +37,7 @@

Summary

If you're interested in volunteering with us, to support others to use the Action Scorecards or help us mark the next Action Scorecards, register your interest here.

-

You can see the draft methodology explanation text in pdf format here. You can also view the questions and criteria in spreadsheet format here. This information is identical to this website.

+

You can see the draft methodology explanation text in pdf format here. You can also view the questions and criteria in spreadsheet format here. This information is identical to this website.

Methodology Review

From 81e4d2ae2621f96161d25275d8796d5c510de6c3 Mon Sep 17 00:00:00 2001 From: Zarino Zappia Date: Mon, 3 Jun 2024 10:28:51 +0100 Subject: [PATCH 2/3] [Scorecards] More prominent styling for Methodology in-page nav - Move in-page nav to left-hand column - Purple links in in-page nav - White background for in-page nav on mobile (rather than transparent) --- scoring/static/scoring/scss/navbar.scss | 9 ++++++--- scoring/templates/scoring/methodology.html | 4 ++-- scoring/templates/scoring/methodology/2025/_toc.html | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/scoring/static/scoring/scss/navbar.scss b/scoring/static/scoring/scss/navbar.scss index 9dd433c1..5320dcb1 100644 --- a/scoring/static/scoring/scss/navbar.scss +++ b/scoring/static/scoring/scss/navbar.scss @@ -79,10 +79,9 @@ padding: 1rem 15px 1rem 45px; margin: 0 -15px; width: 100vw; - background-image: url('../img/hamburger-black.svg'); + border: none; + background: #fff url('../img/hamburger-black.svg') 15px 50% no-repeat; background-size: 1rem; - background-repeat: no-repeat; - background-position: 15px 50%; &:focus { background-color: $color-scorecard-yellow; @@ -97,4 +96,8 @@ display: block; } } + + .list-group { + --bs-list-group-color: #{$link-color}; + } } diff --git a/scoring/templates/scoring/methodology.html b/scoring/templates/scoring/methodology.html index 91b6325d..cca29856 100644 --- a/scoring/templates/scoring/methodology.html +++ b/scoring/templates/scoring/methodology.html @@ -25,7 +25,7 @@

-
+
@@ -38,7 +38,7 @@

Contents

-
+
{% include intro_template %} diff --git a/scoring/templates/scoring/methodology/2025/_toc.html b/scoring/templates/scoring/methodology/2025/_toc.html index d8cf6415..71db76ca 100644 --- a/scoring/templates/scoring/methodology/2025/_toc.html +++ b/scoring/templates/scoring/methodology/2025/_toc.html @@ -1,7 +1,7 @@ Summary Methodology Review Question Criteria -See the questions +See the questions Question weighting within sections Section Summaries and Weightings What We are Marking From 007a470f5451b6eeb907ebf17b786c025d9c4715 Mon Sep 17 00:00:00 2001 From: Zarino Zappia Date: Mon, 3 Jun 2024 11:08:15 +0100 Subject: [PATCH 3/3] [Scorecards] Override bg-primary-* for .year-2025 pages Also fix broken background color on main-filter-methodology component, making it much more noticeable on the Methodology page. --- scoring/static/scoring/scss/main.scss | 1 + scoring/static/scoring/scss/years.scss | 23 +++++++++++++++++++ .../includes/main-filter-methodology.html | 2 +- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 scoring/static/scoring/scss/years.scss diff --git a/scoring/static/scoring/scss/main.scss b/scoring/static/scoring/scss/main.scss index 2a1e1a13..d12ffdea 100644 --- a/scoring/static/scoring/scss/main.scss +++ b/scoring/static/scoring/scss/main.scss @@ -64,3 +64,4 @@ @import "toggle-buttons"; @import "loading-shimmer"; @import "open-graph-preview"; +@import "years"; diff --git a/scoring/static/scoring/scss/years.scss b/scoring/static/scoring/scss/years.scss new file mode 100644 index 00000000..632edd81 --- /dev/null +++ b/scoring/static/scoring/scss/years.scss @@ -0,0 +1,23 @@ +.year-2025 { + $shades: ( + "100": $primary2025-100, + "200": $primary2025-200, + "300": $primary2025-300, + "400": $primary2025-400, + "500": $primary2025-500, + "600": $primary2025-600, + "700": $primary2025-700, + "800": $primary2025-800, + "900": $primary2025-900 + ); + + .bg-primary { + background-color: $primary2025-500 !important; + } + + @each $n, $shade in $shades { + .bg-primary-#{$n} { + background-color: $shade !important; + } + } +} diff --git a/scoring/templates/scoring/includes/main-filter-methodology.html b/scoring/templates/scoring/includes/main-filter-methodology.html index c389a6f9..55b99634 100644 --- a/scoring/templates/scoring/includes/main-filter-methodology.html +++ b/scoring/templates/scoring/includes/main-filter-methodology.html @@ -1,4 +1,4 @@ -
+

Or show questions by type of council