Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
margin-bottom: govuk-spacing(8);
padding: govuk-spacing(4) govuk-spacing(4) govuk-spacing(2);
border: 1px solid $govuk-border-colour;
background-color: govuk-colour("light-grey");
background-color: govuk-colour("black", $variant: "tint-95");
}

.app-nhs-box {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@
}

.app-next-page:hover {
background-color: govuk-colour("light-grey");
background-color: govuk-colour("black", $variant: "tint-95");
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
overflow-x: auto;
border: $govuk-focus-width solid transparent;
outline: 1px solid transparent;
background-color: govuk-colour("light-grey");
background-color: govuk-colour("black", $variant: "tint-95");
@include govuk-responsive-margin(4, "bottom");

&:focus {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.app-feature-flag-banner {
padding: govuk-spacing(4) 0;
border-bottom: 1px solid govuk-colour("mid-grey");
background-color: govuk-colour("light-grey");
border-bottom: 1px solid govuk-colour("black", $variant: "tint-80");
background-color: govuk-colour("black", $variant: "tint-95");
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@include govuk-exports("govuk/component/accordion") {
$govuk-accordion-base-colour: govuk-colour("black");
$govuk-accordion-hover-colour: govuk-colour("light-grey");
$govuk-accordion-hover-colour: govuk-colour("black", $variant: "tint-95");
$govuk-accordion-icon-focus-colour: $govuk-focus-colour;
$govuk-accordion-bottom-border-width: 1px;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ $govuk-inverse-button-text-colour: $govuk-brand-colour !default;
$govuk-button-shadow-colour: govuk-shade($govuk-button-colour, 60%);

// Secondary button variables
$govuk-secondary-button-colour: govuk-colour("light-grey");
$govuk-secondary-button-colour: govuk-colour("black", $variant: "tint-95");
$govuk-secondary-button-text-colour: govuk-colour("black");
$govuk-secondary-button-hover-colour: govuk-shade($govuk-secondary-button-colour, 10%);
$govuk-secondary-button-shadow-colour: govuk-shade($govuk-secondary-button-colour, 40%);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
$file-upload-border-width: 2px;
$component-padding: govuk-spacing(1);
$empty-button-background-colour: govuk-colour("white");
$empty-pseudo-button-background-colour: govuk-colour("light-grey");
$empty-status-background-colour: govuk-tint(govuk-colour("blue"), 70%);
$empty-pseudo-button-background-colour: govuk-colour("black", $variant: "tint-95");

.govuk-file-upload {
@include govuk-font($size: 19);
Expand Down Expand Up @@ -99,8 +99,8 @@
width: 100%;
// align the padding to be same as notification banner and error summary accounting for the thicker borders
padding: (govuk-spacing(3) + $govuk-border-width - $file-upload-border-width);
border: $file-upload-border-width govuk-colour("mid-grey") solid;
background-color: govuk-colour("light-grey");
border: $file-upload-border-width govuk-colour("black", $variant: "tint-80") solid;
background-color: govuk-colour("black", $variant: "tint-95");
cursor: pointer;

@media #{govuk-from-breakpoint(tablet)} {
Expand Down Expand Up @@ -145,7 +145,7 @@
&:hover .govuk-file-upload-button__pseudo-button {
border-color: $govuk-focus-colour;
outline: 3px solid transparent;
background-color: govuk-colour("light-grey");
background-color: govuk-colour("black", $variant: "tint-95");
box-shadow: inset 0 0 0 1px $govuk-focus-colour;
}
}
Expand All @@ -167,7 +167,7 @@
&:hover,
&:focus,
&:active {
background-color: govuk-colour("light-grey");
background-color: govuk-colour("black", $variant: "tint-95");

.govuk-file-upload-button__status {
background-color: govuk-tint(govuk-colour("blue"), 80%);
Expand All @@ -186,7 +186,7 @@
}

&.govuk-file-upload-button--empty {
background-color: govuk-colour("light-grey");
background-color: govuk-colour("black", $variant: "tint-95");
}

&.govuk-file-upload-button--empty:not(:disabled) .govuk-file-upload-button__status,
Expand All @@ -195,7 +195,7 @@
}

.govuk-file-upload-button__pseudo-button {
background-color: govuk-shade(govuk-colour("light-grey"), 10%);
background-color: govuk-shade(govuk-colour("black", $variant: "tint-95"), 10%);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
height: govuk-px-to-rem(40px);
padding: govuk-spacing(1);
border: $govuk-border-width-form-element solid $govuk-input-border-colour;
background-color: govuk-colour("light-grey");
background-color: govuk-colour("black", $variant: "tint-95");
text-align: center;
white-space: nowrap;
// Emphasise non-editable status of prefixes and suffixes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
float: left; // Float is ignored if flex is active for prev/next links

&:hover {
background-color: govuk-colour("light-grey");
background-color: govuk-colour("black", $variant: "tint-95");
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@include govuk-exports("govuk/component/service-navigation") {
$govuk-service-navigation-active-link-border-width: govuk-spacing(1);
$govuk-service-navigation-background: govuk-colour("light-grey");
$govuk-service-navigation-background: govuk-colour("black", $variant: "tint-95");
$govuk-service-navigation-border-colour: $govuk-border-colour;

// We make the link colour a little darker than normal here so that it has
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
// Ensures the card header appears separate to the summary list in forced
// colours mode
border-bottom: 1px solid transparent;
background-color: govuk-colour("light-grey");
background-color: govuk-colour("black", $variant: "tint-95");

@media #{govuk-from-breakpoint(tablet)} {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
padding: govuk-spacing(2) govuk-spacing(4);

float: left;
background-color: govuk-colour("light-grey");
background-color: govuk-colour("black", $variant: "tint-95");
text-align: center;

&::before {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@import "../tag/index";

@include govuk-exports("govuk/component/task-list") {
$govuk-task-list-hover-colour: govuk-colour("light-grey");
$govuk-task-list-hover-colour: govuk-colour("black", $variant: "tint-95");

.govuk-task-list {
@include govuk-font($size: 19);
Expand Down
24 changes: 19 additions & 5 deletions packages/govuk-frontend/src/govuk/helpers/_colour.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/// @throw if `$colour` is not a colour from the colour palette
/// @access public

@function govuk-colour($colour, $legacy: false) {
@function govuk-colour($colour, $legacy: false, $variant: primary) {
// Output a warning if $legacy is set to anything.
@if $legacy and _should-warn("legacy-colour-param") {
@warn _warning-text("legacy-colour-param", "The `$legacy` parameter of " +
Expand All @@ -32,11 +32,25 @@
$colour: quote("#{$colour}");
}

@if not map-has-key($govuk-colours, $colour) {
@error "Unknown colour `#{$colour}`";
}
@if map-has-key($govuk-brand-colours, $colour) {
$located-colour-palette: map-get($govuk-brand-colours, $colour);

@if type-of($located-colour-palette) == "color" {
@return $located-colour-palette;
} @else {
@if not map-has-key($located-colour-palette, $variant) {
@error "Unknown colour variant `#{$variant}`";
}

@return map-get($govuk-colours, $colour);
@return map-get($located-colour-palette, $variant);
}
} @else {
@if not map-has-key($govuk-colours, $colour) {
@error "Unknown colour `#{$colour}`";
}

@return map-get($govuk-colours, $colour);
}
}

/// Get the colour for a government organisation
Expand Down
4 changes: 2 additions & 2 deletions packages/govuk-frontend/src/govuk/helpers/colour.unit.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('@function govuk-colour', () => {
await expect(compileSassString(sass, sassConfig)).resolves.toMatchObject({
css: outdent`
.foo {
color: #ff0000;
color: #ca3535;
}
`
})
Expand All @@ -57,7 +57,7 @@ describe('@function govuk-colour', () => {
await expect(compileSassString(sass, sassConfig)).resolves.toMatchObject({
css: outdent`
.foo {
color: #ff0000;
color: #ca3535;
}
`
})
Expand Down
18 changes: 9 additions & 9 deletions packages/govuk-frontend/src/govuk/settings/_colours-applied.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ $govuk-text-colour: govuk-colour("black") !default;
/// version. Use `$govuk-template-background-colour` if you want to change the background of
/// the `<html>` element and background colour of elements that need to match for visual
/// continuity.
$govuk-canvas-background-colour: govuk-colour("light-grey") !default;
$govuk-canvas-background-colour: govuk-colour("black", $variant: "tint-95") !default;

// Output a deprecation warning if $govuk-canvas-background-colour is being overridden
// Remove in next major version.
@if $govuk-canvas-background-colour != govuk-colour("light-grey") {
@if $govuk-canvas-background-colour != govuk-colour("black", $variant: "tint-95") {
@include _warning(
"$govuk-canvas-background-colour",
"$govuk-canvas-background-colour has been deprecated and will be removed in the next major version."
Expand All @@ -52,7 +52,7 @@ $govuk-canvas-background-colour: govuk-colour("light-grey") !default;
/// @type Colour
/// @access public

$govuk-template-background-colour: govuk-colour("light-grey") !default;
$govuk-template-background-colour: govuk-colour("black", $variant: "tint-95") !default;

/// Body background colour
///
Expand All @@ -77,7 +77,7 @@ $govuk-print-text-colour: #000000 !default;
/// @type Colour
/// @access public

$govuk-secondary-text-colour: govuk-colour("dark-grey") !default;
$govuk-secondary-text-colour: govuk-colour("black", $variant: "tint-25") !default;

/// Focus colour
///
Expand Down Expand Up @@ -124,7 +124,7 @@ $govuk-success-colour: govuk-colour("green") !default;
/// @type Colour
/// @access public

$govuk-border-colour: govuk-colour("mid-grey") !default;
$govuk-border-colour: govuk-colour("black", $variant: "tint-80") !default;

/// Input border colour
///
Expand All @@ -142,7 +142,7 @@ $govuk-input-border-colour: govuk-colour("black") !default;
/// @type Colour
/// @access public

$govuk-hover-colour: govuk-colour("mid-grey") !default;
$govuk-hover-colour: govuk-colour("black", $variant: "tint-80") !default;

// =============================================================================
// Links
Expand All @@ -167,7 +167,7 @@ $govuk-link-visited-colour: govuk-colour("purple") !default;
/// @type Colour
/// @access public

$govuk-link-hover-colour: govuk-colour("dark-blue") !default;
$govuk-link-hover-colour: govuk-colour("blue", $variant: "shade-50") !default;

/// Active link colour
///
Expand All @@ -184,10 +184,10 @@ $govuk-link-active-colour: govuk-colour("black") !default;
///
/// @type Colour
/// @access private
$_govuk-rebrand-template-background-colour: govuk-tint($govuk-brand-colour, 95%);
$_govuk-rebrand-template-background-colour: govuk-colour("blue", $variant: "tint-95");

/// Border colour for areas on a light-blue background
///
/// @type Colour
/// @access private
$_govuk-rebrand-border-colour-on-blue-tint-95: govuk-tint($govuk-brand-colour, 50%);
$_govuk-rebrand-border-colour-on-blue-tint-95: govuk-colour("blue", $variant: "tint-50");
Loading