Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft Methodology 2025 feedback #669

Merged
merged 3 commits into from
Jun 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scoring/static/scoring/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,4 @@
@import "toggle-buttons";
@import "loading-shimmer";
@import "open-graph-preview";
@import "years";
9 changes: 6 additions & 3 deletions scoring/static/scoring/scss/navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -97,4 +96,8 @@
display: block;
}
}

.list-group {
--bs-list-group-color: #{$link-color};
}
}
23 changes: 23 additions & 0 deletions scoring/static/scoring/scss/years.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="bg-blue-l2 p-3 mb-4 border rounded">
<div class="bg-primary-100 p-3 mb-4 border rounded">
<label for="questions-council-name" class="d-block mb-2">Show questions for a specific council</label>
<input class="form-control searchbar js-methodology-council-autocomplete" type="search" placeholder="Council name" aria-label="Council name" id="questions-council-name">
<p class="mt-3 mt-lg-4 mb-2">Or show questions by type of council</p>
Expand Down
4 changes: 2 additions & 2 deletions scoring/templates/scoring/methodology.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ <h1 class="mb-3" style="max-width: 20em">

<div class="container-xl">
<div class="row">
<div class="col-md-4 offset-lg-1 col-xl-3 order-md-2 mt-5 sticky-in-page-nav">
<div class="col-md-4 col-xl-3 mt-5 sticky-in-page-nav">

<button aria-expanded="false" aria-controls="in-page-nav">Jump to section</button>

Expand All @@ -38,7 +38,7 @@ <h3 class="h6 d-none d-md-block" style="margin-left: 1rem;">Contents</h3>
</div>

</div>
<div class="col-md-8 col-lg-7 col-xl-8 order-md-1 mt-5">
<div class="col-md-8 col-lg-7 offset-lg-1 col-xl-8 mt-5">

{% include intro_template %}

Expand Down
2 changes: 1 addition & 1 deletion scoring/templates/scoring/methodology/2025/_intro.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h2 id="section-summary" class="mb-3">Summary</h2>

<p class="alert alert-primary2025">If you're interested in volunteering with us, to support others to use the Action Scorecards or help us mark the next Action Scorecards, <a href="https://actionnetwork.org/forms/application-scorecards-volunteering-2">register your interest here</a>.</p>

<p>You can see the draft methodology explanation text in <a href="https://drive.google.com/file/d/1nUIiTrP70JP5-xcgz2CRsGZXoAK0tiGW/view?usp=sharing">pdf format here</a>. You can also view the questions and criteria in <a href="https://docs.google.com/spreadsheets/d/1TEjjIFgqtl1r2oaFO7Ku8xdc7m12MQRNgo27c_Zn20M/edit?usp=sharing">spreadsheet format here</a>. This information is identical to this website.</p>
<p>You can see the draft methodology explanation text in <a href="https://drive.google.com/file/d/1Gg-JRCFG6akX1FlPhQjjHqBGvPacxqjv/view?usp=sharing">pdf format here</a>. You can also view the questions and criteria in <a href="https://docs.google.com/spreadsheets/d/1TEjjIFgqtl1r2oaFO7Ku8xdc7m12MQRNgo27c_Zn20M/edit?usp=sharing">spreadsheet format here</a>. This information is identical to this website.</p>


<h2 id="section-methodology-review" class="mt-5 mt-lg-6 mt-xl-7 mb-3">Methodology Review</h2>
Expand Down
2 changes: 1 addition & 1 deletion scoring/templates/scoring/methodology/2025/_toc.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<a class="list-group-item text-decoration-none" href="#section-summary">Summary</a>
<a class="list-group-item text-decoration-none" href="#section-methodology-review">Methodology Review</a>
<a class="list-group-item text-decoration-none" href="#section-question-criteria">Question Criteria</a>
<a class="list-group-item text-decoration-none" href="#section-question-criteria" style="font-style: italic; font-weight: 600; padding-left: 2rem;">See the questions</a>
<a class="list-group-item text-decoration-none fw-bold" href="#section-question-criteria" style="padding-left: 2rem;">See the questions</a>
<a class="list-group-item text-decoration-none" href="#section-question-weighting-within">Question weighting within sections</a>
<a class="list-group-item text-decoration-none" href="#section-section-summaries">Section Summaries and Weightings</a>
<a class="list-group-item text-decoration-none" href="#section-what-we-marked">What We are Marking</a>
Expand Down
Loading