diff --git a/.travis.yml b/.travis.yml index 50d2691978..c8c12208bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,8 @@ env: - DBUS_SESSION_BUS_ADDRESS=/dev/null - DISPLAY=:99.0 - CHROME_BIN=chromium-browser - - LATEST_RELEASE=2.0.0 + # using SHA instead of version to fix build-compile issue + - LATEST_RELEASE=cfc12c653970c9ad6d807a6a8ebff58edbc568a0 - TASK_FLAGS="--dgeni-log=warn" matrix: - TASK=lint diff --git a/public/_includes/_main-nav.jade b/public/_includes/_main-nav.jade index 59435d9132..c484490d21 100644 --- a/public/_includes/_main-nav.jade +++ b/public/_includes/_main-nav.jade @@ -1,7 +1,7 @@ - var language = current.path[1] || 'ts' - if (language !== 'ts' || language !== 'js' || language !== 'dart') { language = 'ts'; } -nav.main-nav.l-pinned-top.l-layer-5 +nav(class="main-nav l-pinned-top l-layer-5", scroll-y-offset-element) h1 Angular by Google button(class="main-nav-button main-nav-mobile-trigger l-right" aria-label="查看菜单" ng-click="appCtrl.toggleMainMenu($event)" md-button) 网站菜单 diff --git a/scripts/deploy-install.sh b/scripts/deploy-install.sh index f34a158fbf..67c6ddd67f 100755 --- a/scripts/deploy-install.sh +++ b/scripts/deploy-install.sh @@ -10,7 +10,8 @@ else travis_fold start install.ng2 echo GETTING Angular2 from GitHub ... set -x - git clone https://github.com/angular/angular.git --branch $LATEST_RELEASE $NG2_REPO + git clone https://github.com/angular/angular.git $NG2_REPO + git -C $NG2_REPO checkout $LATEST_RELEASE set +x travis_fold end install.ng2 fi