iSharkFly-Docs
/
angular-docs-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Zhicheng Wang 2016-09-16 08:04:09 +08:00
parent 10fc639366 e56bae4a8c
commit a4d26e0797
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -10,7 +10,8 @@ env:
- DBUS_SESSION_BUS_ADDRESS=/dev/null - DBUS_SESSION_BUS_ADDRESS=/dev/null
- DISPLAY=:99.0 - DISPLAY=:99.0
- CHROME_BIN=chromium-browser - 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" - TASK_FLAGS="--dgeni-log=warn"
matrix: matrix:
- TASK=lint - TASK=lint

2
public/_includes/_main-nav.jade
View File

@ -1,7 +1,7 @@
- var language = current.path[1] || 'ts' - var language = current.path[1] || 'ts'
- if (language !== 'ts' || language !== 'js' || language !== 'dart') { language = '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 <a href="/" md-button>Angular <sup>by Google</sup></a> h1 <a href="/" md-button>Angular <sup>by Google</sup></a>
button(class="main-nav-button main-nav-mobile-trigger l-right" aria-label="查看菜单" ng-click="appCtrl.toggleMainMenu($event)" md-button) 网站菜单 <span class="icon icon-arrow-drop-down"></span> button(class="main-nav-button main-nav-mobile-trigger l-right" aria-label="查看菜单" ng-click="appCtrl.toggleMainMenu($event)" md-button) 网站菜单 <span class="icon icon-arrow-drop-down"></span>

3
scripts/deploy-install.sh
View File

@ -10,7 +10,8 @@ else
travis_fold start install.ng2 travis_fold start install.ng2
echo GETTING Angular2 from GitHub ... echo GETTING Angular2 from GitHub ...
set -x 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 set +x
travis_fold end install.ng2 travis_fold end install.ng2
fi fi