From a9c829bc0c75dd7723e6c74e1defaab5dbb4c00b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 28 Dec 2013 22:47:03 -0800 Subject: [PATCH] Rearrange repository contents because muahahahahahaha --- Gruntfile.js | 32 +- _config.yml | 32 +- DOCS-LICENSE => docs/LICENSE-DOCS | 0 {_data => docs/_data}/glyphicons.yml | 0 {_includes => docs/_includes}/ads.html | 0 {_includes => docs/_includes}/footer.html | 10 +- {_includes => docs/_includes}/header.html | 12 +- {_includes => docs/_includes}/nav-about.html | 0 .../_includes}/nav-components.html | 0 {_includes => docs/_includes}/nav-css.html | 0 .../_includes}/nav-customize.html | 0 .../_includes}/nav-getting-started.html | 0 .../_includes}/nav-javascript.html | 0 {_includes => docs/_includes}/nav-main.html | 14 +- .../_includes}/old-bs-docs.html | 2 +- .../_includes}/social-buttons.html | 0 {_layouts => docs/_layouts}/default.html | 2 +- {_layouts => docs/_layouts}/home.html | 4 +- about.html => docs/about.html | 0 {docs-assets => docs/assets}/css/docs.css | 0 .../assets}/css/pygments-manni.css | 0 .../ico/apple-touch-icon-144-precomposed.png | Bin {docs-assets => docs/assets}/ico/favicon.ico | Bin .../assets}/js/application.js | 0 {docs-assets => docs/assets}/js/customize.js | 0 {docs-assets => docs/assets}/js/customizer.js | 0 {docs-assets => docs/assets}/js/filesaver.js | 0 {docs-assets => docs/assets}/js/holder.js | 0 .../assets}/js/ie8-responsive-file-warning.js | 0 {docs-assets => docs/assets}/js/jszip.js | 0 {docs-assets => docs/assets}/js/less.js | 0 {docs-assets => docs/assets}/js/raw-files.js | 0 {docs-assets => docs/assets}/js/uglify.js | 0 components.html => docs/components.html | 4 +- css.html => docs/css.html | 6 +- customize.html => docs/customize.html | 0 docs/dist/css/bootstrap-theme.css | 347 + docs/dist/css/bootstrap-theme.css.map | 1 + docs/dist/css/bootstrap-theme.min.css | 7 + docs/dist/css/bootstrap.css | 5766 +++++++++++++++++ docs/dist/css/bootstrap.css.map | 1 + docs/dist/css/bootstrap.min.css | 7 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20290 bytes .../fonts/glyphicons-halflings-regular.svg | 229 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41236 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23292 bytes docs/dist/js/bootstrap.js | 1924 ++++++ docs/dist/js/bootstrap.min.js | 7 + {examples => docs/examples}/blog/blog.css | 0 {examples => docs/examples}/blog/index.html | 0 .../examples}/carousel/carousel.css | 0 .../examples}/carousel/index.html | 0 {examples => docs/examples}/cover/cover.css | 0 {examples => docs/examples}/cover/index.html | 0 .../examples}/dashboard/dashboard.css | 0 .../examples}/dashboard/index.html | 0 {examples => docs/examples}/grid/grid.css | 0 {examples => docs/examples}/grid/index.html | 0 .../examples}/jumbotron-narrow/index.html | 0 .../jumbotron-narrow/jumbotron-narrow.css | 0 .../examples}/jumbotron/index.html | 0 .../examples}/jumbotron/jumbotron.css | 0 .../examples}/justified-nav/index.html | 0 .../examples}/justified-nav/justified-nav.css | 0 .../examples}/navbar-fixed-top/index.html | 0 .../navbar-fixed-top/navbar-fixed-top.css | 0 .../examples}/navbar-static-top/index.html | 0 .../navbar-static-top/navbar-static-top.css | 0 {examples => docs/examples}/navbar/index.html | 0 {examples => docs/examples}/navbar/navbar.css | 0 .../examples}/non-responsive/index.html | 0 .../non-responsive/non-responsive.css | 0 .../examples}/offcanvas/index.html | 0 .../examples}/offcanvas/offcanvas.css | 0 .../examples}/offcanvas/offcanvas.js | 0 .../examples}/screenshots/blog.jpg | Bin .../examples}/screenshots/carousel.jpg | Bin .../examples}/screenshots/cover.jpg | Bin .../examples}/screenshots/dashboard.jpg | Bin .../examples}/screenshots/grid.jpg | Bin .../screenshots/jumbotron-narrow.jpg | Bin .../examples}/screenshots/jumbotron.jpg | Bin .../examples}/screenshots/justified-nav.jpg | Bin .../examples}/screenshots/navbar-fixed.jpg | Bin .../examples}/screenshots/navbar-static.jpg | Bin .../examples}/screenshots/navbar.jpg | Bin .../examples}/screenshots/non-responsive.jpg | Bin .../examples}/screenshots/offcanvas.jpg | Bin .../examples}/screenshots/sign-in.jpg | Bin .../screenshots/starter-template.jpg | Bin .../screenshots/sticky-footer-navbar.jpg | Bin .../examples}/screenshots/sticky-footer.jpg | Bin .../examples}/screenshots/theme.jpg | Bin {examples => docs/examples}/signin/index.html | 0 {examples => docs/examples}/signin/signin.css | 0 .../examples}/starter-template/index.html | 0 .../starter-template/starter-template.css | 0 .../examples}/sticky-footer-navbar/index.html | 0 .../sticky-footer-navbar.css | 0 .../examples}/sticky-footer/index.html | 0 .../examples}/sticky-footer/sticky-footer.css | 0 {examples => docs/examples}/theme/index.html | 0 {examples => docs/examples}/theme/theme.css | 0 .../getting-started.html | 15 +- index.html => docs/index.html | 4 +- javascript.html => docs/javascript.html | 4 +- 106 files changed, 8357 insertions(+), 73 deletions(-) rename DOCS-LICENSE => docs/LICENSE-DOCS (100%) rename {_data => docs/_data}/glyphicons.yml (100%) rename {_includes => docs/_includes}/ads.html (100%) rename {_includes => docs/_includes}/footer.html (79%) rename {_includes => docs/_includes}/header.html (76%) rename {_includes => docs/_includes}/nav-about.html (100%) rename {_includes => docs/_includes}/nav-components.html (100%) rename {_includes => docs/_includes}/nav-css.html (100%) rename {_includes => docs/_includes}/nav-customize.html (100%) rename {_includes => docs/_includes}/nav-getting-started.html (100%) rename {_includes => docs/_includes}/nav-javascript.html (100%) rename {_includes => docs/_includes}/nav-main.html (72%) rename {_includes => docs/_includes}/old-bs-docs.html (74%) rename {_includes => docs/_includes}/social-buttons.html (100%) rename {_layouts => docs/_layouts}/default.html (97%) rename {_layouts => docs/_layouts}/home.html (84%) rename about.html => docs/about.html (100%) rename {docs-assets => docs/assets}/css/docs.css (100%) rename {docs-assets => docs/assets}/css/pygments-manni.css (100%) rename {docs-assets => docs/assets}/ico/apple-touch-icon-144-precomposed.png (100%) rename {docs-assets => docs/assets}/ico/favicon.ico (100%) rename {docs-assets => docs/assets}/js/application.js (100%) rename {docs-assets => docs/assets}/js/customize.js (100%) rename {docs-assets => docs/assets}/js/customizer.js (100%) rename {docs-assets => docs/assets}/js/filesaver.js (100%) rename {docs-assets => docs/assets}/js/holder.js (100%) rename {docs-assets => docs/assets}/js/ie8-responsive-file-warning.js (100%) rename {docs-assets => docs/assets}/js/jszip.js (100%) rename {docs-assets => docs/assets}/js/less.js (100%) rename {docs-assets => docs/assets}/js/raw-files.js (100%) rename {docs-assets => docs/assets}/js/uglify.js (100%) rename components.html => docs/components.html (99%) rename css.html => docs/css.html (99%) rename customize.html => docs/customize.html (100%) create mode 100644 docs/dist/css/bootstrap-theme.css create mode 100644 docs/dist/css/bootstrap-theme.css.map create mode 100644 docs/dist/css/bootstrap-theme.min.css create mode 100644 docs/dist/css/bootstrap.css create mode 100644 docs/dist/css/bootstrap.css.map create mode 100644 docs/dist/css/bootstrap.min.css create mode 100644 docs/dist/fonts/glyphicons-halflings-regular.eot create mode 100644 docs/dist/fonts/glyphicons-halflings-regular.svg create mode 100644 docs/dist/fonts/glyphicons-halflings-regular.ttf create mode 100644 docs/dist/fonts/glyphicons-halflings-regular.woff create mode 100644 docs/dist/js/bootstrap.js create mode 100644 docs/dist/js/bootstrap.min.js rename {examples => docs/examples}/blog/blog.css (100%) rename {examples => docs/examples}/blog/index.html (100%) rename {examples => docs/examples}/carousel/carousel.css (100%) rename {examples => docs/examples}/carousel/index.html (100%) rename {examples => docs/examples}/cover/cover.css (100%) rename {examples => docs/examples}/cover/index.html (100%) rename {examples => docs/examples}/dashboard/dashboard.css (100%) rename {examples => docs/examples}/dashboard/index.html (100%) rename {examples => docs/examples}/grid/grid.css (100%) rename {examples => docs/examples}/grid/index.html (100%) rename {examples => docs/examples}/jumbotron-narrow/index.html (100%) rename {examples => docs/examples}/jumbotron-narrow/jumbotron-narrow.css (100%) rename {examples => docs/examples}/jumbotron/index.html (100%) rename {examples => docs/examples}/jumbotron/jumbotron.css (100%) rename {examples => docs/examples}/justified-nav/index.html (100%) rename {examples => docs/examples}/justified-nav/justified-nav.css (100%) rename {examples => docs/examples}/navbar-fixed-top/index.html (100%) rename {examples => docs/examples}/navbar-fixed-top/navbar-fixed-top.css (100%) rename {examples => docs/examples}/navbar-static-top/index.html (100%) rename {examples => docs/examples}/navbar-static-top/navbar-static-top.css (100%) rename {examples => docs/examples}/navbar/index.html (100%) rename {examples => docs/examples}/navbar/navbar.css (100%) rename {examples => docs/examples}/non-responsive/index.html (100%) rename {examples => docs/examples}/non-responsive/non-responsive.css (100%) rename {examples => docs/examples}/offcanvas/index.html (100%) rename {examples => docs/examples}/offcanvas/offcanvas.css (100%) rename {examples => docs/examples}/offcanvas/offcanvas.js (100%) rename {examples => docs/examples}/screenshots/blog.jpg (100%) rename {examples => docs/examples}/screenshots/carousel.jpg (100%) rename {examples => docs/examples}/screenshots/cover.jpg (100%) rename {examples => docs/examples}/screenshots/dashboard.jpg (100%) rename {examples => docs/examples}/screenshots/grid.jpg (100%) rename {examples => docs/examples}/screenshots/jumbotron-narrow.jpg (100%) rename {examples => docs/examples}/screenshots/jumbotron.jpg (100%) rename {examples => docs/examples}/screenshots/justified-nav.jpg (100%) rename {examples => docs/examples}/screenshots/navbar-fixed.jpg (100%) rename {examples => docs/examples}/screenshots/navbar-static.jpg (100%) rename {examples => docs/examples}/screenshots/navbar.jpg (100%) rename {examples => docs/examples}/screenshots/non-responsive.jpg (100%) rename {examples => docs/examples}/screenshots/offcanvas.jpg (100%) rename {examples => docs/examples}/screenshots/sign-in.jpg (100%) rename {examples => docs/examples}/screenshots/starter-template.jpg (100%) rename {examples => docs/examples}/screenshots/sticky-footer-navbar.jpg (100%) rename {examples => docs/examples}/screenshots/sticky-footer.jpg (100%) rename {examples => docs/examples}/screenshots/theme.jpg (100%) rename {examples => docs/examples}/signin/index.html (100%) rename {examples => docs/examples}/signin/signin.css (100%) rename {examples => docs/examples}/starter-template/index.html (100%) rename {examples => docs/examples}/starter-template/starter-template.css (100%) rename {examples => docs/examples}/sticky-footer-navbar/index.html (100%) rename {examples => docs/examples}/sticky-footer-navbar/sticky-footer-navbar.css (100%) rename {examples => docs/examples}/sticky-footer/index.html (100%) rename {examples => docs/examples}/sticky-footer/sticky-footer.css (100%) rename {examples => docs/examples}/theme/index.html (100%) rename {examples => docs/examples}/theme/theme.css (100%) rename getting-started.html => docs/getting-started.html (99%) rename index.html => docs/index.html (82%) rename javascript.html => docs/javascript.html (99%) diff --git a/Gruntfile.js b/Gruntfile.js index 6107ecafd7..403eb07aeb 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -41,7 +41,7 @@ module.exports = function (grunt) { src: ['js/tests/unit/*.js'] }, assets: { - src: ['docs-assets/js/application.js', 'docs-assets/js/customizer.js'] + src: ['docs/assets/js/application.js', 'docs/assets/js/customizer.js'] } }, @@ -67,7 +67,7 @@ module.exports = function (grunt) { src: [ 'dist/css/bootstrap.css', 'dist/css/bootstrap-theme.css', - 'docs-assets/css/docs.css' + 'docs/assets/css/docs.css' ] }, @@ -115,13 +115,13 @@ module.exports = function (grunt) { report: 'min' }, src: [ - 'docs-assets/js/less.js', - 'docs-assets/js/jszip.js', - 'docs-assets/js/uglify.js', - 'docs-assets/js/filesaver.js', - 'docs-assets/js/customizer.js' + 'docs/assets/js/less.js', + 'docs/assets/js/jszip.js', + 'docs/assets/js/uglify.js', + 'docs/assets/js/filesaver.js', + 'docs/assets/js/customizer.js' ], - dest: 'docs-assets/js/customize.js' + dest: 'docs/assets/js/customize.js' } }, @@ -196,6 +196,12 @@ module.exports = function (grunt) { expand: true, src: ['fonts/*'], dest: 'dist/' + }, + docs: { + expand: true, + cwd: './dist/', + src: ['**'], + dest: './docs/dist/' } }, @@ -306,10 +312,10 @@ module.exports = function (grunt) { grunt.registerTask('dist-css', ['less', 'csscomb', 'usebanner']); // Fonts distribution task. - grunt.registerTask('dist-fonts', ['copy']); + grunt.registerTask('dist-docs', ['copy']); // Full distribution task. - grunt.registerTask('dist', ['clean', 'dist-css', 'dist-fonts', 'dist-js']); + grunt.registerTask('dist', ['clean', 'dist-css', 'dist-docs', 'dist-js']); // Default task. grunt.registerTask('default', ['test', 'dist', 'build-glyphicons-data', 'build-customizer']); @@ -340,9 +346,9 @@ module.exports = function (grunt) { } // Create the `_data` directory if it doesn't already exist - if (!fs.existsSync('_data')) fs.mkdirSync('_data') + if (!fs.existsSync('docs/_data')) fs.mkdirSync('docs/_data') - fs.writeFileSync('_data/glyphicons.yml', glyphiconsData) + fs.writeFileSync('docs/_data/glyphicons.yml', glyphiconsData) }); // task for building customizer @@ -363,6 +369,6 @@ module.exports = function (grunt) { } var files = getFiles('js') + getFiles('less') + getFiles('fonts') - fs.writeFileSync('docs-assets/js/raw-files.js', files) + fs.writeFileSync('docs/assets/js/raw-files.js', files) }); }; diff --git a/_config.yml b/_config.yml index 693f22a205..b6e18adbea 100644 --- a/_config.yml +++ b/_config.yml @@ -6,36 +6,26 @@ pygments: true permalink: pretty # Server +source: ./docs destination: ./_gh_pages +host: 0.0.0.0 port: 9001 -exclude: -- ".editorconfig" -- ".gitignore" -- "bower.json" -- "CNAME" -- "composer.json" -- "CONTRIBUTING.md" -- "DOCS-LICENSE" -- "Gruntfile.js" -- "less" -- "LICENSE" -- "node_modules" -- "package.json" -- "README.md" -- "sauce_browsers.yml" -- "test-infra" +baseurl: / +url: http://localhost:9001 # Custom vars current_version: 3.0.3 repo: https://github.com/twbs/bootstrap -download_source: https://github.com/twbs/bootstrap/archive/v3.0.3.zip -download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip +download: + source: https://github.com/twbs/bootstrap/archive/v3.0.3.zip + dist: https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip blog: http://blog.getbootstrap.com expo: http://expo.getbootstrap.com sass_repo: https://github.com/twbs/bootstrap-sass -cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css -cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css -cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js +cdn: + css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css + css_theme: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css + js: //netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js diff --git a/DOCS-LICENSE b/docs/LICENSE-DOCS similarity index 100% rename from DOCS-LICENSE rename to docs/LICENSE-DOCS diff --git a/_data/glyphicons.yml b/docs/_data/glyphicons.yml similarity index 100% rename from _data/glyphicons.yml rename to docs/_data/glyphicons.yml diff --git a/_includes/ads.html b/docs/_includes/ads.html similarity index 100% rename from _includes/ads.html rename to docs/_includes/ads.html diff --git a/_includes/footer.html b/docs/_includes/footer.html similarity index 79% rename from _includes/footer.html rename to docs/_includes/footer.html index 095e96eb59..b8e19b5234 100644 --- a/_includes/footer.html +++ b/docs/_includes/footer.html @@ -2,15 +2,15 @@ ================================================== --> - + - + - + {% if page.slug == "customize" %} - - + + {% endif %} {% comment %} diff --git a/_includes/header.html b/docs/_includes/header.html similarity index 76% rename from _includes/header.html rename to docs/_includes/header.html index 1275979f70..3b64958974 100644 --- a/_includes/header.html +++ b/docs/_includes/header.html @@ -14,12 +14,12 @@ - + - - - + + + - - + + + {% endhighlight %}
@@ -103,12 +102,12 @@ bootstrap/ │ ├── css/ │ ├── js/ │ └── fonts/ -├── docs-assets/ +├── docs/assets/ ├── examples/ └── *.html {% endhighlight %}
-

The less/, js/, and fonts/ are the source code for our CSS, JS, and icon fonts (respectively). The dist/ folder includes everything listed in the precompiled download section above. docs-assets/, examples/, and all *.html files are for our documentation. Beyond that, any other included file provides support for packages, license information, and development.

+

The less/, js/, and fonts/ are the source code for our CSS, JS, and icon fonts (respectively). The dist/ folder includes everything listed in the precompiled download section above. docs/assets/, examples/, and all *.html files are for our documentation. Beyond that, any other included file provides support for packages, license information, and development.