From 3c666d881ebc7e8bb021ee8b0bf264026c652525 Mon Sep 17 00:00:00 2001 From: Zhicheng Wang Date: Tue, 31 May 2016 07:26:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=B3=95=E7=AC=94=E8=AF=AF=20=E8=A7=A3=E5=86=B3=E4=BA=86?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E8=AE=BE=E5=A4=87=E4=B8=8A=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=85=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/docs/ts/latest/guide/upgrade.jade | 2 +- public/resources/css/module/_side-nav.scss | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/docs/ts/latest/guide/upgrade.jade b/public/docs/ts/latest/guide/upgrade.jade index f5c349bea6..a10fca16ef 100644 --- a/public/docs/ts/latest/guide/upgrade.jade +++ b/public/docs/ts/latest/guide/upgrade.jade @@ -2152,7 +2152,7 @@ code-example(format=""). its new life as a pure, shiny Angular 2 app. The remaining tasks all have to do with removing code - which of course is every programmer's favorite task! - 是时候把辅助训练的轮子摘下来了！让我们的应用作为一个纯粹、势均力敌的Angular 2程序开始它的新生命吧。 + 是时候把辅助训练的轮子摘下来了！让我们的应用作为一个纯粹、闪亮的Angular 2程序开始它的新生命吧。 剩下的所有任务就是移除代码 —— 这当然是每个程序员最喜欢的任务！ If you haven't already, remove all references to the `UpgradeAdapter` from `main.ts`. diff --git a/public/resources/css/module/_side-nav.scss b/public/resources/css/module/_side-nav.scss index 0372c5de84..25bbd59ba8 100644 --- a/public/resources/css/module/_side-nav.scss +++ b/public/resources/css/module/_side-nav.scss @@ -8,6 +8,7 @@ box-shadow: 3px 0px 6px rgba($coal, .3); width: 232px; bottom: 0px; + height: calc(100vh - 56px); overflow: auto; @media handheld and (max-width: $phone-breakpoint), @@ -148,7 +149,7 @@ screen and (max-device-width: $phone-breakpoint), screen and (max-width: $tablet-breakpoint) { display: none; - max-height: ($phone-breakpoint * 0.60); + //max-height: ($phone-breakpoint * 0.60); } // FLAT NAV (.nav)