Skip to content

Commit 8ec0a61

Browse files
committed
Merge pull request #880 from angular-ui/ngdoc
chore(ngdoc): More complete ngdoc site.
2 parents f8f7682 + 0797724 commit 8ec0a61

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+626
-10571
lines changed

Gruntfile.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ module.exports = function (grunt) {
105105
dest: 'site',
106106
html5Mode: false,
107107
title: 'UI Router',
108-
startPage: '/api',
108+
startPage: '/api/ui.router',
109+
navTemplate: 'ngdoc_assets/docnav.html'
109110
},
110111
api: {
111112
src: ['src/**/*.js'],
@@ -117,7 +118,8 @@ module.exports = function (grunt) {
117118
grunt.registerTask('integrate', ['build', 'jshint', 'karma:unit', 'karma:past', 'karma:unstable']);
118119
grunt.registerTask('default', ['build', 'jshint', 'karma:unit']);
119120
grunt.registerTask('build', 'Perform a normal build', ['concat', 'uglify']);
120-
grunt.registerTask('dist', 'Perform a clean build and generate documentation', ['clean', 'build', 'ngdocs']);
121+
grunt.registerTask('dist', 'Perform a clean build', ['clean', 'build']);
122+
grunt.registerTask('dist-pages', 'Perform a clean build and generate documentation', ['dist', 'ngdocs']);
121123
grunt.registerTask('release', 'Tag and perform a release', ['prepare-release', 'dist', 'perform-release']);
122124
grunt.registerTask('dev', 'Run dev server and watch for changes', ['build', 'connect:server', 'karma:background', 'watch']);
123125
grunt.registerTask('sample', 'Run connect server with keepalive:true for sample app development', ['connect:sample']);
@@ -130,7 +132,7 @@ module.exports = function (grunt) {
130132
}).then(function () {
131133
return system('git merge master');
132134
}).then(function () {
133-
return system('grunt dist');
135+
return system('grunt dist-pages');
134136
}).then(function () {
135137
return system('git commit -a -m \'Automatic gh-pages build\'');
136138
}).then(function () {

bower.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"config",
1616
"sample",
1717
"test",
18-
"tests"
18+
"tests",
19+
"ngdoc_assets"
1920
]
2021
}

ngdoc_assets/StateGoExamples.png

58.9 KB
Loading

ngdoc_assets/docnav.html

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<ul class="nav pull-right">
2+
<li><a href="http://angular-ui.github.io/ui-router/sample/"><i class="icon-rocket icon-white"></i> Sample App</a></li>
3+
<li><a href="https://github.com/angular-ui/ui-router/wiki/Frequently-Asked-Questions"><i class="icon-question-sign icon-white"></i> FAQ</a></li>
4+
</ul>

site/css/animations.css

-76
This file was deleted.

0 commit comments

Comments
 (0)