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

Container fixes #556

Merged
merged 3 commits into from
May 24, 2016
Merged

Container fixes #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6def0f
Add float to fix display issue.
DFurnes May 24, 2016
e47cf20
Fix block vertical spacing on mobile.
DFurnes May 24, 2016
3db0190
Increase "timeout" waiting for styleguide to start up.
DFurnes May 24, 2016
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
10 changes: 10 additions & 0 deletions scss/_regions/_container.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@

> .wrapper {
position: relative;
float: left;

@include media($tablet) {
@include span(12 no-gutters);
Expand All @@ -54,6 +55,15 @@
margin: $base-spacing 0;
line-height: $comfortable-line-height;

// HACK: Since we use `.container__row` for vertical spacing, but collapse
// all "blocks" to stack on mobile, we need to add appropriate margins between
// blocks when they're stacked.
& + .container__block {
@include media($mobile) {
margin-top: $base-spacing;
}
}

&.-narrow {
@include media($tablet) {
@include span(9 of 12);
Expand Down
2 changes: 1 addition & 1 deletion wercker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ build:
export NODE_ENV=production
export STYLEGUIDE_PORT=8000
npm run styleguide &
sleep 5 # let Node start up!
sleep 10 # let Node start up!
wget -mpc --user-agent="" -e robots=off -P build -nH http://localhost:${STYLEGUIDE_PORT}/

# Automatically deploy `dev` branch to Github pages
Expand Down