From 3585cd1e0894e11f4880553cbe2df78545042c1c Mon Sep 17 00:00:00 2001 From: ruanyf Date: Sun, 20 Apr 2014 21:56:18 +0800 Subject: [PATCH] edit css --- css/app.css | 56 +++++++++++++---------------------------------------- index.html | 8 ++------ 2 files changed, 15 insertions(+), 49 deletions(-) diff --git a/css/app.css b/css/app.css index 8fe4d76..b07ed7b 100644 --- a/css/app.css +++ b/css/app.css @@ -15,48 +15,6 @@ html { font-size: 100%; } /* Grid */ -*, *:before, *:after { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; -} - -.container { - margin: 0 auto; - max-width: 60rem; - width: 90%; -} - -@media (min-width: 40rem) { - .column { - float: left; - padding-left: 1rem; - padding-right: 1rem; - } - - .column.full { width: 100%; } - .column.two-thirds { width: 66.7%; } - .column.half { width: 50%; } - .column.third { width: 33.3%; } - .column.fourth { width: 25%; } - .column.three-fourths { width: 75%; } - .column.flow-opposite { float: right; } -} - -.clearfix:before, -.clearfix:after { - content: " "; - display: table; -} - -.clearfix:after { - clear: both; -} - -.clearfix { - *zoom: 1; -} - /* Ditto */ body { @@ -68,13 +26,18 @@ body { font-size: 0.8em; } -#sidebar { +@media (min-width: 40rem) { + #sidebar { + width: 300px; position: fixed; height: 100%; overflow-y: scroll; overflow: -moz-scrollbars-vertical; + } +} +#sidebar { margin-right: 20px; margin-top: 0; padding-left: 25px; @@ -133,6 +96,13 @@ body { font-size: 12px; } +@media (min-width: 40rem) { + #content { + width: 580px; + padding-left:350px; + } +} + #content { padding-top: 10px; padding-bottom: 150px; diff --git a/index.html b/index.html index 8fe882b..b75fe3b 100644 --- a/index.html +++ b/index.html @@ -16,12 +16,8 @@ -
-
- -
-
-
+ +
back to top
edit