Skip to content

Commit

Permalink
Address layout width issue when dashboard is on (travis-ci#2052)
Browse files Browse the repository at this point in the history
* Address layout width issue when dashboard is on

* Fix header and footer issues on help page.

* Avoid breaking wide sidebar layout
  • Loading branch information
sorta authored Jun 20, 2019
1 parent 7d9cbd3 commit f05cf09
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
3 changes: 1 addition & 2 deletions app/styles/app/layout.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$max-width: 1024px;
$max-width: $layout-max-width;
$padding-top: 24px;

.main {
Expand Down Expand Up @@ -96,7 +96,6 @@ $padding-top: 24px;
}
}

.feature-wrapper.dashboard,
.centered,
.centered.wrapper {
#left {
Expand Down
2 changes: 1 addition & 1 deletion app/styles/app/layouts/footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ $styleguide-medium: 800px;
}
}

.dashboard, .profile-view, .wrapper.centered, .landing-pro {
.dashboard, .profile-view, .wrapper.centered, .landing-pro, .help-page {
& + .footer {
.layout-inner {
max-width: $styleguide-layout-max-width;
Expand Down
5 changes: 5 additions & 0 deletions app/styles/app/layouts/top.scss
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@
height: auto;
}

.layout-striped & {
max-width: $layout-max-width;
margin: auto;
}

@media #{$medium-up} {
&,
&.has-autoheight {
Expand Down
1 change: 1 addition & 0 deletions app/styles/app/vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ $font-weight-normal: 400;
$font-weight-bold: 600;

$top-height: 55px;
$layout-max-width: 1024px;

$turf-green: #39aa56;
$seed-green: #deecdc;
Expand Down

0 comments on commit f05cf09

Please sign in to comment.