diff --git a/docs/app/src/app.js b/docs/app/src/app.js index e75174f6..53ef4881 100644 --- a/docs/app/src/app.js +++ b/docs/app/src/app.js @@ -1,7 +1,5 @@ angular.module('docsApp', [ - 'ngRoute', - 'ngSanitize', - 'ngAnimate', + 'ngMaterial', 'DocsController', 'versionsData', 'pagesData', @@ -11,9 +9,7 @@ angular.module('docsApp', [ 'examples', 'search', 'tutorials', - 'versions', - 'bootstrap', - 'ui.bootstrap.dropdown' + 'versions' ]) .config(['$locationProvider', function($locationProvider) { diff --git a/docs/bower.json b/docs/bower.json index db88bffd..5019aace 100644 --- a/docs/bower.json +++ b/docs/bower.json @@ -3,8 +3,8 @@ "dependencies": { "jquery": "2.1.1", "lunr.js": "0.4.3", - "open-sans-fontface": "1.0.4", "google-code-prettify": "1.0.1", - "bootstrap": "3.1.1" + "angular-material": "master", + "angular-sanitize": "1.3.x" } } diff --git a/docs/config/services/deployments/debug.js b/docs/config/services/deployments/debug.js index d97711e8..3f2340ea 100644 --- a/docs/config/services/deployments/debug.js +++ b/docs/config/services/deployments/debug.js @@ -1,6 +1,6 @@ "use strict"; -module.exports = function debugDeployment(getVersion) { +module.exports = function debugDeployment(getComponentPath) { return { name: 'debug', examples: { @@ -10,27 +10,23 @@ module.exports = function debugDeployment(getVersion) { dependencyPath: '../../../' }, scripts: [ - '../angular.js', - '../angular-resource.js', - '../angular-route.js', - '../angular-cookies.js', - '../angular-sanitize.js', - '../angular-touch.js', - '../angular-animate.js', - 'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js', - 'js/angular-bootstrap/bootstrap.js', - 'js/angular-bootstrap/dropdown-toggle.js', - 'components/lunr.js-' + getVersion('lunr.js') + '/lunr.js', - 'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js', - 'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js', + getComponentPath('hammerjs', 'hammer.js'), + getComponentPath('angular'), + getComponentPath('angular-animate'), + getComponentPath('angular-aria'), + getComponentPath('angular-material'), + getComponentPath('angular-sanitize'), + getComponentPath('marked', 'lib/marked.js', 'node_modules', 'package.json'), + getComponentPath('lunr.js', 'lunr.js'), + getComponentPath('google-code-prettify', 'src/prettify.js'), + getComponentPath('google-code-prettify', 'src/lang-css.js'), 'js/versions-data.js', 'js/pages-data.js', 'js/nav-data.js', 'js/docs.js' ], stylesheets: [ - 'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.css', - 'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css', + getComponentPath('angular-material', 'angular-material.css'), 'css/prettify-theme.css', 'css/docs.css', 'css/animations.css' diff --git a/docs/config/services/deployments/default.js b/docs/config/services/deployments/default.js index 3765fdf4..0355be8f 100644 --- a/docs/config/services/deployments/default.js +++ b/docs/config/services/deployments/default.js @@ -1,6 +1,6 @@ "use strict"; -module.exports = function defaultDeployment(getVersion) { +module.exports = function defaultDeployment(getComponentPath) { return { name: 'default', examples: { @@ -10,27 +10,23 @@ module.exports = function defaultDeployment(getVersion) { dependencyPath: '../../../' }, scripts: [ - '../angular.min.js', - '../angular-resource.min.js', - '../angular-route.min.js', - '../angular-cookies.min.js', - '../angular-sanitize.min.js', - '../angular-touch.min.js', - '../angular-animate.min.js', - 'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js', - 'js/angular-bootstrap/bootstrap.min.js', - 'js/angular-bootstrap/dropdown-toggle.min.js', - 'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js', - 'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js', - 'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js', + getComponentPath('hammerjs', 'hammer.js'), + getComponentPath('angular'), + getComponentPath('angular-animate'), + getComponentPath('angular-aria'), + getComponentPath('angular-material'), + getComponentPath('angular-sanitize'), + getComponentPath('marked', 'lib/marked.js', 'node_modules', 'package.json'), + getComponentPath('lunr.js', 'lunr.min.js'), + getComponentPath('google-code-prettify', 'src/prettify.js'), + getComponentPath('google-code-prettify', 'src/lang-css.js'), 'js/versions-data.js', 'js/pages-data.js', 'js/nav-data.js', 'js/docs.min.js' ], stylesheets: [ - 'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css', - 'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css', + getComponentPath('angular-material', 'angular-material.css'), 'css/prettify-theme.css', 'css/docs.css', 'css/animations.css' diff --git a/docs/config/services/deployments/jquery.js b/docs/config/services/deployments/jquery.js index a5447306..1b6650ba 100644 --- a/docs/config/services/deployments/jquery.js +++ b/docs/config/services/deployments/jquery.js @@ -1,40 +1,36 @@ "use strict"; -module.exports = function jqueryDeployment(getVersion) { +module.exports = function jqueryDeployment(getComponentPath) { return { name: 'jquery', examples: { commonFiles: { scripts: [ - '../../components/jquery-' + getVersion('jquery') + '/jquery.js', + '../../' + getComponentPath('jquery'), '../../../angular.js' ] }, dependencyPath: '../../../' }, scripts: [ - 'components/jquery-' + getVersion('jquery') + '/jquery.js', - '../angular.min.js', - '../angular-resource.min.js', - '../angular-route.min.js', - '../angular-cookies.min.js', - '../angular-sanitize.min.js', - '../angular-touch.min.js', - '../angular-animate.min.js', - 'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js', - 'js/angular-bootstrap/bootstrap.min.js', - 'js/angular-bootstrap/dropdown-toggle.min.js', - 'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js', - 'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js', - 'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js', + getComponentPath('jquery'), + getComponentPath('hammerjs', 'hammer.js'), + getComponentPath('angular'), + getComponentPath('angular-animate'), + getComponentPath('angular-aria'), + getComponentPath('angular-material'), + getComponentPath('angular-sanitize'), + getComponentPath('marked', 'lib/marked.js', 'node_modules', 'package.json'), + getComponentPath('lunr.js', 'lunr.min.js'), + getComponentPath('google-code-prettify', 'src/prettify.js'), + getComponentPath('google-code-prettify', 'src/lang-css.js'), 'js/versions-data.js', 'js/pages-data.js', 'js/nav-data.js', 'js/docs.min.js' ], stylesheets: [ - 'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css', - 'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css', + getComponentPath('angular-material', 'angular-material.css'), 'css/prettify-theme.css', 'css/docs.css', 'css/animations.css' diff --git a/docs/config/services/deployments/production.js b/docs/config/services/deployments/production.js index 237c53e9..bc029fa9 100644 --- a/docs/config/services/deployments/production.js +++ b/docs/config/services/deployments/production.js @@ -21,8 +21,6 @@ module.exports = function productionDeployment(getVersion) { cdnUrl + '/angular-touch.min.js', cdnUrl + '/angular-animate.min.js', 'components/marked-' + getVersion('marked', 'node_modules', 'package.json') + '/lib/marked.js', - 'js/angular-bootstrap/bootstrap.min.js', - 'js/angular-bootstrap/dropdown-toggle.min.js', 'components/lunr.js-' + getVersion('lunr.js') + '/lunr.min.js', 'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/prettify.js', 'components/google-code-prettify-' + getVersion('google-code-prettify') + '/src/lang-css.js', @@ -32,8 +30,6 @@ module.exports = function productionDeployment(getVersion) { 'js/docs.min.js' ], stylesheets: [ - 'components/bootstrap-' + getVersion('bootstrap') + '/css/bootstrap.min.css', - 'components/open-sans-fontface-' + getVersion('open-sans-fontface') + '/open-sans.css', 'css/prettify-theme.css', 'css/docs.css', 'css/animations.css' diff --git a/docs/gulpfile.js b/docs/gulpfile.js index 4df668a6..df6d9612 100644 --- a/docs/gulpfile.js +++ b/docs/gulpfile.js @@ -77,11 +77,14 @@ gulp.task('assets', ['bower'], function() { .pipe(gulp.dest(outputFolder)); } })), - copyComponent('bootstrap', '/dist/**/*'), - copyComponent('open-sans-fontface'), + copyComponent('angular'), + copyComponent('angular-animate'), + copyComponent('angular-aria'), + copyComponent('angular-material'), + copyComponent('angular-sanitize'), + copyComponent('hammerjs'), copyComponent('lunr.js','/*.js'), copyComponent('google-code-prettify'), - copyComponent('jquery', '/dist/*.js'), copyComponent('marked', '/**/*.js', '../node_modules', 'package.json') ); });