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

Add outside spacing for containers on mobile #238

Merged
merged 4 commits into from
Oct 30, 2019
Merged

Add outside spacing for containers on mobile #238

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4658fa
Update container padding
pichfl Oct 30, 2019
775737b
Update ESHeader padding to match other containers
pichfl Oct 30, 2019
976a6d6
Enable increased header sizing for larger screens
pichfl Oct 30, 2019
1bdaffe
Update header styling to fix offsets
pichfl Oct 30, 2019
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
15 changes: 10 additions & 5 deletions addon/styles/components/es-header.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
justify-content: center;
align-items: center;
background-color: var(--color-dark);
padding: 1.5rem 0;
padding: 1rem var(--grid-margin);
}

.es-header ul,
Expand All @@ -17,7 +17,7 @@
display: flex;
flex-direction: column;
font-size: 2rem;
max-width: var(--container-width-large);
max-width: var(--container-width);
width: 100%;
}

Expand All @@ -28,7 +28,7 @@
.navbar-brand {
display: block;
height: 5rem;
margin: 0 1.5rem 0 1rem; /* should be 0 1.5rem, but the logo needs to be slightly more left to be visually aligned */
margin: 0 1.5rem 0 -0.5rem; /* should be 0 1.5rem, but the logo needs to be slightly more left to be visually aligned */
}

.navbar-list {
Expand All @@ -43,7 +43,6 @@
display: block;
text-align: left;
font-size: inherit;
line-height: inherit;
font-weight: inherit;
border-radius: 10px;
}
Expand All @@ -57,6 +56,7 @@
display: inline-block;
border: 0;
margin: -5rem 0.5rem 0 auto;
padding: 0;
width: 4.5rem;
height: 5rem;
background: transparent
Expand All @@ -74,6 +74,7 @@
.navbar-list-item-link,
.navbar-list-item-dropdown-toggle {
margin: 0 0.5rem;
line-height: 3rem;
padding: 1rem;
color: #fff;
}
Expand Down Expand Up @@ -155,7 +156,11 @@
margin: 1rem 1.5rem;
}

@media (min-width: 992px) {
@media (min-width: 984px) {
.es-header {
/* padding: 1.5rem var(--grid-margin); */
Copy link
Member

Choose a reason for hiding this comment

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

is this supposed to be commented out?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Whops, no, this needs to be in

}

.es-navbar {
display: flex;
flex-direction: row;
Expand Down
26 changes: 16 additions & 10 deletions addon/styles/global.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
:root {
--font-family-sans: 'Inter var', 'Inter web', -apple-system, BlinkMacSystemFont, Segoe UI, Helvetica, Arial,
sans-serif, Apple Color Emoji, Segoe UI Emoji;
--container-width-large: 128rem;

--color-dark: #1c1e23;
--color-light: #ffffff;
--color-muted: #f4f6f8;
Expand Down Expand Up @@ -30,13 +30,24 @@
--font-weight-2: 400;
--font-weight-3: 600;

--container-width: 119rem;
--grid-gap: 3rem;
--grid-margin: 1.5rem;

--spacing-1: 2rem;
--spacing-2: 3rem;
--spacing-3: 7rem;
--spacing-4: 16rem;
--spacing-3: 6rem;
--spacing-4: 9rem;
--spacing-5: 24rem;
}

/* 984px = 2rem + 119rem + 2rem */
@media (min-width: 984px) {
:root {
--grid-gap: 4rem;
}
}

*:focus {
outline: none;
box-shadow: 0 0 0px 3px rgba(25, 116, 220, 0.8);
Expand Down Expand Up @@ -66,7 +77,8 @@ a {
text-decoration: none;
}

a:active, .active {
a:active,
.active {
color: var(--color-dark);
}

Expand Down Expand Up @@ -104,12 +116,6 @@ strong {

/* move beyond this point */

.container {
max-width: var(--container-width-large);
margin-left: auto;
margin-right: auto;
}

.content-section {
padding-top: 8rem;
padding-bottom: 8rem;
Expand Down
44 changes: 23 additions & 21 deletions addon/styles/layout.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
.container {
padding: var(--spacing-4) 0;
margin: 0 auto;
width: var(--max-width);
max-width: var(--container-width);
margin-left: auto;
margin-right: auto;
padding: var(--spacing-4) var(--grid-margin);
box-sizing: content-box;
}

.flex-row {
Expand All @@ -16,36 +18,36 @@

.layout-grid {
display: grid;
grid-template-columns: repeat(6,1fr);
grid-gap: var(--spacing-2);
grid-template-columns: repeat(6, 1fr);
grid-gap: var(--grid-gap);
}

.layout-grid > * {
grid-column: span 6/span 6;
grid-column: span 6 / span 6;
}

.col-1 {
grid-column: span 1/span 1;
grid-column: span 1 / span 1;
}

.col-2 {
grid-column: span 2/span 2;
grid-column: span 2 / span 2;
}

.col-3 {
grid-column: span 3/span 3;
grid-column: span 3 / span 3;
}

.col-4 {
grid-column: span 4/span 4;
grid-column: span 4 / span 4;
}

.col-5 {
grid-column: span 5/span 5;
grid-column: span 5 / span 5;
}

.col-6 {
grid-column: span 6/span 6;
grid-column: span 6 / span 6;
}

.offset-1 {
Expand All @@ -70,27 +72,27 @@

@media (min-width: 576px) {
.col-1-large {
grid-column: span 1/span 1;
grid-column: span 1 / span 1;
}

.col-2-large {
grid-column: span 2/span 2;
grid-column: span 2 / span 2;
}

.col-3-large {
grid-column: span 3/span 3;
grid-column: span 3 / span 3;
}

.col-4-large {
grid-column: span 4/span 4;
grid-column: span 4 / span 4;
}

.col-5-large {
grid-column: span 5/span 5;
grid-column: span 5 / span 5;
}

.col-6-large {
grid-column: span 6/span 6;
grid-column: span 6 / span 6;
}

.offset-1-large {
Expand All @@ -116,14 +118,14 @@

@media (max-width: 576px) {
.layout-grid {
grid-template-columns: repeat(4,1fr);
grid-template-columns: repeat(4, 1fr);
}

.col-5 {
grid-column: span 4/span 4;
grid-column: span 4 / span 4;
}

.col-6 {
grid-column: span 4/span 4;
grid-column: span 4 / span 4;
}
}