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

Jump to bottom

Update to govuk-frontend 3.7.0 #75

Merged
merged 2 commits into from
Jun 30, 2020
Merged

Update to govuk-frontend 3.7.0 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd60a9d
Update to govuk-frontend 3.7.0
alex-ju Jun 19, 2020
4c6e533
Update dist
alex-ju Jun 19, 2020
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
63 changes: 45 additions & 18 deletions dist/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,12 @@
.govuk-list--number > li {
margin-bottom: 5px; } }

.govuk-list--spaced > li {
Copy link

Choose a reason for hiding this comment

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

Could you add the command used here? (Or perhaps it should go in the README.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

By running npm run build which is also triggered before the test suite is run.

margin-bottom: 10px; }
@media (min-width: 40.0625em) {
.govuk-list--spaced > li {
margin-bottom: 15px; } }

.govuk-template {
background-color: #f3f2f1;
-webkit-text-size-adjust: 100%;
Expand Down Expand Up @@ -1218,27 +1224,36 @@
color: #000000; } }

.govuk-back-link[href] {
border-bottom: 1px solid #0b0c0c;
text-decoration: none; }
text-decoration: underline; }
.govuk-back-link[href]:focus {
border-bottom-color: transparent; }
text-decoration: none; }
.govuk-back-link[href]:focus:before {
border-color: #0b0c0c; }

.govuk-back-link:before {
display: block;
width: 0;
height: 0;
border-style: solid;
border-color: transparent;
-webkit-clip-path: polygon(0% 50%, 100% 100%, 100% 0%);
clip-path: polygon(0% 50%, 100% 100%, 100% 0%);
border-width: 5px 6px 5px 0;
border-right-color: inherit;
content: "";
display: block;
position: absolute;
top: 0;
bottom: 0;
left: 0;
margin: auto; }
left: 3px;
width: 7px;
height: 7px;
margin: auto 0;
-webkit-transform: rotate(225deg);
-ms-transform: rotate(225deg);
transform: rotate(225deg);
border: solid;
border-width: 1px 1px 0 0;
border-color: #626a6e; }

.govuk-back-link:after {
content: "";
position: absolute;
top: -14px;
right: 0;
bottom: -14px;
left: 0; }

.govuk-visually-hidden {
position: absolute !important;
Expand Down Expand Up @@ -1359,6 +1374,19 @@
.govuk-breadcrumbs__link:link, .govuk-breadcrumbs__link:visited, .govuk-breadcrumbs__link:hover, .govuk-breadcrumbs__link:active, .govuk-breadcrumbs__link:focus {
color: #000000; } }

@media (max-width: 40.0525em) {
.govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item {
display: none; }
.govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item:first-child, .govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item:last-child {
display: inline-block; }
.govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item:before {
top: 6px;
margin: 0; }
.govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list {
display: -webkit-box;
display: -ms-flexbox;
display: flex; } }

.miller-columns-selected {
margin-bottom: 20px;
display: block; }
Expand Down Expand Up @@ -1624,10 +1652,9 @@
padding-top: 0;
padding-right: 0;
padding-bottom: 0;
border-top: 0;
border-right: 0;
border-left: 0;
background: transparent; }
border: 0;
background: transparent;
text-decoration: underline; }
@media (min-width: 40.0625em) {
.miller-columns .govuk-back-link {
display: none; } }
57 changes: 39 additions & 18 deletions dist/miller-columns.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -879,27 +879,36 @@
color: #000000; } }

.govuk-back-link[href] {
border-bottom: 1px solid #0b0c0c;
text-decoration: none; }
text-decoration: underline; }
.govuk-back-link[href]:focus {
border-bottom-color: transparent; }
text-decoration: none; }
.govuk-back-link[href]:focus:before {
border-color: #0b0c0c; }

.govuk-back-link:before {
display: block;
width: 0;
height: 0;
border-style: solid;
border-color: transparent;
-webkit-clip-path: polygon(0% 50%, 100% 100%, 100% 0%);
clip-path: polygon(0% 50%, 100% 100%, 100% 0%);
border-width: 5px 6px 5px 0;
border-right-color: inherit;
content: "";
display: block;
position: absolute;
top: 0;
bottom: 0;
left: 0;
margin: auto; }
left: 3px;
width: 7px;
height: 7px;
margin: auto 0;
-webkit-transform: rotate(225deg);
-ms-transform: rotate(225deg);
transform: rotate(225deg);
border: solid;
border-width: 1px 1px 0 0;
border-color: #626a6e; }

.govuk-back-link:after {
content: "";
position: absolute;
top: -14px;
right: 0;
bottom: -14px;
left: 0; }

.govuk-visually-hidden {
position: absolute !important;
Expand Down Expand Up @@ -1020,6 +1029,19 @@
.govuk-breadcrumbs__link:link, .govuk-breadcrumbs__link:visited, .govuk-breadcrumbs__link:hover, .govuk-breadcrumbs__link:active, .govuk-breadcrumbs__link:focus {
color: #000000; } }

@media (max-width: 40.0525em) {
.govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item {
display: none; }
.govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item:first-child, .govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item:last-child {
display: inline-block; }
.govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list-item:before {
top: 6px;
margin: 0; }
.govuk-breadcrumbs--collapse-on-mobile .govuk-breadcrumbs__list {
display: -webkit-box;
display: -ms-flexbox;
display: flex; } }

.miller-columns-selected {
margin-bottom: 20px;
display: block; }
Expand Down Expand Up @@ -1285,10 +1307,9 @@
padding-top: 0;
padding-right: 0;
padding-bottom: 0;
border-top: 0;
border-right: 0;
border-left: 0;
background: transparent; }
border: 0;
background: transparent;
text-decoration: underline; }
@media (min-width: 40.0625em) {
.miller-columns .govuk-back-link {
display: none; } }
5 changes: 2 additions & 3 deletions miller-columns.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,9 @@ $mc-active-item-background: govuk-colour("blue");
padding-top: 0;
padding-right: 0;
padding-bottom: 0;
border-top: 0;
border-right: 0;
border-left: 0;
border: 0;
background: transparent;
text-decoration: underline;
Copy link

Choose a reason for hiding this comment

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

Could you add some explanation for these changes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, I've now added a description to this commit:

Updating to govuk-frontend requires updating the govuk-back-link class we apply to our button element in a similar way govuk-frontend applies it to an anchor element. More on this change on the original PR in govuk-frontend alphagov/govuk-frontend#1753 – more specifically https://github.com/alphagov/govuk-frontend/pull/1753/files#diff-4c6ef8a7bcb3d85bc2f7e7a0cd1fd50cR33


@include govuk-media-query($from: tablet) {
display: none;
Expand Down
24 changes: 12 additions & 12 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"eslint": "^7.2.0",
"eslint-plugin-github": "1.6.0",
"flow-bin": "^0.127.0",
"govuk-frontend": "^3.6.0",
"govuk-frontend": "^3.7.0",
"karma": "^5.0.1",
"karma-chai": "^0.1.0",
"karma-chrome-launcher": "^3.1.0",
Expand Down