experimenting

Kikobeats · Mar 7, 2015 · 5836cfe · 5836cfe
1 parent 0a9cd91
commit 5836cfe
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 46 deletions.
diff --git a/assets/css/uno.css b/assets/css/uno.css
diff --git a/assets/js/src/cover.coffee b/assets/js/src/cover.coffee
@@ -13,13 +13,11 @@ $ ->
   _collapsed = ->
     $(".cover").addClass("collapsed")
     Uno.search.form 'show'
-    $('.social').removeClass 'expanded'
     $(".main").show()
 
   $('#blog-button').click ->
     $('.cover').toggleClass 'collapsed'
     Uno.search.form 'toggle'
-    $('.social').toggleClass 'expanded'
     toggle = if $('.main').is(":visible") then 'hide' else 'show'
     $('.main')[toggle]()
 

diff --git a/assets/js/uno.js b/assets/js/uno.js
diff --git a/assets/scss/components/_aside.scss b/assets/scss/components/_aside.scss
@@ -45,55 +45,54 @@
       box-shadow: 0 0 1px 1px rgba(000, 000, 000, .3);
     }
   }
-  &.contact {
-    > nav {
-      position: relative;
-      display: inline-block;
-      padding: .25rem 0;
-    }
-  }
 }
-.links,
-.social {
-  position: relative;
-  display: inline-block;
-  float: left;
-  margin: 0;
-  list-style-type: none;
-}
-.links {
-  margin: 0;
 
-  &.item {
+.navigation {
+  &.left {
     display: inline-block;
-    margin: 0 1px 0 0;
-    line-height: 1em;
+    margin-top: .85rem;
+    margin-bottom: 1rem;
 
-    a {
-      padding: .625rem 1.25rem;
-      @include btn-cover;
+    .links {
+      margin: 0;
+
+      &.item {
+        display: inline-block;
+        margin: 0 1px 0 0;
+        line-height: 1em;
+
+        a {
+          float: left;
+          padding: .625rem 1.25rem;
+          margin: 0 5px;
+          @include btn-cover;
+        }
+      }
     }
   }
-}
-.social {
-  &.expanded {
-    margin: 0 0 0 1.5rem;
-  }
-  &.item {
-    display: inline-block;
-    margin: 0 4px 0 0;
-    line-height: 1em;
 
-    a {
-      padding: 6px 8px 6px 9px;
-      @include btn-cover;
+  &.right {
+    display: block;
 
-      .label {
-        display: none;
-      }
-      .icon {
-        display: block;
-        font-size: 1.7em;
+    .social {
+      margin: 0;
+      &.item {
+        display: inline-block;
+        margin: 0 4px 0 0;
+        line-height: 1em;
+
+        a {
+          padding: 6px 8px 6px 9px;
+          @include btn-cover;
+
+          .label {
+            display: none;
+          }
+          .icon {
+            display: block;
+            font-size: 1.7em;
+          }
+        }
       }
     }
   }

diff --git a/partials/links.hbs b/partials/links.hbs
@@ -3,6 +3,8 @@
     <li class="links item">
       <a href="/#open" title="link to {{@blog.title}} blog" id="blog-button">Blog</a>
       <a href="/#open" title="link to {{@blog.title}} blog" id="blog-button">About</a>
+      <a href="/#open" title="link to {{@blog.title}} blog" id="blog-button">Tags</a>
+      <a href="/#open" title="link to {{@blog.title}} blog" id="blog-button">Contact</a>
     </li>
   </ul>
 </nav>