Skip to content

Commit 29968bb

Browse files
lucascumsillezarino
authored andcommitted
[Scorecards] 2027 draft methodology
- Added theme colours for 2027 version - Created `methodology/2027` templates - Added draft methodology to navigation bar - Updated `METHODOLOGY_YEAR` to make 2027 the new default
1 parent 6b83763 commit 29968bb

11 files changed

Lines changed: 811 additions & 10 deletions

File tree

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ services:
3535
- EMAIL_HOST=${EMAIL_HOST:-localhost}
3636
- EMAIL_PORT=${EMAIL_PORT:-25}
3737
- PLAN_YEAR=${PLAN_YEAR:-2023}
38-
- METHODOLOGY_YEAR=${METHODOLOGY_YEAR:-2025}
38+
- METHODOLOGY_YEAR=${METHODOLOGY_YEAR:-2027}
3939

4040
depends_on:
4141
- postgres

proj/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
env = environ.Env(
2121
PLAN_YEAR=(str, "2023"),
22-
METHODOLOGY_YEAR=(str, "2025"),
22+
METHODOLOGY_YEAR=(str, "2027"),
2323
)
2424
environ.Env.read_env(env_file)
2525

scoring/static/scoring/scss/_utils.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $gray-colors: ();
1717
);
1818
}
1919

20-
$all-colors: map-merge-multiple($blues, $indigos, $purples, $pinks, $reds, $oranges, $yellows, $greens, $teals, $cyans, $gray-colors, $primaries, $primaries2025);
20+
$all-colors: map-merge-multiple($blues, $indigos, $purples, $pinks, $reds, $oranges, $yellows, $greens, $teals, $cyans, $gray-colors, $primaries, $primaries2025, $primaries2027);
2121

2222
$utilities: map-merge(
2323
$utilities,

scoring/static/scoring/scss/hero.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
&.year-2025 {
2626
background: linear-gradient(90deg, $primary2025-200 0%, adjust-hue($primary2025-200, -10) 100%);
2727
}
28+
29+
&.year-2027 {
30+
background: linear-gradient(90deg, $primary2027-100 0%, $primary2027-300 100%);
31+
}
2832
}
2933

3034
.year-2023 & {

scoring/static/scoring/scss/variables.scss

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ $info: $color-scorecard-yellow;
4141
$dark: $black;
4242

4343
$primary2025: #d77b12;
44+
$primary2027: #1e7bb0;
4445

4546
$color-total-score:$primary;
4647
$color-category-1:#098995;
@@ -79,6 +80,7 @@ $color-category-9;
7980
$theme-colors: (
8081
"primary": $primary,
8182
"primary2025": $primary2025,
83+
"primary2027": $primary2027,
8284
"secondary": $secondary,
8385
"success": $success,
8486
"info": $info,
@@ -154,6 +156,28 @@ $primaries2025: (
154156
"primary2025-900": $primary2025-900
155157
);
156158

159+
$primary2027-100: lighten($primary2027, 50%);
160+
$primary2027-200: lighten($primary2027, 40%);
161+
$primary2027-300: lighten($primary2027, 30%);
162+
$primary2027-400: lighten($primary2027, 20%);
163+
$primary2027-500: $primary2027;
164+
$primary2027-600: darken($primary2027, 7.5%);
165+
$primary2027-700: darken($primary2027, 15%);
166+
$primary2027-800: darken($primary2027, 20%);
167+
$primary2027-900: darken($primary2027, 25%);
168+
169+
$primaries2027: (
170+
"primary2027-100": $primary2027-100,
171+
"primary2027-200": $primary2027-200,
172+
"primary2027-300": $primary2027-300,
173+
"primary2027-400": $primary2027-400,
174+
"primary2027-500": $primary2027-500,
175+
"primary2027-600": $primary2027-600,
176+
"primary2027-700": $primary2027-700,
177+
"primary2027-800": $primary2027-800,
178+
"primary2027-900": $primary2027-900
179+
);
180+
157181
$min-contrast-ratio: 2.5;
158182

159183
// Options

scoring/templates/scoring/base.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<a class="nav-link link-primary" href="{% url 'scoring:nations_list' %}">Nations</a>
8686
</li>
8787
<li id="methodology-page" class="nav-item">
88-
<a class="nav-link link-primary" href="{% url 'scoring:methodology' %}">{{ plan_year }} Methodology</a>
88+
<a class="nav-link link-primary" href="{% url 'scoring:methodology' %}">2027 Draft Methodology</a>
8989
</li>
9090
<li id="how-to-page" class="nav-item">
9191
<a class="nav-link link-primary" href="{% url 'generic:how-to-use-the-scorecards' %}">How to use the Scorecards</a>
@@ -104,7 +104,7 @@
104104
<a class="nav-link link-primary" href="{% url 'year_scoring:nations_list' plan_year %}">Nations</a>
105105
</li>
106106
<li id="methodology-page" class="nav-item">
107-
<a class="nav-link link-primary" href="{% url 'year_scoring:methodology' plan_year %}">{{ plan_year }} Methodology</a>
107+
<a class="nav-link link-primary" href="{% url 'year_scoring:methodology' plan_year %}">{{ plan_year }} Draft Methodology</a>
108108
</li>
109109
<li id="how-to-page" class="nav-item">
110110
<a class="nav-link link-primary" href="{% url 'generic:how-to-use-the-scorecards' %}">How to use the Scorecards</a>
@@ -121,8 +121,8 @@
121121
</nav>
122122

123123
<nav class="navbar navbar-expand-lg py-2 justify-content-center bg-orange-100 border-top gap-2 gap-md-3">
124-
<span class="text-center">Please help Climate Emergency UK by donating as a Scorecard Sustainer. We rely on donations to remain independent.</span>
125-
<a href="https://validaid.org/fundraiser/161" class="btn btn-sm btn-primary rounded-pill px-3">Donate</a>
124+
<span class="text-center">Our draft methodology for the 2027 Council Climate Action Scorecards is now available! Thank you to everyone who contributed to our Methodology Review.</span>
125+
<a href="{% url 'scoring:methodology' %}" class="btn btn-sm btn-primary rounded-pill px-3">Find out more</a>
126126
</nav>
127127

128128
{% block content %}{% endblock %}

scoring/templates/scoring/methodology.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% load static %}
44
{% block content %}
55
<div class="methodology-2023-content js-dynamic-content ">
6-
<div class="pt-5 pb-6 pt-lg-8 pb-lg-8 hero-section with-version-background year-2025">
6+
<div class="pt-5 pb-6 pt-lg-8 pb-lg-8 hero-section with-version-background year-{{ methodology_year }}">
77
<div class="d-flex flex-column align-items-end align-items-lg-start hero-version-badge position-absolute">
88
<span class="version-year d-block fw-bold lh-1">{{ methodology_year }}</span>
99
<span class="version-name d-block fw-bold lh-1">Action Scorecards</span>

0 commit comments

Comments
 (0)