diff options
| author | Mark Otto <[email protected]> | 2013-09-23 19:08:50 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-09-23 19:08:50 -0700 |
| commit | 62c9199dc51ca674fb836d67eb2c5158d740514a (patch) | |
| tree | 198de69906bb52a6673e7d805bca2a49067b9891 /_includes | |
| parent | 5911d95d6964dc4cd1448e79a84a67fe2f123b82 (diff) | |
| parent | f503efc49086becc312665000fcbce4b9df3750d (diff) | |
| download | bootstrap-62c9199dc51ca674fb836d67eb2c5158d740514a.tar.xz bootstrap-62c9199dc51ca674fb836d67eb2c5158d740514a.zip | |
Merge pull request #10770 from twbs/rename-assets
move /assets/ to /docs-assets/ ; fixes #10715
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/footer.html | 18 | ||||
| -rw-r--r-- | _includes/header.html | 12 |
2 files changed, 15 insertions, 15 deletions
diff --git a/_includes/footer.html b/_includes/footer.html index d187f95d5..9e66c58a1 100644 --- 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 index 982c9e02e..2be9dc110 100644 --- 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 || []; |