Skip to content

Commit

Permalink
Run prettier --write
Browse files Browse the repository at this point in the history
  • Loading branch information
colinrotherham committed Jun 14, 2023
1 parent 8037afe commit fbf8dba
Show file tree
Hide file tree
Showing 39 changed files with 104 additions and 108 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,15 @@
padding: govuk-spacing(6) govuk-spacing(5);
border-left: solid #fff500;
border-width: 0 0 0 10px;
border-image: repeating-linear-gradient(25deg, transparent 0, #fff500 1px, #fff500 10px, transparent 11px, transparent 20px) 25;
border-image: repeating-linear-gradient(
25deg,
transparent 0,
#fff500 1px,
#fff500 10px,
transparent 11px,
transparent 20px
)
25;
color: govuk-colour("white");
background-color: #272828;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
cursor: pointer;
-webkit-appearance: none;

@include govuk-media-query ($from: tablet) {
@include govuk-media-query($from: tablet) {
margin-bottom: 14px;
}

Expand Down Expand Up @@ -200,7 +200,7 @@
cursor: pointer;
-webkit-appearance: none;

@include govuk-media-query ($from: tablet) {
@include govuk-media-query($from: tablet) {
padding-bottom: govuk-spacing(2);
}

Expand Down Expand Up @@ -262,7 +262,7 @@
padding-bottom: govuk-spacing(3);
border-bottom: 0;

@include govuk-media-query ($from: tablet) {
@include govuk-media-query($from: tablet) {
padding-bottom: govuk-spacing(4);
}
}
Expand All @@ -272,7 +272,7 @@
.govuk-accordion__section-button:focus .govuk-accordion__section-toggle-focus {
padding-bottom: 3px;

@include govuk-media-query ($from: desktop) {
@include govuk-media-query($from: desktop) {
padding-bottom: 2px;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@
border-color: $chevron-border-colour;

@supports (border-width: unquote("max(0px)")) {
border-width: unquote("max(#{$chevron-border-min-width}, #{$chevron-border-width}) max(#{$chevron-border-min-width}, #{$chevron-border-width})") 0 0;
border-width: unquote(
"max(#{$chevron-border-min-width}, #{$chevron-border-width}) max(#{$chevron-border-min-width}, #{$chevron-border-width})"
)
0 0;

// Ensure that the chevron never gets smaller than 16px
font-size: unquote("max(#{$font-size * 1px}, 1em)");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
}

.govuk-breadcrumbs__list-item {

display: inline-block;
position: relative;

Expand Down Expand Up @@ -73,7 +72,10 @@
border-color: $chevron-border-colour;

@supports (border-width: unquote("max(0px)")) {
border-width: unquote("max(#{$chevron-border-min-width}, #{$chevron-border-width}) max(#{$chevron-border-min-width}, #{$chevron-border-width})") 0 0;
border-width: unquote(
"max(#{$chevron-border-min-width}, #{$chevron-border-width}) max(#{$chevron-border-min-width}, #{$chevron-border-width})"
)
0 0;

// Ensure that the chevron never gets smaller than 16px
font-size: unquote("max(#{$font-size * 1px}, 1em)");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ $govuk-button-text-colour: govuk-colour("white") !default;
margin-right: 0;
margin-left: 0;
@include govuk-responsive-margin(6, "bottom", $adjustment: $button-shadow-size); // s2
padding: (govuk-spacing(2) - $govuk-border-width-form-element) govuk-spacing(2) (govuk-spacing(2) - $govuk-border-width-form-element - ($button-shadow-size / 2)); // s1
padding: (govuk-spacing(2) - $govuk-border-width-form-element) govuk-spacing(2)
(govuk-spacing(2) - $govuk-border-width-form-element - ($button-shadow-size / 2)); // s1
border: $govuk-border-width-form-element solid transparent;
border-radius: 0;
color: $govuk-button-text-colour;
Expand Down Expand Up @@ -143,7 +144,7 @@ $govuk-button-text-colour: govuk-colour("white") !default;
}

.govuk-button[disabled] {
opacity: (.5);
opacity: (0.5);

&:hover {
background-color: $govuk-button-colour;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
@import "../label/index";

@include govuk-exports("govuk/component/checkboxes") {

$govuk-touch-target-size: 44px;
$govuk-checkboxes-size: 40px;
$govuk-small-checkboxes-size: 24px;
Expand Down Expand Up @@ -134,7 +133,7 @@

.govuk-checkboxes__input:disabled + .govuk-checkboxes__label,
.govuk-checkboxes__input:disabled ~ .govuk-hint {
opacity: .5;
opacity: 0.5;
}

// =========================================================
Expand Down Expand Up @@ -184,7 +183,6 @@
// =========================================================

.govuk-checkboxes--small {

$input-offset: ($govuk-touch-target-size - $govuk-small-checkboxes-size) / 2;
$label-offset: $govuk-touch-target-size - $input-offset;

Expand Down Expand Up @@ -282,8 +280,8 @@
// We use two box shadows, one that restores the original focus state [1]
// and another that then applies the hover state [2].
.govuk-checkboxes__item:hover .govuk-checkboxes__input:focus + .govuk-checkboxes__label::before {
box-shadow:
0 0 0 $govuk-focus-width $govuk-focus-colour, // 1
box-shadow: 0 0 0 $govuk-focus-width $govuk-focus-colour,
// 1
0 0 0 $govuk-hover-width $govuk-hover-colour; // 2
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@include govuk-exports("govuk/component/cookie-banner") {

// This needs to be kept in sync with the header component's styles
$border-bottom-width: govuk-spacing(2);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
// https://bugzilla.mozilla.org/show_bug.cgi?id=504622
@supports not (caret-color: auto) {
.govuk-fieldset,
x:-moz-any-link { // stylelint-disable-line selector-type-no-unknown
x:-moz-any-link {
// stylelint-disable-next-line selector-type-no-unknown
display: table-cell;
}
}
Expand All @@ -24,12 +25,12 @@
// 1. IE9-11 & Edge 12-13
// 2. IE8-11
box-sizing: border-box; // 1
display: table; // 2
max-width: 100%; // 1
display: table; // 2
max-width: 100%; // 1
margin-bottom: govuk-spacing(2);
padding: 0;

white-space: normal; // 1
white-space: normal; // 1
}

// Modifiers that make legends look more like their equivalent headings
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
}

&:disabled {
opacity: .5;
opacity: 0.5;
cursor: not-allowed;
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@include govuk-exports("govuk/component/footer") {

$govuk-footer-background: $govuk-canvas-background-colour;
$govuk-footer-border: $govuk-border-colour;
$govuk-footer-text: $govuk-text-colour;
Expand Down Expand Up @@ -50,15 +49,15 @@

.govuk-footer__meta-item--grow {
flex: 1; // Support: Flexbox
@include govuk-media-query ($until: tablet) {
@include govuk-media-query($until: tablet) {
flex-basis: 320px; // Support: Flexbox
}
}

.govuk-footer__licence-logo {
display: inline-block;
margin-right: govuk-spacing(2);
@include govuk-media-query ($until: desktop) {
@include govuk-media-query($until: desktop) {
margin-bottom: govuk-spacing(3);
}
vertical-align: top;
Expand Down Expand Up @@ -106,7 +105,7 @@
margin-bottom: govuk-spacing(6);
padding-bottom: govuk-spacing(4);

@include govuk-media-query ($until: tablet) {
@include govuk-media-query($until: tablet) {
padding-bottom: govuk-spacing(2);
}
border-bottom: 1px solid $govuk-footer-border;
Expand All @@ -131,7 +130,7 @@
column-gap: $govuk-gutter; // Support: Columns
}

@include govuk-media-query ($from: desktop) {
@include govuk-media-query($from: desktop) {
.govuk-footer__list--columns-2 {
column-count: 2; // Support: Columns
}
Expand Down
13 changes: 6 additions & 7 deletions packages/govuk-frontend/src/govuk/components/header/_index.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@include govuk-exports("govuk/component/header") {

$govuk-header-background: govuk-colour("black");
$govuk-header-border-color: $govuk-brand-colour;
$govuk-header-border-width: govuk-spacing(2);
Expand Down Expand Up @@ -148,7 +147,7 @@
@include govuk-responsive-margin(2, "bottom");
padding-right: govuk-spacing(8);

@include govuk-media-query ($from: desktop) {
@include govuk-media-query($from: desktop) {
width: 33.33%;
padding-right: $govuk-gutter-half;
float: left;
Expand All @@ -157,7 +156,7 @@
}

.govuk-header__content {
@include govuk-media-query ($from: desktop) {
@include govuk-media-query($from: desktop) {
width: 66.66%;
padding-left: $govuk-gutter-half;
float: left;
Expand Down Expand Up @@ -198,7 +197,7 @@
@include govuk-shape-arrow($direction: up, $base: 10px, $display: inline-block);
}

@include govuk-media-query ($from: tablet) {
@include govuk-media-query($from: tablet) {
top: govuk-spacing(3);
}

Expand All @@ -213,7 +212,7 @@
}

.govuk-header__navigation {
@include govuk-media-query ($from: desktop) {
@include govuk-media-query($from: desktop) {
margin-bottom: govuk-spacing(2);
}
}
Expand All @@ -230,7 +229,7 @@
}

.govuk-header__navigation--end {
@include govuk-media-query ($from: desktop) {
@include govuk-media-query($from: desktop) {
margin: 0;
padding: govuk-spacing(1) 0;
text-align: right;
Expand All @@ -241,7 +240,7 @@
padding: govuk-spacing(2) 0;
border-bottom: 1px solid $govuk-header-nav-item-border-color;

@include govuk-media-query ($from: desktop) {
@include govuk-media-query($from: desktop) {
display: inline-block;
margin-right: govuk-spacing(3);
padding: govuk-spacing(1) 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@
// This adjustment will not work in browsers that do not support :not().
// Users with these browsers will see the default size margin (5px larger).

.govuk-fieldset__legend:not(.govuk-fieldset__legend--m):not(.govuk-fieldset__legend--l):not(.govuk-fieldset__legend--xl) + .govuk-hint {
.govuk-fieldset__legend:not(.govuk-fieldset__legend--m):not(.govuk-fieldset__legend--l):not(
.govuk-fieldset__legend--xl
)
+ .govuk-hint {
margin-bottom: govuk-spacing(2);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}

&:disabled {
opacity: .5;
opacity: 0.5;
color: inherit;
background-color: transparent;
cursor: not-allowed;
Expand All @@ -58,7 +58,7 @@

.govuk-input--extra-letter-spacing {
@include govuk-font(false, $tabular: true);
letter-spacing: .05em;
letter-spacing: 0.05em;
}

// em measurements are based on the point size of the typeface
Expand Down
12 changes: 5 additions & 7 deletions packages/govuk-frontend/src/govuk/components/radios/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
@import "../label/index";

@include govuk-exports("govuk/component/radios") {

$govuk-touch-target-size: 44px;
$govuk-radios-size: 40px;
$govuk-small-radios-size: 24px;
Expand Down Expand Up @@ -134,15 +133,15 @@

.govuk-radios__input:disabled + .govuk-radios__label,
.govuk-radios__input:disabled ~ .govuk-hint {
opacity: .5;
opacity: 0.5;
}

// =========================================================
// Inline radios
// =========================================================

.govuk-radios--inline {
@include govuk-media-query ($from: tablet) {
@include govuk-media-query($from: tablet) {
@include govuk-clearfix;

.govuk-radios__item {
Expand Down Expand Up @@ -200,7 +199,6 @@
// =========================================================

.govuk-radios--small {

$input-offset: ($govuk-touch-target-size - $govuk-small-radios-size) / 2;
$label-offset: $govuk-touch-target-size - $input-offset;

Expand Down Expand Up @@ -302,9 +300,9 @@
// We use two box shadows, one that restores the original focus state [1]
// and another that then applies the hover state [2].
.govuk-radios__item:hover .govuk-radios__input:focus + .govuk-radios__label::before {
box-shadow:
0 0 0 $govuk-radios-focus-width $govuk-focus-colour, // 1
0 0 0 $govuk-hover-width $govuk-hover-colour; // 2
box-shadow: 0 0 0 $govuk-radios-focus-width $govuk-focus-colour,
// 1
0 0 0 $govuk-hover-width $govuk-hover-colour; // 2
}

// For devices that explicitly don't support hover, don't provide a hover
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}

&:disabled {
opacity: .5;
opacity: 0.5;
color: inherit;
cursor: not-allowed;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@

// JavaScript enabled
.js-enabled {

@include govuk-media-query($from: tablet) {
.govuk-tabs__list {
@include govuk-clearfix;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}

&:disabled {
opacity: .5;
opacity: 0.5;
color: inherit;
background-color: transparent;
cursor: not-allowed;
Expand Down
1 change: 0 additions & 1 deletion packages/govuk-frontend/src/govuk/core/_global-styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
}

@include govuk-exports("govuk/core/global-styles") {

@if $govuk-global-styles == true {
@include govuk-global-styles;
}
Expand Down
1 change: 0 additions & 1 deletion packages/govuk-frontend/src/govuk/core/_links.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@include govuk-exports("govuk/core/links") {

%govuk-link {
@include govuk-link-common;
@include govuk-link-style-default;
Expand Down
Loading

0 comments on commit fbf8dba

Please sign in to comment.