Skip to content

Commit f5ffbcf

Browse files
committed
convert to a bourbon/neat grid system
1 parent 2ae9699 commit f5ffbcf

File tree

4 files changed

+48
-69
lines changed

4 files changed

+48
-69
lines changed

_layouts/default.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ <h1>
5050

5151
{% include sidebar.html %}
5252

53-
<section id="main" class="main-content" role="main">
53+
<article id="main" class="main-content" role="main">
5454
{{ content }}
55-
</section>
55+
</article>
5656

5757
</div>
5858
</div>

assets/_sass/styles.scss

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,11 @@ img {width: 700px;}
6969

7070
/* Lists */
7171

72-
.main-content ul {
72+
article ul {
7373
padding-left: 1.1em;
7474
}
7575

76-
.main-content li {
76+
article li {
7777
margin-bottom: 1em;
7878
}
7979

@@ -135,22 +135,14 @@ aside {
135135
/* Layout */
136136

137137
/* offset the fixed position header for jump links */
138-
section:before {
138+
article:before {
139139
display: block;
140140
content: "";
141141
height: 60px;
142142
margin: -60px 0 0;
143143
}
144144

145-
.wrap {
146-
max-width: 1200px;
147-
margin: 0 auto;
148-
padding-left: 20px;
149-
padding-right: 20px;
150-
}
151-
152145
header {
153-
width: 100%;
154146
background-color: $header;
155147
padding: 1.5em;
156148
color: $white;
@@ -230,42 +222,31 @@ pre {
230222

231223
/** Overall structure, desktop and mobile */
232224

233-
header {
234-
position: static;
225+
.container {
226+
235227
}
236228

237-
.wrap.content {
238-
position: relative;
229+
.wrap {
239230
}
240231

241232
aside {
242-
width: 25%;
243-
left: 0%;
244-
position: absolute;
233+
@include span-columns(3.25);
245234
}
246235

247-
.main-content {
248-
left: 30%;
249-
position: absolute;
250-
max-width: 700px;
251-
margin-bottom: 20px;
236+
article {
237+
@include shift(0.25);
238+
@include span-columns(8);
239+
margin-bottom: 20px;
252240
}
253241

254242
@media screen and (max-width: 40.5em) {
255243

256-
.wrap.content {
257-
position: static;
258-
}
259-
260244
aside {
261-
position: static;
262-
width: 100%;
245+
@include span-columns(12);
263246
}
264247

265-
.main-content {
266-
margin-top: 1.5em;
267-
position: static;
268-
width: 100%;
248+
article {
249+
@include span-columns(12);
269250
}
270251

271252
}

assets/css/styles.css

Lines changed: 30 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

assets/css/styles.css.map

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)