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.

Sign up for GitHub

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

Remove compatibility-mode mixin #3602

Merged
merged 1 commit into from
May 11, 2023
Merged

Remove compatibility-mode mixin #3602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 0 additions & 44 deletions packages/govuk-frontend/src/govuk/components/button/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,17 +101,6 @@ $govuk-button-text-colour: govuk-colour("white") !default;
box-shadow: inset 0 0 0 1px $govuk-focus-colour;
}

// alphagov/govuk_template includes a specific a:link:focus selector
// designed to make unvisited links a slightly darker blue when focussed, so
// we need to override the text colour for that combination of selectors so
// so that unvisited links styled as buttons do not end up with dark blue
// text when focussed.
@include _govuk-compatibility(govuk_template) {
&:link:focus {
color: $govuk-button-text-colour;
}
}

&:focus:not(:active):not(:hover) {
border-color: $govuk-focus-colour;
color: $govuk-focus-text-colour;
Expand Down Expand Up @@ -179,17 +168,6 @@ $govuk-button-text-colour: govuk-colour("white") !default;
color: $govuk-secondary-button-text-colour;
}

// alphagov/govuk_template includes a specific a:link:focus selector
// designed to make unvisited links a slightly darker blue when focussed, so
// we need to override the text colour for that combination of selectors so
// so that unvisited links styled as buttons do not end up with dark blue
// text when focussed.
@include _govuk-compatibility(govuk_template) {
&:link:focus {
color: $govuk-secondary-button-text-colour;
}
}

&:hover {
background-color: $govuk-secondary-button-hover-colour;

Expand All @@ -211,17 +189,6 @@ $govuk-button-text-colour: govuk-colour("white") !default;
color: $govuk-warning-button-text-colour;
}

// alphagov/govuk_template includes a specific a:link:focus selector
// designed to make unvisited links a slightly darker blue when focussed, so
// we need to override the text colour for that combination of selectors so
// so that unvisited links styled as buttons do not end up with dark blue
// text when focussed.
@include _govuk-compatibility(govuk_template) {
&:link:focus {
color: $govuk-warning-button-text-colour;
}
}

&:hover {
background-color: $govuk-warning-button-hover-colour;

Expand All @@ -243,17 +210,6 @@ $govuk-button-text-colour: govuk-colour("white") !default;
color: $govuk-inverse-button-text-colour;
}

// alphagov/govuk_template includes a specific a:link:focus selector
// designed to make unvisited links a slightly darker blue when focussed, so
// we need to override the text colour for that combination of selectors so
// so that unvisited links styled as buttons do not end up with dark blue
// text when focussed.
@include _govuk-compatibility(govuk_template) {
&:link:focus {
color: $govuk-inverse-button-text-colour;
}
}

