This repository has been archived by the owner on Mar 6, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 9
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 #542 from alphagov/revert-and-fix-upgrade-to-govuk…
…-frontend-v3 Revert and fix upgrade to govuk frontend v3
- Loading branch information
Showing
43 changed files
with
489 additions
and
1,495 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
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,23 +1,10 @@ | ||
| .full-width { | ||
| // We're overriding static, we have to use IDs. | ||
| // scss-lint:disable IdSelector | ||
| #wrapper { | ||
| margin: 0; | ||
| width: auto; | ||
| max-width: 100%; | ||
| } | ||
|
|
||
| #global-header-bar { | ||
| .app-full-width { | ||
| #global-header-bar { // scss-lint:disable IdSelector | ||
| display: none; | ||
| } | ||
| } | ||
|
|
||
| .govuk-beta-label { | ||
| border-bottom: none; | ||
| } | ||
|
|
||
| .full-page-width-wrapper, | ||
| #wrapper .report-a-problem-toggle-wrapper, | ||
| #wrapper .report-a-problem-container { | ||
| @extend %site-width-container; | ||
| } | ||
| .app-\!-full-width-override { | ||
| margin: auto !important; | ||
| max-width: none !important; | ||
| } |
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
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,33 +1,3 @@ | ||
| .change-history { | ||
| margin-top: 30px; | ||
| width: 66%; | ||
|
|
||
| &__latest-change { | ||
|
|
||
| dt { | ||
| @include core-19; | ||
| } | ||
|
|
||
| dd { | ||
| @include bold-24; | ||
| margin-bottom: 10px; | ||
| } | ||
| } | ||
|
|
||
| &__summary { | ||
| @include core-16; | ||
| color: $grey-1; | ||
| } | ||
|
|
||
| &__past { | ||
|
|
||
| time { | ||
| @include bold-19; | ||
| } | ||
|
|
||
| li { | ||
| list-style: none; | ||
| margin-bottom: 10px; | ||
| } | ||
| } | ||
| .app-change-history__change-note { | ||
| color: $govuk-secondary-text-colour; | ||
| } |
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,37 +1,19 @@ | ||
| .collection { | ||
| border-bottom: 1px solid $border-colour; | ||
|
|
||
| padding-bottom: $gutter-half; | ||
| margin-bottom: $gutter-half; | ||
| .app-collection { | ||
| border-bottom: 1px solid $govuk-border-colour; | ||
| margin-bottom: govuk-spacing(3); | ||
| padding-bottom: govuk-spacing(3); | ||
|
|
||
| @include media(tablet) { | ||
| padding-bottom: $gutter; | ||
| margin-bottom: $gutter; | ||
| margin-bottom: govuk-spacing(9); | ||
| padding-bottom: govuk-spacing(6); | ||
| } | ||
|
|
||
| &:last-child { | ||
| margin-bottom: 0; | ||
| border-bottom: none; | ||
| } | ||
|
|
||
| &__title { | ||
| @include bold-36; | ||
| margin-bottom: 5px; | ||
| margin-top: 1.25em; | ||
| margin-bottom: 0; | ||
| } | ||
|
|
||
| &__description { | ||
| @include core-24; | ||
| color: $secondary-text-colour; | ||
| margin-top: 0; | ||
| } | ||
|
|
||
| &__link { | ||
| @include bold-24; | ||
| margin: 0.8333333333em 0; | ||
| } | ||
|
|
||
| &__link-description { | ||
| @include core-19; | ||
| color: $govuk-secondary-text-colour; | ||
| } | ||
| } |
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,7 +1,6 @@ | ||
| .community-contact { | ||
| @include gutter-vertical-margins; | ||
| .app-community-contact { | ||
| @include media(tablet) { | ||
| text-align: right; | ||
| padding-top: $gutter-half; | ||
| padding-top: govuk-spacing(8); | ||
| } | ||
| } |
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,57 +1,25 @@ | ||
| .hero { | ||
| background-color: $govuk-blue; | ||
| color: $white; | ||
|
|
||
| margin-bottom: $gutter-half; | ||
| .app-hero { | ||
| background-color: $govuk-brand-colour; | ||
| color: govuk-colour("white"); | ||
| margin-bottom: govuk-spacing(3); | ||
| position: relative; | ||
| top: -1px; | ||
|
|
||
| @include media(tablet) { | ||
| margin-bottom: $gutter; | ||
| margin-bottom: govuk-spacing(6); | ||
| } | ||
|
|
||
| a:link, | ||
| a:visited { | ||
| font-weight: bold; | ||
| color: $white; | ||
| } | ||
|
|
||
| a:hover, | ||
| a:active { | ||
| color: $light-blue-25; | ||
| @include govuk-typography-weight-bold; | ||
| } | ||
| } | ||
|
|
||
| &__content { | ||
| $border-top-width: 10px; | ||
|
|
||
| @extend %site-width-container; | ||
|
|
||
| padding: ($gutter-half + $border-top-width) 0 $gutter-half; | ||
|
|
||
| @include media(tablet) { | ||
| padding: ($gutter + $border-top-width) 0 $gutter; | ||
| } | ||
| } | ||
|
|
||
| &__title { | ||
| @include core-48; | ||
| margin-bottom: $gutter; | ||
| font-weight: bold; | ||
| } | ||
|
|
||
| &__description { | ||
| @include core-24; | ||
| } | ||
|
|
||
| &__feedback-link { | ||
| @include core-16; | ||
| line-height: 1.25; | ||
| margin-top: $gutter; | ||
|
|
||
| @include media(tablet) { | ||
| margin-top: 0; | ||
| } | ||
| } | ||
| .app-hero-lead { | ||
| line-height: 1.35; | ||
| } | ||
|
|
||
| &__search { | ||
| margin-bottom: $gutter-half; | ||
| } | ||
| .app-hero__heading--inverse, | ||
| .app-hero__body--inverse { | ||
| color: govuk-colour("white"); | ||
| } |
Oops, something went wrong.