-
Notifications
You must be signed in to change notification settings - Fork 332
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3407 from alphagov/update-organisation-colours
Update organisation colours
- Loading branch information
Showing
8 changed files
with
716 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,12 @@ | ||
| $govuk-show-breakpoints: true; | ||
| $govuk-new-typography-scale: true; | ||
| $govuk-new-organisation-colours: true; | ||
|
|
||
| $govuk-suppressed-warnings: ("organisation-colours"); | ||
|
|
||
| @import "govuk/all"; | ||
| @import "partials/app"; | ||
| @import "partials/code"; | ||
| @import "partials/banner"; | ||
| @import "partials/organisation-swatch"; | ||
| @import "partials/prose"; |
18 changes: 18 additions & 0 deletions
18
packages/govuk-frontend-review/src/stylesheets/partials/_organisation-swatch.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| .app-organisation-swatch { | ||
| padding-left: govuk-spacing(3); | ||
| border-left: 6px solid #777777; | ||
|
|
||
| h2 { | ||
| color: #777777; | ||
| } | ||
| } | ||
|
|
||
| @each $key, $map in $govuk-colours-organisations { | ||
| .app-organisation-swatch--#{$key} { | ||
| border-left-color: govuk-organisation-colour($key, $contrast-safe: false); | ||
|
|
||
| h2 { | ||
| color: govuk-organisation-colour($key); | ||
| } | ||
| } | ||
| } |
210 changes: 210 additions & 0 deletions
210
packages/govuk-frontend-review/src/views/examples/organisation-colours/index.njk
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,210 @@ | ||
| {% from "govuk/components/back-link/macro.njk" import govukBackLink %} | ||
|
|
||
| {% extends "layouts/examples.njk" %} | ||
|
|
||
| {% block beforeContent %} | ||
| {{ govukBackLink({ | ||
| href: "/" | ||
| }) }} | ||
| {% endblock %} | ||
|
|
||
| {% set organisations = { | ||
| "attorney-generals-office": { | ||
| "name": "Attorney General's Office", | ||
| "start": 1315 | ||
| }, | ||
| "cabinet-office": { | ||
| "name": "Cabinet Office", | ||
| "start": 1916 | ||
| }, | ||
| "civil-service": { | ||
| "name": "Civil Service" | ||
| }, | ||
| "department-for-business-trade": { | ||
| "name": "Department for Business and Trade", | ||
| "start": 2023 | ||
| }, | ||
| "department-for-business-energy-industrial-strategy": { | ||
| "name": "Department for Business, Energy and Industrial Strategy", | ||
| "start": 2016, | ||
| "end": 2023 | ||
| }, | ||
| "department-for-business-innovation-skills": { | ||
| "name": "Department for Business, Innovation and Skills", | ||
| "start": 2009, | ||
| "end": 2016 | ||
| }, | ||
| "department-for-communities-local-government": { | ||
| "name": "Department for Communities and Local Government", | ||
| "start": 2006, | ||
| "end": 2018 | ||
| }, | ||
| "department-for-culture-media-sport": { | ||
| "name": "Department for Culture, Media and Sport", | ||
| "start": 1997 | ||
| }, | ||
| "department-for-digital-culture-media-sport": { | ||
| "name": "Department for Digital, Culture, Media and Sport", | ||
| "start": 2017, | ||
| "end": 2023 | ||
| }, | ||
| "department-for-education": { | ||
| "name": "Department for Education", | ||
| "start": 2010 | ||
| }, | ||
| "department-for-energy-security-net-zero": { | ||
| "name": "Department for Energy Security and Net Zero", | ||
| "start": 2023 | ||
| }, | ||
| "department-for-environment-food-rural-affairs": { | ||
| "name": "Department for Environment, Food and Rural Affairs", | ||
| "start": 2001 | ||
| }, | ||
| "department-for-exiting-the-european-union": { | ||
| "name": "Department for Exiting the European Union", | ||
| "start": 2016, | ||
| "end": 2020 | ||
| }, | ||
| "department-for-international-development": { | ||
| "name": "Department for International Development", | ||
| "start": 1997, | ||
| "end": 2020 | ||
| }, | ||
| "department-for-international-trade": { | ||
| "name": "Department for International Trade", | ||
| "start": 2016, | ||
| "end": 2023 | ||
| }, | ||
| "department-for-levelling-up-housing-communities": { | ||
| "name": "Department for Levelling Up, Housing and Communities", | ||
| "start": 2021, | ||
| "end": 2024 | ||
| }, | ||
| "department-for-science-innovation-technology": { | ||
| "name": "Department for Science, Innovation and Technology", | ||
| "start": 2023 | ||
| }, | ||
| "department-for-transport": { | ||
| "name": "Department for Transport", | ||
| "start": 2002 | ||
| }, | ||
| "department-for-work-pensions": { | ||
| "name": "Department for Work and Pensions", | ||
| "start": 2001 | ||
| }, | ||
| "department-of-energy-climate-change": { | ||
| "name": "Department of Energy and Climate Change", | ||
| "start": 2008, | ||
| "end": 2016 | ||
| }, | ||
| "department-of-health": { | ||
| "name": "Department of Health", | ||
| "start": 1988, | ||
| "end": 2018 | ||
| }, | ||
| "department-of-health-social-care": { | ||
| "name": "Department of Health and Social Care", | ||
| "start": 2018 | ||
| }, | ||
| "foreign-commonwealth-office": { | ||
| "name": "Foreign and Commonwealth Office", | ||
| "start": 1968, | ||
| "end": 2020 | ||
| }, | ||
| "foreign-commonwealth-development-office": { | ||
| "name": "Foreign, Commonwealth and Development Office", | ||
| "start": 2020 | ||
| }, | ||
| "hm-government": { | ||
| "name": "HM Government", | ||
| "start": 1707 | ||
| }, | ||
| "hm-revenue-customs": { | ||
| "name": "HM Revenue and Customs", | ||
| "start": 2005 | ||
| }, | ||
| "hm-treasury": { | ||
| "name": "HM Treasury" | ||
| }, | ||
| "home-office": { | ||
| "name": "Home Office", | ||
| "start": 1782 | ||
| }, | ||
| "ministry-of-defence": { | ||
| "name": "Ministry of Defence", | ||
| "start": 1964 | ||
| }, | ||
| "ministry-of-housing-communities-local-government": { | ||
| "name": "Ministry of Housing, Communities and Local Government", | ||
| "start": 2018 | ||
| }, | ||
| "ministry-of-justice": { | ||
| "name": "Ministry of Justice", | ||
| "start": 2007 | ||
| }, | ||
| "northern-ireland-office": { | ||
| "name": "Northern Ireland Office", | ||
| "start": 1972 | ||
| }, | ||
| "office-of-the-advocate-general-for-scotland": { | ||
| "name": "Office of the Advocate General for Scotland", | ||
| "start": 1999 | ||
| }, | ||
| "office-of-the-leader-of-the-house-of-commons": { | ||
| "name": "Office of the Leader of the House of Commons", | ||
| "start": 1721 | ||
| }, | ||
| "office-of-the-leader-of-the-house-of-lords": { | ||
| "name": "Office of the Leader of the House of Lords", | ||
| "start": 1721 | ||
| }, | ||
| "office-of-the-secretary-of-state-for-scotland": { | ||
| "name": "Office of the Secretary of State for Scotland", | ||
| "start": 2018 | ||
| }, | ||
| "office-of-the-secretary-of-state-for-wales": { | ||
| "name": "Office of the Secretary of State for Wales", | ||
| "start": 2018 | ||
| }, | ||
| "prime-ministers-office-10-downing-street": { | ||
| "name": "Prime Minister's Office, 10 Downing Street", | ||
| "start": 2022 | ||
| }, | ||
| "scotland-office": { | ||
| "name": "Scotland Office", | ||
| "start": 1999, | ||
| "end": 2018 | ||
| }, | ||
| "uk-export-finance": { | ||
| "name": "UK Export Finance", | ||
| "start": 1919 | ||
| }, | ||
| "uk-trade-investment": { | ||
| "name": "UK Trade and Investment", | ||
| "start": 2003, | ||
| "end": 2016 | ||
| }, | ||
| "wales-office": { | ||
| "name": "Wales Office", | ||
| "start": 1999, | ||
| "end": 2018 | ||
| } | ||
| } %} | ||
|
|
||
| {% block content %} | ||
| <div class="govuk-grid-row"> | ||
| <div class="govuk-grid-column-two-thirds"> | ||
| <h1 class="govuk-heading-xl"> | ||
| Organisation colours | ||
| </h1> | ||
| <p class="govuk-body">Only includes organisations and departments that existed from 2010 onwards.</p> | ||
|
|
||
| {%- for key, data in organisations %} | ||
| <div class="app-organisation-swatch app-organisation-swatch--{{ key }}"> | ||
| <h2 class="govuk-heading-s">{{ data.name }}</h2> | ||
| <p class="govuk-body">{{ data.start | default("????") }}–{{ data.end }}</p> | ||
| </div> | ||
| {%- endfor %} | ||
| </div> | ||
| </div> | ||
| {% endblock %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.