WIP – little refactor

Kikobeats · Feb 22, 2015 · dde3c67 · dde3c67
1 parent 63eaef6
commit dde3c67
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 28 deletions.
diff --git a/assets/css/uno.css b/assets/css/uno.css
diff --git a/assets/js/src/__init.coffee b/assets/js/src/__init.coffee
@@ -4,14 +4,6 @@ $ ->
   window.Uno = Uno =
     version: '2.0.0'
 
-    cover:
-      width: -> $(".cover").width()
-      isCollapsed: -> $(".cover").hasClass("collapsed")
-      collapsed: ->
-        $(".cover").addClass("collapsed")
-      collapsedWithAnimation: ->
-        $(".cover").addClass("collapsed animated")
-
     search:
       container: -> $('#results')
       form: (action) -> $("#search-container")[action]()

diff --git a/assets/js/src/cover.coffee b/assets/js/src/cover.coffee
@@ -4,22 +4,29 @@ $ ->
   el = document.body
   isOpen = location.hash is '#open'
 
-  if Uno.is 'page', 'home'
+  _expand = ->
     Uno.loadingBar 'hide'
     Uno.search.form 'hide'
-    $(".content-wrapper").hide() unless isOpen
+    $(".cover").removeClass("collapsed")
+    $(".main").hide() unless isOpen
 
-  if isOpen or not Uno.is 'page', 'home'
-    Uno.cover.collapsed()
+  _collapsed = ->
+    $(".cover").addClass("collapsed")
     Uno.search.form 'show'
     $('.social.expanded').removeClass 'expanded'
 
-  $('#blog-button').click ->
-    Uno.cover.collapsedWithAnimation()
-    Uno.search.form 'show'
-    $('.social.expanded').removeClass 'expanded'
-    $(".content-wrapper").show()
+  if Uno.is 'page', 'home'
+    $('.cover').addClass 'animated'
+    _expand()
+
+  _collapsed() if isOpen or not Uno.is 'page', 'home'
 
+  $('#blog-button').click ->
+    $('.cover').toggleClass("collapsed")
+    Uno.search.form 'toggle'
+    $('.social.expanded').toggleClass 'expanded'
+    action = if $('.main').is(":visible") then 'hide' else 'show'
+    $('.main')[action]()
 
   # $(".btn-mobile-menu").click ->
   #   /* now is #search-container */

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
@@ -5,11 +5,13 @@
   width: 100%;
   height: 100%;
   @include background-filter;
+
+  &.animated {
+    transition: width $aside-animation-time $animation-ease;
+  }
+
   &.collapsed {
     width: $aside-width-collapsed;
-    &.animated {
-      transition: width $aside-animation-time $animation-ease;
-    }
   }
   &.container {
     font-weight: $font-weight-thin;

diff --git a/assets/scss/components/_search.scss b/assets/scss/components/_search.scss
@@ -47,9 +47,9 @@
 }
 
 .icon-search {
-  position: relative;
-  top: 2px;
-  left: 13rem;
+  position: absolute;
+  top: 73%;
+  left: 72%;
   color: $gray;
   text-shadow: 1px 1px 0 $gray;
 }
diff --git a/partials/aside.hbs b/partials/aside.hbs
@@ -2,7 +2,7 @@
   <div class="cover container">
     <div class="profile">
       {{#if @blog.logo}}
-      <a href="{{@blog.url}}/#open" title="link to homepage for {{@blog.title}}">
+      <a id="avatar-link" title="link to homepage for {{@blog.title}}">
         <img src="{{@blog.logo}}" alt="{{@blog.title}} avatar" class="profile avatar hvr-buzz-out" />
         <h1>Kiko Beats</h1>
       </a>

diff --git a/partials/search.hbs b/partials/search.hbs
@@ -1,6 +1,6 @@
 <section id="search-container">
+  <i class="icon icon-search"></i>
   <form id="search-form">
-    <i class="icon icon-search"></i>
     <input type="text", name="search", placeholder="git, css, javascript,..." id="search-field" />
   </form>
   <hr class="divider short" />