Merge pull request #10770 from twbs/rename-assets

move /assets/ to /docs-assets/ ; fixes #10715
twbs · Sep 24, 2013 · 62c9199 · 62c9199
2 parents 5911d95 + f503efc
commit 62c9199
Show file tree

Hide file tree

Showing 34 changed files with 76 additions and 76 deletions.
diff --git 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
@@ -1,21 +1,21 @@
 <!-- Bootstrap core JavaScript
 ================================================== -->
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="{{ page.base_url }}assets/js/jquery.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/jquery.js"></script>
 <script src="{{ page.base_url }}dist/js/bootstrap.js"></script>
 
 <script src="http://platform.twitter.com/widgets.js"></script>
-<script src="{{ page.base_url }}assets/js/holder.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/holder.js"></script>
 
-<script src="{{ page.base_url }}assets/js/application.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/application.js"></script>
 
 {% if page.slug == "customize" %}
-<script src="{{ page.base_url }}assets/js/less.js"></script>
-<script src="{{ page.base_url }}assets/js/jszip.js"></script>
-<script src="{{ page.base_url }}assets/js/uglify.js"></script>
-<script src="{{ page.base_url }}assets/js/filesaver.js"></script>
-<script src="{{ page.base_url }}assets/js/raw-files.js"></script>
-<script src="{{ page.base_url }}assets/js/customizer.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/less.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/jszip.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/uglify.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/filesaver.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/raw-files.js"></script>
+<script src="{{ page.base_url }}docs-assets/js/customizer.js"></script>
 {% endif %}
 
 <!-- Analytics

diff --git a/_includes/header.html b/_includes/header.html
@@ -15,18 +15,18 @@
 <link href="{{ page.base_url }}dist/css/bootstrap.css" rel="stylesheet">
 
 <!-- Documentation extras -->
-<link href="{{ page.base_url }}assets/css/docs.css" rel="stylesheet">
-<link href="{{ page.base_url }}assets/css/pygments-manni.css" rel="stylesheet">
+<link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet">
+<link href="{{ page.base_url }}docs-assets/css/pygments-manni.css" rel="stylesheet">
 
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
-  <script src="{{ page.base_url }}assets/js/html5shiv.js"></script>
-  <script src="{{ page.base_url }}assets/js/respond.min.js"></script>
+  <script src="{{ page.base_url }}docs-assets/js/html5shiv.js"></script>
+  <script src="{{ page.base_url }}docs-assets/js/respond.min.js"></script>
 <![endif]-->
 
 <!-- Favicons -->
-<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}assets/ico/apple-touch-icon-144-precomposed.png">
-                               <link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png">
+<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}docs-assets/ico/apple-touch-icon-144-precomposed.png">
+                               <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.png">
 
 <script>
   var _gaq = _gaq || [];

diff --git a/assets/css/docs.css → docs-assets/css/docs.css b/assets/css/docs.css → docs-assets/css/docs.css
diff --git a/assets/css/pygments-manni.css → docs-assets/css/pygments-manni.css b/assets/css/pygments-manni.css → docs-assets/css/pygments-manni.css
diff --git a/.../ico/apple-touch-icon-144-precomposed.png → .../ico/apple-touch-icon-144-precomposed.png b/.../ico/apple-touch-icon-144-precomposed.png → .../ico/apple-touch-icon-144-precomposed.png
diff --git a/assets/ico/favicon.png → docs-assets/ico/favicon.png b/assets/ico/favicon.png → docs-assets/ico/favicon.png
diff --git a/assets/js/application.js → docs-assets/js/application.js b/assets/js/application.js → docs-assets/js/application.js
diff --git a/assets/js/customizer.js → docs-assets/js/customizer.js b/assets/js/customizer.js → docs-assets/js/customizer.js
diff --git a/assets/js/filesaver.js → docs-assets/js/filesaver.js b/assets/js/filesaver.js → docs-assets/js/filesaver.js
diff --git a/assets/js/holder.js → docs-assets/js/holder.js b/assets/js/holder.js → docs-assets/js/holder.js
diff --git a/assets/js/html5shiv.js → docs-assets/js/html5shiv.js b/assets/js/html5shiv.js → docs-assets/js/html5shiv.js
diff --git a/assets/js/jquery.js → docs-assets/js/jquery.js b/assets/js/jquery.js → docs-assets/js/jquery.js
diff --git a/assets/js/jszip.js → docs-assets/js/jszip.js b/assets/js/jszip.js → docs-assets/js/jszip.js
diff --git a/assets/js/less.js → docs-assets/js/less.js b/assets/js/less.js → docs-assets/js/less.js
diff --git a/assets/js/raw-files.js → docs-assets/js/raw-files.js b/assets/js/raw-files.js → docs-assets/js/raw-files.js
diff --git a/assets/js/respond.min.js → docs-assets/js/respond.min.js b/assets/js/respond.min.js → docs-assets/js/respond.min.js
diff --git a/assets/js/uglify.js → docs-assets/js/uglify.js b/assets/js/uglify.js → docs-assets/js/uglify.js
diff --git a/examples/carousel/index.html b/examples/carousel/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Carousel Template for Bootstrap</title>
 
@@ -14,8 +14,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
 
     <!-- Custom styles for this template -->
@@ -194,8 +194,8 @@ <h2 class="featurette-heading">And lastly, this one. <span class="text-muted">Ch
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
-    <script src="../../assets/js/holder.js"></script>
+    <script src="../../docs-assets/js/holder.js"></script>
   </body>
 </html>
diff --git a/examples/grid/index.html b/examples/grid/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Grid Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 

diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Narrow Jumbotron Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 

diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Jumbotron Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -88,7 +88,7 @@ <h2>Heading</h2>
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Justified Nav Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 

diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Fixed Top Navbar Example for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -80,7 +80,7 @@ <h1>Navbar example</h1>
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Static Top Navbar Example for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -81,7 +81,7 @@ <h1>Navbar example</h1>
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/navbar/index.html b/examples/navbar/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Navbar Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -77,7 +77,7 @@ <h1>Navbar example</h1>
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html
@@ -7,7 +7,7 @@
 
     <!-- Note there is no responsive meta tag here -->
 
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Non-responsive Template for Bootstrap</title>
 
@@ -19,8 +19,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -90,7 +90,7 @@ <h3>Non-responsive grid system</h3>
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>
diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Off Canvas Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -118,7 +118,7 @@ <h2>Heading</h2>
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
     <script src="offcanvas.js"></script>
   </body>

diff --git a/examples/signin/index.html b/examples/signin/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Signin Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 

diff --git a/examples/starter-template/index.html b/examples/starter-template/index.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="">
     <meta name="author" content="">
-    <link rel="shortcut icon" href="../../assets/ico/favicon.png">
+    <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png">
 
     <title>Starter Template for Bootstrap</title>
 
@@ -17,8 +17,8 @@
 
     <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
-      <script src="../../assets/js/html5shiv.js"></script>
-      <script src="../../assets/js/respond.min.js"></script>
+      <script src="../../docs-assets/js/html5shiv.js"></script>
+      <script src="../../docs-assets/js/respond.min.js"></script>
     <![endif]-->
   </head>
 
@@ -57,7 +57,7 @@ <h1>Bootstrap starter template</h1>
     <!-- Bootstrap core JavaScript
     ================================================== -->
     <!-- Placed at the end of the document so the pages load faster -->
-    <script src="../../assets/js/jquery.js"></script>
+    <script src="../../docs-assets/js/jquery.js"></script>
     <script src="../../dist/js/bootstrap.min.js"></script>
   </body>
 </html>