Skip to content

Commit

Permalink
Modifies #196 - Normalize top and bottom space for rows, remove unuse…
Browse files Browse the repository at this point in the history
…d space token values
  • Loading branch information
Kevin Powell committed Feb 10, 2022
1 parent 9a57b3a commit 3022c4c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 68 deletions.
21 changes: 8 additions & 13 deletions docs/styles/escom.css
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ p {
.footer-cta {
background: #e85200;
color: #ffffff;
padding: 48px 32px;
padding: 32px;
width: 100vw;
}
.footer-cta h2 {
Expand All @@ -179,15 +179,15 @@ p {
}
@media screen and (min-width: 767px) {
.footer-cta {
padding: 60px 48px;
padding: 48px;
}
.footer-cta p {
font-size: 22.6px;
}
}
@media screen and (min-width: 1023px) {
.footer-cta {
padding: 120px 48px;
padding: 48px;
}
.footer-cta h2 {
font-size: 45px;
Expand All @@ -200,12 +200,12 @@ p {
.footer {
background: #262626;
color: #ffffff;
padding: 80px 32px;
padding: 32px;
width: 100vw;
}
.footer p {
font-size: 19.2px;
margin: 0 0 0 0 16px;
margin: 0 0 16px;
}
.footer a {
color: #43aab5;
Expand All @@ -218,7 +218,7 @@ p {
}
@media screen and (min-width: 767px) {
.footer {
padding: 80px 48px;
padding: 48px;
}
.footer .footer-flex-wrap {
display: flex;
Expand All @@ -228,11 +228,6 @@ p {
text-align: right;
}
}
@media screen and (min-width: 1023px) {
.footer {
padding: 120px 48px;
}
}

.footer-logo {
margin-bottom: 16px;
Expand Down Expand Up @@ -284,11 +279,11 @@ p {
}

.page-content {
padding: 48px 32px;
padding: 32px;
}
@media screen and (min-width: 767px) {
.page-content {
padding: 48px 48px;
padding: 48px;
}
}

Expand Down
73 changes: 18 additions & 55 deletions src/_styles/escom.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,40 +78,6 @@ $esds-font-weight-semi-bold: 600;
$esds-border-radius-control: 4px;
$esds-border-radius-default: 8px;

$esds-space-16-x: 256px;
$esds-space-8-x: 128px;
$esds-space-4-x: 64px;
$esds-space-3-x: 48px;
$esds-space-2-x: 32px;
$esds-space-1-and-half-x: 24px;
$esds-space-1-x: 16px;
$esds-space-three-quarter-x: 12px;
$esds-space-half-x: 8px;
$esds-space-quarter-x: 4px;
$esds-space-eighth-x: 2px;
$esds-space-inset-8-x: 128px;
$esds-space-inset-4-x: 64px;
$esds-space-inset-2-x: 32px;
$esds-space-inset-1-and-half-x: 24px;
$esds-space-inset-1-x: 16px;
$esds-space-inset-half-x: 8px;
$esds-space-inset-quarter-x: 4px;
$esds-space-inset-eighth-x: 2px;
$esds-space-inset-squish-4-x: 32px 64px;
$esds-space-inset-squish-2-x: 16px 32px;
$esds-space-inset-squish-1-and-half-x: 12px 24px;
$esds-space-inset-squish-1-x: 8px 12px;
$esds-space-inset-squish-half-x: 6px 8px;
$esds-space-inset-squish-quarter-x: 2px 4px;
$esds-space-stack-4-x: 0 0 64px;
$esds-space-stack-3-x: 0 0 48px;
$esds-space-stack-2-x: 0 0 32px;
$esds-space-stack-1-and-half-x: 0 0 24px;
$esds-space-stack-1-x: 0 0 16px;
$esds-space-stack-three-quarter-x: 0 0 12px;
$esds-space-stack-half-x: 0 0 8px;
$esds-space-stack-quarter-x: 0 0 4px;
$esds-space-stack-eighth-x: 0 0 2px;
$esds-size-icon-s: 16px;
$esds-size-icon-m: 20px;
$esds-size-icon-l: 24px;
Expand All @@ -126,8 +92,8 @@ $content-max-width: 770px;
$tablet-width: 767px;
$desktop-width: 1023px;

$row-side-margin-mobile: 32px;
$row-side-margin-tablet: 48px;
$space-inset-row-mobile: 32px;
$space-inset-row-tablet: 48px;

html {
box-sizing: border-box;
Expand Down Expand Up @@ -289,7 +255,7 @@ p {
.footer-cta {
background: $esds-color-brand;
color: $esds-color-text-primary-on-dark;
padding: 48px $row-side-margin-mobile;
padding: $space-inset-row-mobile;
width: 100vw;

h2 {
Expand All @@ -310,15 +276,15 @@ p {
}

@media screen and (min-width: $tablet-width) {
padding: 60px $row-side-margin-tablet;
padding: $space-inset-row-tablet;

p {
font-size: $body-large;
}
}

@media screen and (min-width: $desktop-width) {
padding: 120px $row-side-margin-tablet;
padding: $space-inset-row-tablet;

h2 {
font-size: $heading-level-2;
Expand All @@ -334,12 +300,12 @@ p {
.footer {
background: $esds-color-background-dark-primary;
color: $esds-color-text-primary-on-dark;
padding: 80px $row-side-margin-mobile;
padding: $space-inset-row-mobile;
width: 100vw;

p {
font-size: $body-medium;
margin: 0 0 $esds-space-stack-1-x;
margin: 0 0 16px;
}

a {
Expand All @@ -354,7 +320,7 @@ p {
}

@media screen and (min-width: $tablet-width) {
padding: 80px $row-side-margin-tablet;
padding: $space-inset-row-tablet;

.footer-flex-wrap {
display: flex;
Expand All @@ -365,14 +331,11 @@ p {
text-align: right;
}
}

@media screen and (min-width: $desktop-width) {
padding: 120px $row-side-margin-tablet;
}
}

.footer-logo {
margin-bottom: 16px;

svg {
fill: $esds-color-text-primary-on-dark;
height: 30px;
Expand All @@ -384,7 +347,7 @@ p {
background-repeat: no-repeat;
background-size: cover;
color: $esds-color-text-primary-on-dark;
padding: 64px $row-side-margin-mobile;
padding: 64px $space-inset-row-mobile;
width: 100vw;

h1 {
Expand All @@ -398,7 +361,7 @@ p {
}

@media screen and (min-width: $tablet-width) {
padding: 64px $row-side-margin-tablet;
padding: 64px $space-inset-row-tablet;

h1 {
font-size: $heading-level-2;
Expand Down Expand Up @@ -428,10 +391,10 @@ p {

// Page Content
.page-content {
padding: 48px $row-side-margin-mobile;
padding: $space-inset-row-mobile;

@media screen and (min-width: $tablet-width) {
padding: 48px $row-side-margin-tablet;
padding: $space-inset-row-tablet;
}
}

Expand Down Expand Up @@ -528,7 +491,7 @@ p {

// Bio Header
.bio-header {
padding: 28px $row-side-margin-mobile 0;
padding: 28px $space-inset-row-mobile 0;

h1 {
margin: 0;
Expand Down Expand Up @@ -583,8 +546,8 @@ p {
}

@media screen and (min-width: $tablet-width) {
padding-left: $row-side-margin-tablet;
padding-right: $row-side-margin-tablet;
padding-left: $space-inset-row-tablet;
padding-right: $space-inset-row-tablet;
}
}

Expand All @@ -599,10 +562,10 @@ p {

// Row
.row {
padding: 32px;
padding: $space-inset-row-mobile;

@media screen and (min-width: $tablet-width) {
padding: 48px;
padding: $space-inset-row-tablet;
}
}

Expand Down

0 comments on commit 3022c4c

Please sign in to comment.