From 8b081c759afdaff16e8a403a045786347c846d4b Mon Sep 17 00:00:00 2001
From: Tankred Hase <tankred@whiteout.io>
Date: Tue, 4 Nov 2014 19:30:46 +0100
Subject: [PATCH] [WO-629] Fix nav margins

---
 src/sass/blocks/layout/_nav.scss | 10 +++++++---
 src/tpl/nav.html                 |  6 +++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/sass/blocks/layout/_nav.scss b/src/sass/blocks/layout/_nav.scss
index e6da003..288e1c4 100755
--- a/src/sass/blocks/layout/_nav.scss
+++ b/src/sass/blocks/layout/_nav.scss
@@ -1,6 +1,7 @@
 // Main Navigation Menu
 
 .nav {
+    $nav-padding-left: 8px;
     $nav-padding-h: 10px;
     $footer-height: 30px;
 
@@ -133,9 +134,9 @@
         }
         &__folder {
             font-size: $font-size-base;
-            padding-left: 5px;
+            padding-left: $nav-padding-left;
             padding-right: 20px;
-            margin-bottom: 12px;
+            margin-bottom: 16px;
             a {
                 color: $color-main;
                 & > svg {
@@ -149,6 +150,9 @@
                 top: 0.25em;
             }
         }
+        &__folder__other {
+            margin-bottom: 8px;
+        }
         &__counter {
             display: inline;
             position: static;
@@ -165,7 +169,7 @@
             border-top-color: $color-border-light;
             & > li {
                 font-size: $font-size-small;
-                padding-left: 5px;
+                padding-left: $nav-padding-left;
                 padding-right: 5px;
                 a {
                     color: $color-text-light;
diff --git a/src/tpl/nav.html b/src/tpl/nav.html
index b99c35e..e352638 100644
--- a/src/tpl/nav.html
+++ b/src/tpl/nav.html
@@ -25,7 +25,7 @@
   </ul><!--/nav__folders-->
 
   <ul class="nav__folders">
-    <li ng-repeat="folder in account.folders" ng-if="!folder.wellknown" class="nav__folder" ng-class="{'nav__folder--open': state.nav.currentFolder === folder}">
+    <li ng-repeat="folder in account.folders" ng-if="!folder.wellknown" class="nav__folder nav__folder__other" ng-class="{'nav__folder--open': state.nav.currentFolder === folder}">
       <a href="javascript:;" wo-touch="openFolder(folder)">
         <svg role="presentation"><use xlink:href="#icon-folder" /></svg>
         {{folder.name}}
@@ -67,8 +67,8 @@
     </li>
   </ul><!--/nav__secondary-->
 
-  <footer ng-class="{syncing: account.loggingIn || account.busy || searching}">
-    <span class="spinner"></span>
+  <footer>
+    <span class="spinner" ng-show="account.loggingIn || account.busy || searching"></span>
     <span class="text" ng-switch="account.online">
       <span ng-switch-when="false">
         <svg><use xlink:href="#icon-offline" /></svg>