From 57827fb0cff087f3229b64f770b4dc3542905b7c Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 22 May 2016 16:29:32 +0800
Subject: [PATCH] fix scorllbar bug

---
 app/index.html            |  2 +-
 app/scripts/core/__fix.js | 23 ++---------------------
 app/styles/aria-ng.css    | 12 ++++++++----
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/app/index.html b/app/index.html
index 8794a63..29cd198 100644
--- a/app/index.html
+++ b/app/index.html
@@ -149,7 +149,7 @@
     </aside>
 
     <div id="content-wrapper" class="content-wrapper">
-        <div ng-view cg-busy="{ promise: loadPromise, message: ('Loading' | translate) }"></div>
+        <div id="content-body" class="content-body" ng-view cg-busy="{ promise: loadPromise, message: ('Loading' | translate) }"></div>
     </div>
 
     <footer class="main-footer">
diff --git a/app/scripts/core/__fix.js b/app/scripts/core/__fix.js
index 2eda208..8d3a7fe 100644
--- a/app/scripts/core/__fix.js
+++ b/app/scripts/core/__fix.js
@@ -3,29 +3,10 @@
 
     //copy from AdminLTE app.js
     var fixContentWrapperHeight = function () {
+        var windowHeight = $(window).height();
         var neg = $('.main-header').outerHeight() + $('.main-footer').outerHeight();
-        var window_height = $(window).height();
-        var sidebar_height = $(".sidebar").height();
 
-        if ($("body").hasClass("fixed")) {
-            $(".content-wrapper, .right-side").css('height', window_height - $('.main-footer').outerHeight());
-        } else {
-            var postSetWidth;
-            if (window_height >= sidebar_height) {
-                $(".content-wrapper, .right-side").css('height', window_height - neg);
-                postSetWidth = window_height - neg;
-            } else {
-                $(".content-wrapper, .right-side").css('height', sidebar_height);
-                postSetWidth = sidebar_height;
-            }
-
-            //Fix for the control sidebar height
-            var controlSidebar = $($.AdminLTE.options.controlSidebarOptions.selector);
-            if (typeof controlSidebar !== "undefined") {
-                if (controlSidebar.height() > postSetWidth)
-                    $(".content-wrapper, .right-side").css('height', controlSidebar.height());
-            }
-        }
+        $(".content-body").css('height', windowHeight - neg);
     };
 
     $(window, ".wrapper").resize(function () {
diff --git a/app/styles/aria-ng.css b/app/styles/aria-ng.css
index 16f743d..881916f 100644
--- a/app/styles/aria-ng.css
+++ b/app/styles/aria-ng.css
@@ -4,6 +4,10 @@
  */
 
 /* skin-aria-ng */
+.skin-aria-ng {
+    overflow-y: hidden;
+}
+
 .skin-aria-ng, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
     font-family: 'Hiragino Sans GB', 'Microsoft YaHei', 'STHeiti', 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
@@ -119,14 +123,14 @@
     color: #0080ff;
 }
 
-.skin-aria-ng .content-wrapper {
-    overflow-y: scroll;
-}
-
 .skin-aria-ng .content-wrapper, .right-side {
     background-color: #fff;
 }
 
+.skin-aria-ng .content-wrapper > .content-body {
+    overflow-y: scroll;
+}
+
 @media screen and (max-width: 767px) {
     .skin-aria-ng .content-wrapper .content {
         margin-top: 5px;