1.1.0

mblode · May 6, 2015 · 89a57c4 · 89a57c4
1 parent b48345f
commit 89a57c4
Show file tree

Hide file tree

Showing 14 changed files with 97 additions and 205 deletions.
diff --git a/README.md b/README.md
@@ -83,48 +83,43 @@ These are the files that are generated from `bower install marx`
 
   <title>Marx Template</title>
 
-  <!-- Marx -->
-  <link href="css/marx.min.css" rel="stylesheet">
+  <!-- Marx CSS -->
+  <link rel="stylesheet" href="css/marx.min.css">
 </head>
 
 <body>
   <!-- main is the container -->
   <main>
     <!-- Navigation -->
     <nav>
-      <!-- left align (brand) -->
       <ul>
-        <li><a href="#"><b>Marx</b></a></li>
+        <li><a href="#"><b>First</b></a></li>
+        <li><a href="#">Second</a></li>
+        <li><a href="#">Third</a></li>
+        <li><a href="#">Fourth</a></li>
       </ul>
-
-      <!-- right align -->
-      <ol>
-        <li><a href="#">Home</a></li>
-        <li><a href="#">About</a></li>
-        <li><a href="#">Contact</a></li>
-      </ol>
     </nav>
 
     <!-- article -->
     <article>
-      <h1>Article<small>This spans 60%</small></h1>
+      <h1>Article</h1>
     </article>
 
     <!-- aside -->
     <aside>
-      <h1>Aside<small>This spans 40%</small></h1>
+      <h1>Aside</h1>
     </aside>
 
     <!-- section -->
     <section>
-      <h1>Section<small>This spans 100%</small></h1>
+      <h1>Section</h1>
     </section>
-  </main>
 
-  <!-- footer (outside of main) -->
-  <footer>
-    <p>&copy Matthew Blode 2015</p>
-  </footer>
+    <!-- footer -->
+    <footer>
+      <p>&copy Matthew Blode 2015</p>
+    </footer>
+  </main>
 
 </body>
 </html>

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "marx",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "homepage": "https://github.com/mblode/marx",
   "authors": [
     "mblode <[email protected]>"

diff --git a/css/marx.css b/css/marx.css
diff --git a/css/marx.css.map b/css/marx.css.map