Skip to content

Commit 940e6b1

Browse files
committed
use grid system for sidebar/main layout
1 parent dab8252 commit 940e6b1

File tree

3 files changed

+3
-21
lines changed

3 files changed

+3
-21
lines changed

app/styles/components/_sidebar.scss

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,9 @@
11
.sidebar {
2-
position: relative;
3-
z-index: 1;
4-
padding: $small-spacing 0;
52

63
@include media($large-screen-up) {
7-
// fixed sidebar, full height
8-
@include span-columns(3.5);
94
margin-right: 0;
10-
width: 19em;
115
border-bottom: 0;
126
padding: $small-spacing $base-spacing $base-spacing * 1.5;
13-
14-
&::before {
15-
@include position(absolute, 0 0 0 -100vw);
16-
content: "";
17-
display: block;
18-
z-index: -1;
19-
}
20-
21-
&::after {
22-
clear: both;
23-
display: block;
24-
}
257
}
268

279
@media (min-width: 1200px) {

app/templates/application.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{#es-header}}
22
{{search-input}}
33
{{/es-header}}
4-
<main class="container margin-vertical-medium">
4+
<main class="container margin-vertical-medium layout-grid">
55
{{outlet}}
66
</main>
77
{{es-footer}}

app/templates/project-version.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<aside class="sidebar">
1+
<aside class="sidebar col-1-large col-6">
22
<ol class="toc-level-0">
33
<li class="toc-level-0 large margin-bottom-small list-unstyled" data-test-home>
44
{{#link-to 'project' 'ember'}}Home{{/link-to}}
@@ -36,6 +36,6 @@
3636
isShowingNamespaces=(version-lt selectedProjectVersion.compactVersion '2.16')
3737
}}
3838
</aside>
39-
<section class="content">
39+
<section class="content col-6 col-5-large">
4040
{{outlet}}
4141
</section>

0 commit comments

Comments
 (0)