Merge pull request #14 from rmosolgo/remove-layout-column

matz · matz · commit be1e1e5e68ae · 2015-04-02T23:49:43.000+09:00
Remove "Latest News" column
diff --git a/_includes/_latest_news.html b/_includes/_latest_news.html
@@ -0,0 +1,20 @@
+<div class='row'>
+  <div class='col-md-12'>
+    <h2>Latest News</h2>
+  </div>
+</div>
+</div>
+<div class='row'>
+  <div class="col-md-12">
+    <ul class="posts">
+      {% for post in site.posts %}
+        <li>
+          <p class='lead'>
+            <strong>{{ post.date | date_to_string }}:</strong>
+            <a href="{{ post.url }}">{{ post.title }}</a>
+          </p>
+        </li>
+      {% endfor %}
+    </ul>
+  </div>
+</div>
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -10,26 +10,9 @@
     <div class="container">
 
       <div class="row clearfix">
-
         <div class="col-md-12 column">
 
-          <div class="row clearfix">
-            <div class="col-md-9 column">
-
-              {{ content }}
-
-            </div>
-            <div class="col-md-3 column">
-
-              <h2>Latest News</h2>
-              <ul class="posts">
-                {% for post in site.posts %}
-                  <li><a href="{{ post.url }}">{{ post.title }}</a></li>
-                {% endfor %}
-              </ul>
-
-            </div>
-          </div>
+          {{ content }}
 
         </div>
       </div>
diff --git a/_layouts/home.html b/_layouts/home.html
diff --git a/about/index.html b/about/index.html
@@ -14,4 +14,7 @@ <h2>About mruby</h2>
       This achievement was sponsored by the Regional Innovation Creation R&amp;D Programs of the Ministry of Economy, Trade and Industry of Japan.
     </p>
   </div>
+
+  {% include _latest_news.html %}
+
 </div>
diff --git a/css/main.css b/css/main.css
@@ -126,17 +126,6 @@ a {
   padding-right: 20px;
 }
 
-.posts p {
-  font-size: 120%;
-  font-weight: bold;
-  padding: 0;
-  margin: 0;
-}
-
-.posts a {
-  font-size: 120%;
-}
-
 table td,th {
   border:2px solid #eee;
   padding:4px;
diff --git a/index.html b/index.html
@@ -1,5 +1,5 @@
 ---
-layout: home
+layout: default
 title: mruby
 ---
 
@@ -17,20 +17,6 @@
     </div>
   </div>
 
-  <div class="col-md-12">
-    <div id="home">
-      <div>
-        <h2>Latest News</h2>
-        <ul class="posts">
-          {% for post in site.posts %}
-            <li>
-              <p>{{ post.date | date_to_string }}</p>
-              <a href="{{ post.url }}">{{ post.title }}</a>
-            </li>
-          {% endfor %}
-        </ul>
-      </div>
-    </div>
-  </div>
+  {% include _latest_news.html %}
 
 </div>
