Skip to content

Commit 3585cd1

Browse files
committed
edit css
1 parent 616e7a3 commit 3585cd1

File tree

2 files changed

+15
-49
lines changed

2 files changed

+15
-49
lines changed

css/app.css

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -15,48 +15,6 @@ html { font-size: 100%; }
1515

1616
/* Grid */
1717

18-
*, *:before, *:after {
19-
-moz-box-sizing: border-box;
20-
-webkit-box-sizing: border-box;
21-
box-sizing: border-box;
22-
}
23-
24-
.container {
25-
margin: 0 auto;
26-
max-width: 60rem;
27-
width: 90%;
28-
}
29-
30-
@media (min-width: 40rem) {
31-
.column {
32-
float: left;
33-
padding-left: 1rem;
34-
padding-right: 1rem;
35-
}
36-
37-
.column.full { width: 100%; }
38-
.column.two-thirds { width: 66.7%; }
39-
.column.half { width: 50%; }
40-
.column.third { width: 33.3%; }
41-
.column.fourth { width: 25%; }
42-
.column.three-fourths { width: 75%; }
43-
.column.flow-opposite { float: right; }
44-
}
45-
46-
.clearfix:before,
47-
.clearfix:after {
48-
content: " ";
49-
display: table;
50-
}
51-
52-
.clearfix:after {
53-
clear: both;
54-
}
55-
56-
.clearfix {
57-
*zoom: 1;
58-
}
59-
6018
/* Ditto */
6119

6220
body {
@@ -68,13 +26,18 @@ body {
6826
font-size: 0.8em;
6927
}
7028

71-
#sidebar {
29+
@media (min-width: 40rem) {
30+
#sidebar {
31+
width: 300px;
7232
position: fixed;
7333
height: 100%;
7434

7535
overflow-y: scroll;
7636
overflow: -moz-scrollbars-vertical;
37+
}
38+
}
7739

40+
#sidebar {
7841
margin-right: 20px;
7942
margin-top: 0;
8043
padding-left: 25px;
@@ -133,6 +96,13 @@ body {
13396
font-size: 12px;
13497
}
13598

99+
@media (min-width: 40rem) {
100+
#content {
101+
width: 580px;
102+
padding-left:350px;
103+
}
104+
}
105+
136106
#content {
137107
padding-top: 10px;
138108
padding-bottom: 150px;

index.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@
1616
</head>
1717
<body>
1818
<!-- essential -->
19-
<div class="container">
20-
<div class="row clearfix">
21-
<div id="sidebar column fourth"></div>
22-
<div id="content column three-fourths"></div>
23-
</div>
24-
</div>
19+
<div id="sidebar"></div>
20+
<div id="content"></div>
2521
<!-- optional -->
2622
<div id="back_to_top">back to top</div>
2723
<div id="edit">edit</div>

0 commit comments

Comments
 (0)