diff options
| author | Mark Otto <[email protected]> | 2013-03-01 13:53:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-03-01 13:53:21 -0800 |
| commit | 1f160d4c12e2801d5ede245099d74386f91214a8 (patch) | |
| tree | 5984bee820ad1f6eec6db7de511f1ad46fb51a45 /docs/_includes | |
| parent | f59e4fdba32b99bdd4e6387f889dda4c9270f762 (diff) | |
| parent | e0647e8273aee5bd09d5461f6f974e36b3d0c3c9 (diff) | |
| download | bootstrap-1f160d4c12e2801d5ede245099d74386f91214a8.tar.xz bootstrap-1f160d4c12e2801d5ede245099d74386f91214a8.zip | |
Merge branch '3.0.0-wip' into bs3_makefile_separated_done
Conflicts:
Makefile
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/colophon.html | 2 | ||||
| -rw-r--r-- | docs/_includes/header.html | 2 | ||||
| -rw-r--r-- | docs/_includes/masthead.html | 8 | ||||
| -rw-r--r-- | docs/_includes/navbar.html | 6 |
4 files changed, 6 insertions, 12 deletions
diff --git a/docs/_includes/colophon.html b/docs/_includes/colophon.html index ae92db140..5c15d7c78 100644 --- a/docs/_includes/colophon.html +++ b/docs/_includes/colophon.html @@ -1,6 +1,6 @@ <!-- Footer ================================================== --> -<footer class="footer"> +<footer class="bs-docs-footer"> <div class="container"> <div class="bs-docs-social"> diff --git a/docs/_includes/header.html b/docs/_includes/header.html index fe23d008e..f738b9146 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -14,9 +14,11 @@ <!-- Bootstrap core CSS --> <link href="/assets/css/bootstrap.css" rel="stylesheet"> +{% if page.layout == "default" %} <!-- Documentation extras --> <link href="/assets/css/docs.css" rel="stylesheet"> <link href="/assets/css/pygments-manni.css" rel="stylesheet"> +{% endif %} <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> diff --git a/docs/_includes/masthead.html b/docs/_includes/masthead.html deleted file mode 100644 index 205b244fe..000000000 --- a/docs/_includes/masthead.html +++ /dev/null @@ -1,8 +0,0 @@ -{% raw %} -<header class="bs-docs-jumbotron subhead"> - <div class="container"> - <h1>{{ page.title }}</h1> - <p class="lead">{{ page.description }}</p> - </div> -</header> -{% endraw %}
\ No newline at end of file diff --git a/docs/_includes/navbar.html b/docs/_includes/navbar.html index b9d5f0279..aa333c35b 100644 --- a/docs/_includes/navbar.html +++ b/docs/_includes/navbar.html @@ -1,13 +1,13 @@ <!-- Navbar ================================================== --> -<div class="navbar navbar-inverse navbar-fixed-top"> +<div class="navbar navbar-fixed-top bs-docs-navbar"> <div class="container"> - <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".nav-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="brand" href="/">Bootstrap</a> + <a class="navbar-brand" href="/">Bootstrap</a> <div class="nav-collapse collapse"> <ul class="nav"> <li {% if page.title == "Bootstrap" %}class="active"{% endif %}> |