Skip to content

Commit

Permalink
Merge pull request #217 from localgovdrupal/1.x
Browse files Browse the repository at this point in the history
PR ahead of 1.2.13
  • Loading branch information
markconroy committed Jun 10, 2022
2 parents 3154015 + 3236fe7 commit 22d5a1f
Show file tree
Hide file tree
Showing 29 changed files with 48 additions and 11 deletions.
7 changes: 7 additions & 0 deletions css/base/variables.css
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,13 @@ body {
--section-spacing-vertical-pre-footer: var(--spacing-largest);
--section-spacing-vertical-footer: var(--spacing);
--section-spacing-vertical-post-footer: var(--spacing);
--color-pre-footer-link: var(--color-white);
--color-pre-footer-text: var(--color-white);
--color-footer-link: var(--color-link);
--color-footer-text: var(--color-text);
--color-post-footer-link: var(--color-link);
--color-post-footer-text: var(--color-text);


/* Page Title */
--page-title-border: var(--border);
Expand Down
4 changes: 2 additions & 2 deletions css/components/box-links.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
padding-left: 0;
}

.box-links-listing--boxes .box-links-listing__list-item + .box-links-listing__list-item,
.box-links-listing__list .box-links-listing__list-item + .box-links-listing__list-item {
.box-links-listing--boxes .box-links-listing__list-item,
.box-links-listing__list .box-links-listing__list-item {
margin-bottom: var(--vertical-rhythm-spacing);
}

Expand Down
4 changes: 2 additions & 2 deletions css/components/box-links.ie11.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
margin-bottom: 1.5rem;
}

.box-links-listing--boxes .box-links-listing__list-item + .box-links-listing__list-item,
.box-links-listing__list .box-links-listing__list-item + .box-links-listing__list-item {
.box-links-listing--boxes .box-links-listing__list-item,
.box-links-listing__list .box-links-listing__list-item {
margin-bottom: 1.5rem;
}

Expand Down
14 changes: 12 additions & 2 deletions css/components/footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
.lgd-footer__pre-footer {
padding-top: clamp(1rem, 10vw, var(--section-spacing-vertical-pre-footer));
padding-bottom: clamp(1rem, 10vw, var(--section-spacing-vertical-pre-footer));
color: var(--color-white);
color: var(--color-pre-footer-text);
background-color: var(--color-section-pre-footer-bg);
}

.lgd-footer__pre-footer a {
color: var(--color-white);
color: var(--color-pre-footer-link);
}
.lgd-footer__pre-footer a:focus {
color: var(--color-grey-dark);
Expand All @@ -20,10 +20,20 @@
padding-top: clamp(1rem, 10vw, var(--section-spacing-vertical-footer));
padding-bottom: clamp(1rem, 10vw, var(--section-spacing-vertical-footer));
background-color: var(--color-section-footer-bg);
color: var(--color-footer-text)
}

.lgd-footer__footer a {
color: var(--color-footer-link);
}

.lgd-footer__post-footer {
padding-top: clamp(1rem, 10vw, var(--section-spacing-vertical-post-footer));
padding-bottom: clamp(1rem, 10vw, var(--section-spacing-vertical-post-footer));
background-color: var(--color-section-post-footer-bg);
color: var(--color-post-footer-text);
}

.lgd-footer__post-footer a {
color: var(--color-post-footer-link);
}
2 changes: 1 addition & 1 deletion css/components/wysiwyg-styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
.btn.btn-start {
display: inline-flex;
align-items: center;
padding: var(--btn-start-padding-horizontal) var(--btn-start-padding-horizontal);
padding: var(--btn-start-padding-vertical) var(--btn-start-padding-horizontal);
text-decoration: none;
color: var(--btn-start-color);
border: var(--btn-start-border);
Expand Down
1 change: 1 addition & 0 deletions templates/includes/icons/app-store.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/calendar-days.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/calendar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/circle-dot.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/circle-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/circle-left.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/circle-play.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/circle-right.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/circle-stop.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/circle-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/facebook-f.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/facebook.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/file.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/google-play.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/heart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/instagram-square.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/instagram.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/linkedin-in.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/linkedin.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/map.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions templates/includes/icons/tiktok.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 22d5a1f

Please sign in to comment.