From 8aa5181126d9480eef502403aa98e469a3597826 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 23 Sep 2013 13:00:43 -0700 Subject: [PATCH 1/2] move /assets/ to /docs-assets/ ; fixes #10715 --- Gruntfile.js | 2 +- _includes/footer.html | 18 +++++++++--------- _includes/header.html | 12 ++++++------ {assets => docs-assets}/css/docs.css | 0 .../css/pygments-manni.css | 0 .../ico/apple-touch-icon-144-precomposed.png | Bin {assets => docs-assets}/ico/favicon.png | Bin {assets => docs-assets}/js/application.js | 0 {assets => docs-assets}/js/customizer.js | 0 {assets => docs-assets}/js/filesaver.js | 0 {assets => docs-assets}/js/holder.js | 0 {assets => docs-assets}/js/html5shiv.js | 0 {assets => docs-assets}/js/jquery.js | 0 {assets => docs-assets}/js/jszip.js | 0 {assets => docs-assets}/js/less.js | 0 {assets => docs-assets}/js/raw-files.js | 0 {assets => docs-assets}/js/respond.min.js | 0 {assets => docs-assets}/js/uglify.js | 0 examples/carousel/index.html | 10 +++++----- examples/grid/index.html | 6 +++--- examples/jumbotron-narrow/index.html | 6 +++--- examples/jumbotron/index.html | 8 ++++---- examples/justified-nav/index.html | 6 +++--- examples/navbar-fixed-top/index.html | 8 ++++---- examples/navbar-static-top/index.html | 8 ++++---- examples/navbar/index.html | 8 ++++---- examples/non-responsive/index.html | 8 ++++---- examples/offcanvas/index.html | 8 ++++---- examples/signin/index.html | 6 +++--- examples/starter-template/index.html | 8 ++++---- examples/sticky-footer-navbar/index.html | 8 ++++---- examples/sticky-footer/index.html | 6 +++--- examples/theme/index.html | 10 +++++----- getting-started.html | 4 ++-- 34 files changed, 75 insertions(+), 75 deletions(-) rename {assets => docs-assets}/css/docs.css (100%) rename {assets => docs-assets}/css/pygments-manni.css (100%) rename {assets => docs-assets}/ico/apple-touch-icon-144-precomposed.png (100%) rename {assets => docs-assets}/ico/favicon.png (100%) rename {assets => docs-assets}/js/application.js (100%) rename {assets => docs-assets}/js/customizer.js (100%) rename {assets => docs-assets}/js/filesaver.js (100%) rename {assets => docs-assets}/js/holder.js (100%) rename {assets => docs-assets}/js/html5shiv.js (100%) rename {assets => docs-assets}/js/jquery.js (100%) rename {assets => docs-assets}/js/jszip.js (100%) rename {assets => docs-assets}/js/less.js (100%) rename {assets => docs-assets}/js/raw-files.js (100%) rename {assets => docs-assets}/js/respond.min.js (100%) rename {assets => docs-assets}/js/uglify.js (100%) diff --git a/Gruntfile.js b/Gruntfile.js index ccb49ed525d5..cb641c87ee98 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -216,6 +216,6 @@ module.exports = function(grunt) { var customize = fs.readFileSync('customize.html', 'utf-8') var files = getFiles('js') + getFiles('less') + getFiles('fonts') - fs.writeFileSync('assets/js/raw-files.js', files) + fs.writeFileSync('docs-assets/js/raw-files.js', files) }); }; diff --git a/_includes/footer.html b/_includes/footer.html index d187f95d5a85..9e66c58a10e4 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,21 +1,21 @@ - + - + - + {% if page.slug == "customize" %} - - - - - - + + + + + + {% endif %} - - + + - - + + + - + diff --git a/examples/grid/index.html b/examples/grid/index.html index 779eacfe5082..2282d80667d9 100644 --- a/examples/grid/index.html +++ b/examples/grid/index.html @@ -5,7 +5,7 @@ - + Grid Template for Bootstrap @@ -17,8 +17,8 @@ diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html index 270cbdf70ac5..0b45b9e23d75 100644 --- a/examples/jumbotron-narrow/index.html +++ b/examples/jumbotron-narrow/index.html @@ -5,7 +5,7 @@ - + Narrow Jumbotron Template for Bootstrap @@ -17,8 +17,8 @@ diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html index 1032a7e424dc..4cf2f92938a0 100644 --- a/examples/jumbotron/index.html +++ b/examples/jumbotron/index.html @@ -5,7 +5,7 @@ - + Jumbotron Template for Bootstrap @@ -17,8 +17,8 @@ @@ -88,7 +88,7 @@

Heading

- + diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html index d49718c9e21b..f2fd078c9697 100644 --- a/examples/justified-nav/index.html +++ b/examples/justified-nav/index.html @@ -5,7 +5,7 @@ - + Justified Nav Template for Bootstrap @@ -17,8 +17,8 @@ diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html index 1b1c708aa5ff..258a0baf7a5b 100644 --- a/examples/navbar-fixed-top/index.html +++ b/examples/navbar-fixed-top/index.html @@ -5,7 +5,7 @@ - + Fixed Top Navbar Example for Bootstrap @@ -17,8 +17,8 @@ @@ -80,7 +80,7 @@

Navbar example

- + diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html index 6b5e4d35ba12..c921a0d755ad 100644 --- a/examples/navbar-static-top/index.html +++ b/examples/navbar-static-top/index.html @@ -5,7 +5,7 @@ - + Static Top Navbar Example for Bootstrap @@ -17,8 +17,8 @@ @@ -81,7 +81,7 @@

Navbar example

- + diff --git a/examples/navbar/index.html b/examples/navbar/index.html index 8340194457ec..b602cefd7ac2 100644 --- a/examples/navbar/index.html +++ b/examples/navbar/index.html @@ -5,7 +5,7 @@ - + Navbar Template for Bootstrap @@ -17,8 +17,8 @@ @@ -77,7 +77,7 @@

Navbar example

- + diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html index a5fd883bda36..ce8ac517a3b1 100644 --- a/examples/non-responsive/index.html +++ b/examples/non-responsive/index.html @@ -7,7 +7,7 @@ - + Non-responsive Template for Bootstrap @@ -19,8 +19,8 @@ @@ -90,7 +90,7 @@

Non-responsive grid system

- + diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html index 04f01c7f10e8..e967e6933bbb 100644 --- a/examples/offcanvas/index.html +++ b/examples/offcanvas/index.html @@ -5,7 +5,7 @@ - + Off Canvas Template for Bootstrap @@ -17,8 +17,8 @@ @@ -118,7 +118,7 @@

Heading

- + diff --git a/examples/signin/index.html b/examples/signin/index.html index 5c0a4543ab70..de9fd5e3c1f5 100644 --- a/examples/signin/index.html +++ b/examples/signin/index.html @@ -5,7 +5,7 @@ - + Signin Template for Bootstrap @@ -17,8 +17,8 @@ diff --git a/examples/starter-template/index.html b/examples/starter-template/index.html index fc22db662bae..244fe65f5eda 100644 --- a/examples/starter-template/index.html +++ b/examples/starter-template/index.html @@ -5,7 +5,7 @@ - + Starter Template for Bootstrap @@ -17,8 +17,8 @@ @@ -57,7 +57,7 @@

Bootstrap starter template

- + diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html index 551212a80fe8..ea1b1f5a110e 100644 --- a/examples/sticky-footer-navbar/index.html +++ b/examples/sticky-footer-navbar/index.html @@ -5,7 +5,7 @@ - + Sticky Footer Navbar Template for Bootstrap @@ -17,8 +17,8 @@ @@ -80,7 +80,7 @@

Sticky footer with fixed navbar

- + diff --git a/examples/sticky-footer/index.html b/examples/sticky-footer/index.html index aaafbc20d03a..325daa24cbb5 100644 --- a/examples/sticky-footer/index.html +++ b/examples/sticky-footer/index.html @@ -5,7 +5,7 @@ - + Sticky Footer Template for Bootstrap @@ -17,8 +17,8 @@ diff --git a/examples/theme/index.html b/examples/theme/index.html index a0f3128bfe2d..dbc4fdaddbca 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -5,7 +5,7 @@ - + Theme Template for Bootstrap @@ -19,8 +19,8 @@ @@ -346,8 +346,8 @@

Wells

- + - + diff --git a/getting-started.html b/getting-started.html index 80069c45cf06..8c1652e00072 100644 --- a/getting-started.html +++ b/getting-started.html @@ -109,8 +109,8 @@

Basic template

From f503efc49086becc312665000fcbce4b9df3750d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 23 Sep 2013 13:01:11 -0700 Subject: [PATCH 2/2] avoid using the term "assets" due to potential confusion --- getting-started.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getting-started.html b/getting-started.html index 8c1652e00072..4cc0aa4fe545 100644 --- a/getting-started.html +++ b/getting-started.html @@ -61,7 +61,7 @@

Compiling Bootstrap's LESS files

What's included

-

Within the download you'll find the following directories and files, logically grouping common assets and providing both compiled and minified variations.

+

Within the download you'll find the following directories and files, logically grouping common resources and providing both compiled and minified variations.

Once downloaded, unzip the compressed folder to see the structure of (the compiled) Bootstrap. You'll see something like this:

{% highlight bash %}