Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move /assets/ to /docs-assets/ ; fixes #10715 #10770

Merged
merged 2 commits into from
Sep 24, 2013
Merged

move /assets/ to /docs-assets/ ; fixes #10715 #10770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8aa5181
move /assets/ to /docs-assets/ ; fixes #10715
cvrebert Sep 23, 2013
f503efc
avoid using the term "assets" due to potential confusion
cvrebert Sep 23, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
});
};
18 changes: 9 additions & 9 deletions _includes/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 6 additions & 6 deletions _includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 || [];
Expand Down
0 assets/css/docs.css → docs-assets/css/docs.css
View file
Open in desktop
File renamed without changes.
0 assets/css/pygments-manni.css → docs-assets/css/pygments-manni.css
View file
Open in desktop
File renamed without changes.
0 .../ico/apple-touch-icon-144-precomposed.png → .../ico/apple-touch-icon-144-precomposed.png
View file
Open in desktop
File renamed without changes
0 assets/ico/favicon.png → docs-assets/ico/favicon.png
View file
Open in desktop
File renamed without changes
0 assets/js/application.js → docs-assets/js/application.js
View file
Open in desktop
File renamed without changes.
0 assets/js/customizer.js → docs-assets/js/customizer.js
View file
Open in desktop
File renamed without changes.
0 assets/js/filesaver.js → docs-assets/js/filesaver.js
View file
Open in desktop
File renamed without changes.
0 assets/js/holder.js → docs-assets/js/holder.js
View file
Open in desktop
File renamed without changes.
0 assets/js/html5shiv.js → docs-assets/js/html5shiv.js
View file
Open in desktop
File renamed without changes.
0 assets/js/jquery.js → docs-assets/js/jquery.js
View file
Open in desktop
File renamed without changes.
0 assets/js/jszip.js → docs-assets/js/jszip.js
View file
Open in desktop
File renamed without changes.
0 assets/js/less.js → docs-assets/js/less.js
View file
Open in desktop
File renamed without changes.
0 assets/js/raw-files.js → docs-assets/js/raw-files.js
View file
Open in desktop
File renamed without changes.
0 assets/js/respond.min.js → docs-assets/js/respond.min.js
View file
Open in desktop
File renamed without changes.
0 assets/js/uglify.js → docs-assets/js/uglify.js
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions examples/carousel/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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 -->
Expand Down Expand Up @@ -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>
6 changes: 3 additions & 3 deletions examples/grid/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions examples/jumbotron-narrow/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions examples/jumbotron/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -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>
6 changes: 3 additions & 3 deletions examples/justified-nav/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions examples/navbar-fixed-top/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -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>
8 changes: 4 additions & 4 deletions examples/navbar-static-top/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -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>
8 changes: 4 additions & 4 deletions examples/navbar/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -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>
8 changes: 4 additions & 4 deletions examples/non-responsive/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -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>
8 changes: 4 additions & 4 deletions examples/offcanvas/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions examples/signin/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down
8 changes: 4 additions & 4 deletions examples/starter-template/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -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>

Expand Down Expand Up @@ -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>
Loading