Merge pull request #101 from ManRueda/master

Fix some styles errors with the scroll bars
Kikobeats · Oct 10, 2015 · 95d0b8b · 95d0b8b
2 parents fd225da + 2f3b578
commit 95d0b8b
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/assets/css/uno-zen.css b/assets/css/uno-zen.css
diff --git a/assets/js/src/cover.coffee b/assets/js/src/cover.coffee
@@ -10,11 +10,11 @@ $ ->
     , 1000)
 
   _expand = (options)->
-    $('main, .cover, .links > li').toggleClass 'expanded'
+    $('main, .cover, .links > li, html').toggleClass 'expanded'
     Uno.search.form options.form
 
   $('#menu-button').click ->
-    $('.cover, main, #menu-button').toggleClass 'expanded'
+    $('.cover, main, #menu-button, html').toggleClass 'expanded'
 
   $('.nav-blog > a, #avatar-link').click (event) ->
     if Uno.is 'page', 'home'

diff --git a/assets/js/uno-zen.js b/assets/js/uno-zen.js
diff --git a/assets/scss/components/_aside.scss b/assets/scss/components/_aside.scss
@@ -5,7 +5,7 @@
   display: block;
   width: $aside-width-collapsed;
   height: 100%;
-  overflow-y: scroll;
+  overflow-y: auto;
 
   border-right: 1px solid $gray;
   box-shadow: 10.5px -10px 1px -9px $gray-light;

diff --git a/assets/scss/modules/_global.scss b/assets/scss/modules/_global.scss
@@ -5,6 +5,10 @@
 html {
   height: 100%;
   max-height: 100%;
+
+  &.expanded {
+    overflow-y: hidden;
+  }
 
   font-size: $unit;
 }