From 7ce54373aec7f2be2034955abbf5b2f230508e47 Mon Sep 17 00:00:00 2001
From: liaoxuezhi <liaoxuezhi@baidu.com>
Date: Wed, 13 Nov 2019 15:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scss/layout/_layout.scss | 29 +++++++++++++++++++----------
 src/renderers/Page.tsx   |  2 +-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/scss/layout/_layout.scss b/scss/layout/_layout.scss
index 28d4cb396..799334436 100644
--- a/scss/layout/_layout.scss
+++ b/scss/layout/_layout.scss
@@ -53,7 +53,7 @@ body {
         background: $Layout-brand-bg;
         color: $Layout-brandBar-color;
 
-        > button {
+        >button {
             padding: px2rem(10px) px2rem(17px);
             font-size: px2rem(16px);
             line-height: $Layout-header-height - px2rem(20px);
@@ -123,13 +123,14 @@ body {
         // .app-aside-folded & {
         //     max-width: @app-aside-folded-width;
         // }
-        ~ div {
+        ~div {
             padding-bottom: px2rem(50px);
         }
     }
 
     &-content {
         height: 100%;
+        position: relative;
         @include clearfix();
     }
 
@@ -197,7 +198,7 @@ body {
         // overflow-x: hidden;
     }
 
-    
+
 
     .#{$ns}Layout-content {
         transition: transform 0.2s ease;
@@ -225,6 +226,7 @@ body {
     }
 
     .#{$ns}Layout--offScreen {
+
         .#{$ns}Layout-content,
         .#{$ns}Layout-footer {
             background-color: $body-bg;
@@ -266,6 +268,7 @@ body {
         }
 
         &--withAside {
+
             .#{$ns}Layout-headerBar,
             .#{$ns}Layout-content,
             .#{$ns}Layout-footer {
@@ -304,6 +307,7 @@ body {
             }
 
             &.#{$ns}Layout--withAside {
+
                 .#{$ns}Layout-headerBar,
                 .#{$ns}Layout-content,
                 .#{$ns}Layout-footer {
@@ -359,7 +363,7 @@ body {
                     width: $scrollbar-width;
                 }
 
-                & > * {
+                &>* {
                     width: $Layout-aside-width;
                 }
             }
@@ -386,13 +390,14 @@ body {
                 overflow: visible;
                 width: $Layout-aside--folded-width + $scrollbar-width;
 
-                > * {
+                >* {
                     width: $Layout-aside--folded-width;
                 }
             }
         }
 
         &--sm:not(.#{$ns}Layout--folded) {
+
             .#{$ns}Layout-brand,
             .#{$ns}Layout-brandBar,
             .#{$ns}Layout-aside {
@@ -400,6 +405,7 @@ body {
             }
 
             &.#{$ns}Layout--withAside {
+
                 .#{$ns}Layout-headerBar,
                 .#{$ns}Layout-content,
                 .#{$ns}Layout-footer {
@@ -415,7 +421,7 @@ body {
                 .#{$ns}Layout-asideInner {
                     width: $Layout-aside--sm-width + $scrollbar-width;
 
-                    & > * {
+                    &>* {
                         width: $Layout-aside--sm-width;
                     }
                 }
@@ -423,6 +429,7 @@ body {
         }
 
         &--md:not(.#{$ns}Layout--folded) {
+
             .#{$ns}Layout-brand,
             .#{$ns}Layout-brandBar,
             .#{$ns}Layout-aside {
@@ -430,6 +437,7 @@ body {
             }
 
             &.#{$ns}Layout--withAside {
+
                 .#{$ns}Layout-headerBar,
                 .#{$ns}Layout-content,
                 .#{$ns}Layout-footer {
@@ -445,7 +453,7 @@ body {
                 .#{$ns}Layout-asideInner {
                     width: $Layout-aside--md-width + $scrollbar-width;
 
-                    & > * {
+                    &>* {
                         width: $Layout-aside--md-width;
                     }
                 }
@@ -453,6 +461,7 @@ body {
         }
 
         &--lg:not(.#{$ns}Layout--folded) {
+
             .#{$ns}Layout-brand,
             .#{$ns}Layout-brandBar,
             .#{$ns}Layout-aside {
@@ -460,6 +469,7 @@ body {
             }
 
             &.#{$ns}Layout--withAside {
+
                 .#{$ns}Layout-headerBar,
                 .#{$ns}Layout-content,
                 .#{$ns}Layout-footer {
@@ -475,7 +485,7 @@ body {
                 .#{$ns}Layout-asideInner {
                     width: $Layout-aside--lg-width + $scrollbar-width;
 
-                    & > * {
+                    &>* {
                         width: $Layout-aside--lg-width;
                     }
                 }
@@ -507,5 +517,4 @@ body {
             }
         }
     }
-}
-
+}
\ No newline at end of file
diff --git a/src/renderers/Page.tsx b/src/renderers/Page.tsx
index 097556630..b0982c506 100644
--- a/src/renderers/Page.tsx
+++ b/src/renderers/Page.tsx
@@ -51,7 +51,7 @@ export interface PageProps extends RendererProps {
 }
 
 export default class Page extends React.Component<PageProps> {
-  timer: number;
+  timer: NodeJS.Timeout;
   mounted: boolean;
 
   static defaultProps = {