Move news section to side-body.

4 files changed, 32 insertions, 56 deletions

diff --git a/blog/_assets/stylesheets/_navbar.scss b/blog/_assets/stylesheets/_navbar.scss
index 754169f..5fb3d48 100644
--- a/blog/_assets/stylesheets/_navbar.scss
+++ b/blog/_assets/stylesheets/_navbar.scss
@@ -5,7 +5,10 @@
         }
         @include round-corners;
         width: 100%;
-        padding: 1mm;
+        padding: {
+            top: 1mm;
+            bottom: 1mm;
+        }
 
         a {
             text-decoration: none;
diff --git a/blog/_assets/stylesheets/main.scss b/blog/_assets/stylesheets/main.scss
index fbf13e5..ca50211 100644
--- a/blog/_assets/stylesheets/main.scss
+++ b/blog/_assets/stylesheets/main.scss
@@ -54,54 +54,27 @@ h1 {
     position: relative;
     min-height: 700px;
 
-    padding: 1em;
+    padding: 1cm;
+
     @include round-corners;
 
     #body {
-        padding-right: 20em;
+        float: left;
+        width: 16cm;
     }
 
-    #side_body {
-        position: absolute;
-        width: 244px;
-        bottom: 1em;
-        right: 1em;
-        top: 1em;
-        overflow: auto;
-        .inner {
-            padding: 10px;
-        }
+    #side-body {
+        float: right;
+        width: 8cm;
         background: {
             color: $side-bar-background
         }
-        @include round-corners;
-
-        h1 {
-            font: {
-                size: 20px;
-                weight: bold;
-            }
-        }
-
-        h2 {
-            font: {
-                size: 16px;
-                weight: bold;
-            }
-        }
-
-        h3 {
-            font: {
-                size: 12px;
-                weight: bold;
-            }
-        }
     }
 
     #news, #links {
-        width: 8.55cm;
-        float: left;
-        margin-right: 5mm;
+        //width: 8.55cm;
+        //float: left;
+        //margin-right: 5mm;
 
         &.wide {
             width: 100%;
diff --git a/blog/_layouts/default.html b/blog/_layouts/default.html
index 84f0575..a2458fd 100644
--- a/blog/_layouts/default.html
+++ b/blog/_layouts/default.html
@@ -7,11 +7,7 @@
 
       <section id="page">
         <section id="body-content">
-          <section id="body">
-            <div class="inner">
-              {{ content }}
-            </div>
-          </section>
+          {{ content }}
         </section>
       </section>
 
diff --git a/blog/index.html b/blog/index.html
index 0387f41..94f8e09 100644
--- a/blog/index.html
+++ b/blog/index.html
@@ -2,20 +2,24 @@
 layout: default
 ---
 
-{% tf home/intro.md %}
-
-<section id="news" class="wide">
-  <h2>{% t home.latest_news %}</h2>
-  {% for p in paginator.posts %}
-    {% include post-excerpt.html post=p %}
-  {% endfor %}
+<section id="body">
+  {% tf home/intro.md %}
+</section>
 
-  {% include pagination.html %}
+<section id="side-body">
+  <section id="news">
+    <h2>{% t home.latest_news %}</h2>
+    {% for p in paginator.posts %}
+      {% include post-excerpt.html post=p %}
+    {% endfor %}
 
-</section>
+    {% include pagination.html %}
 
-{% if site.links %}
-  <section id="links">
-    <h2>{% t home.links %}</h2>
   </section>
-{% endif %}
+
+  {% if site.links %}
+    <section id="links">
+      <h2>{% t home.links %}</h2>
+    </section>
+  {% endif %}
+</section>