&:hover {
background-color: $govuk-inverse-button-hover-colour;

Expand Down
9 changes: 0 additions & 9 deletions packages/govuk-frontend/src/govuk/components/footer/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,6 @@
.govuk-footer__link {
@include govuk-link-common;
@include govuk-link-style-text;

// alphagov/govuk_template includes a specific a:link:focus selector
// designed to make unvisited links a slightly darker blue when focussed, so
// we need to override the text colour for that combination of selectors.
@include _govuk-compatibility(govuk_template) {
&:link:focus {
@include govuk-text-colour;
}
}
}

.govuk-footer__section-break {
Expand Down
6 changes: 0 additions & 6 deletions packages/govuk-frontend/src/govuk/components/table/_index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@
border-bottom: 1px solid $govuk-border-colour;
text-align: left;
vertical-align: top;
// GOV.UK Elements sets the font-size and line-height for all headers and cells
// in tables.
@include _govuk-compatibility(govuk_elements) {
font-size: inherit;
line-height: inherit;
}
}

.govuk-table__cell--numeric {
Expand Down
6 changes: 0 additions & 6 deletions packages/govuk-frontend/src/govuk/core/_section-break.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,6 @@
%govuk-section-break {
margin: 0;
border: 0;

// fix double-width section break and forced visible section break
// when combined with styles from alphagov/elements
@include _govuk-compatibility(govuk_elements) {
height: 0;
}
}

.govuk-section-break {
Expand Down
60 changes: 0 additions & 60 deletions packages/govuk-frontend/src/govuk/helpers/_links.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,6 @@
&:focus {
color: $govuk-focus-text-colour;
}

// alphagov/govuk_template includes a specific a:link:focus selector
// designed to make unvisited link s a slightly darker blue when focussed, so
// we need to override the text colour for that combination of selectors so
// so that unvisited links styled as buttons do not end up with dark blue
// text when focussed.
@include _govuk-compatibility(govuk_template) {
&:link:focus {
color: $govuk-focus-text-colour;
}
}
}

/// Error link styles
Expand Down Expand Up @@ -144,17 +133,6 @@
&:focus {
color: $govuk-focus-text-colour;
}

// alphagov/govuk_template includes a specific a:link:focus selector
// designed to make unvisited link s a slightly darker blue when focussed, so
// we need to override the text colour for that combination of selectors so
// so that unvisited links styled as buttons do not end up with dark blue
// text when focussed.
@include _govuk-compatibility(govuk_template) {
&:link:focus {
color: $govuk-focus-text-colour;
}
}
}

/// Success link styles
Expand Down Expand Up @@ -192,17 +170,6 @@
&:focus {
color: $govuk-focus-text-colour;
}

// alphagov/govuk_template includes a specific a:link:focus selector
// designed to make unvisited link s a slightly darker blue when focussed, so
// we need to override the text colour for that combination of selectors so
// so that unvisited links styled as buttons do not end up with dark blue
// text when focussed.
@include _govuk-compatibility(govuk_template) {
&:link:focus {
color: $govuk-focus-text-colour;
}
}
}

/// Muted link styles
Expand Down Expand Up @@ -237,15 +204,6 @@
&:focus {
color: $govuk-focus-text-colour;
}

// alphagov/govuk_template includes a specific a:link:focus selector designed
// to make unvisited links a slightly darker blue when focussed, so we need to
// override the text colour for that combination of selectors.
@include _govuk-compatibility(govuk_template) {
&:link:focus {
@include govuk-text-colour;
}
}
}

/// Text link styles
Expand Down Expand Up @@ -282,15 +240,6 @@
&:focus {
@include govuk-text-colour;
}

// alphagov/govuk_template includes a specific a:link:focus selector designed
// to make unvisited links a slightly darker blue when focussed, so we need to
// override the text colour for that combination of selectors.
@include _govuk-compatibility(govuk_template) {
&:link:focus {
@include govuk-text-colour;
}
}
}

/// Inverse link styles
Expand Down Expand Up @@ -325,15 +274,6 @@
&:focus {
color: $govuk-focus-text-colour;
}

// alphagov/govuk_template includes a specific a:link:focus selector designed
// to make unvisited links a slightly darker blue when focussed, so we need to
// override the text colour for that combination of selectors.
@include _govuk-compatibility(govuk_template) {
&:link:focus {
color: $govuk-focus-text-colour;
}
}
}

/// Default link styles, without a visited state
Expand Down
1 change: 0 additions & 1 deletion packages/govuk-frontend/src/govuk/tools/_all.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
@import "compatibility";
@import "exports";
@import "font-url";
@import "image-url";
Expand Down
50 changes: 0 additions & 50 deletions packages/govuk-frontend/src/govuk/tools/_compatibility.scss
View file
Open in desktop

This file was deleted.

109 changes: 0 additions & 109 deletions packages/govuk-frontend/src/govuk/tools/compatibility.test.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion sassdoc.config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ groups:
settings/warnings: Settings / Warnings
tools: Tools
tools/assets: Tools / Assets
tools/compatibility-mode: Tools / Compatibility Mode
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well done for spotting this – a thorough clean up

tools/unit-conversion: Tools / Unit Conversion
helpers: Helpers
overrides: Overrides
Expand Down