diff options
| author | fat <[email protected]> | 2013-07-25 23:57:37 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-07-25 23:57:37 -0700 |
| commit | 5588e14867ee5d917ec97a32329a216c3c0ed527 (patch) | |
| tree | 1a469ec28e56482ec4a425a6d7c1939057ac6e00 | |
| parent | 778f3a3df7b2ff98fc698f75c6c804e708bea93a (diff) | |
| parent | 1659ac64732b71f207a278aa54aaf551295bf222 (diff) | |
| download | bootstrap-5588e14867ee5d917ec97a32329a216c3c0ed527.tar.xz bootstrap-5588e14867ee5d917ec97a32329a216c3c0ed527.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
| -rw-r--r-- | _layouts/customize.html | 53 | ||||
| -rw-r--r-- | _layouts/default.html | 12 | ||||
| -rw-r--r-- | assets/css/docs.css | 7 | ||||
| -rw-r--r-- | components.html | 14 | ||||
| -rw-r--r-- | customize.html | 2 |
5 files changed, 74 insertions, 14 deletions
diff --git a/_layouts/customize.html b/_layouts/customize.html new file mode 100644 index 000000000..450cedcec --- /dev/null +++ b/_layouts/customize.html @@ -0,0 +1,53 @@ + <!DOCTYPE html> +<html lang="en"> + <head> + <!-- Meta, title, CSS, favicons, etc. --> + {% include header.html %} + <!-- Place anything custom after this. --> + </head> + <body data-spy="scroll" data-target=".bs-sidebar"> + + <!-- Docs master nav --> + {% include nav-main.html %} + + <!-- Callout for the old docs link --> + {% include old-bs-docs.html %} + + <!-- Docs page layout --> + <div class="bs-header"> + <div class="container"> + <h1>{{ page.title }}</h1> + <p>{{ page.lead }}</p> + {% unless site.port != "9001" %} + {% include ads.html %} + {% endunless %} + </div> + </div> + + <div class="bs-customize-placeholder"> + <div class="container bs-docs-container"> + <p class="lead">Until RC2, the Bootstrap 3 customizer will be disabled. In the mean time, snag the <a href="https://github.com/twbs/bootstrap/releases">compiled CSS and JavaScript</a>. Hang tight!</p> + </div> + </div> + + <!-- Footer + ================================================== --> + <footer class="bs-footer"> + {% include social-buttons.html %} + + <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> + <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> + <ul class="footer-links"> + <li><a href="http://blog.getbootstrap.com">Blog</a></li> + <li class="muted">·</li> + <li><a href="https://github.com/twbs/bootstrap/issues?state=open">Issues</a></li> + <li class="muted">·</li> + <li><a href="https://github.com/twbs/bootstrap/releases">Releases</a></li> + </ul> + </footer> + + <!-- JS and analytics only. --> + {% include footer.html %} + + </body> +</html> diff --git a/_layouts/default.html b/_layouts/default.html index 19388fbf0..edd211665 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -30,15 +30,15 @@ <div class="bs-sidebar"> <ul class="nav bs-sidenav"> {% if page.slug == "getting-started" %} - {% include nav-getting-started.html %} + {% include nav-getting-started.html %} {% elsif page.slug == "css" %} - {% include nav-css.html %} + {% include nav-css.html %} {% elsif page.slug == "components" %} - {% include nav-components.html %} + {% include nav-components.html %} {% elsif page.slug == "js" %} - {% include nav-javascript.html %} + {% include nav-javascript.html %} {% elsif page.slug == "customize" %} - {% include nav-customize.html %} + {% include nav-customize.html %} {% endif %} </ul> </div> @@ -67,7 +67,7 @@ <li class="muted">·</li> <li><a href="https://github.com/twbs/bootstrap/issues?state=open">Issues</a></li> <li class="muted">·</li> - <li><a href="https://github.com/twbs/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li> + <li><a href="https://github.com/twbs/bootstrap/releases">Releases</a></li> </ul> </footer> diff --git a/assets/css/docs.css b/assets/css/docs.css index 4b4150e57..db15a631c 100644 --- a/assets/css/docs.css +++ b/assets/css/docs.css @@ -26,6 +26,13 @@ body { border-color: #b94a48; } +/* Temp CSS until RC2 */ +.bs-customize-placeholder { + margin-bottom: -100px; + padding: 80px 30px; + text-align: center; + background-color: #f5f5f5; +} /* Top nav and header diff --git a/components.html b/components.html index 3f177a840..d6e25cfc1 100644 --- a/components.html +++ b/components.html @@ -733,14 +733,14 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na <div class="navbar"> <form class="navbar-form pull-left"> - <input type="text" style="width: 200px;"> + <input type="text" class="form-control" style="width: 200px;"> <button type="submit" class="btn btn-default">Submit</button> </form> </div> <div class="navbar"> <form class="navbar-form pull-left"> - <select name="" id="" style="width: 200px;"> + <select name="" id="" class="form-control" style="width: 200px;"> <option value="1">1</option> <option value="2">2</option> <option value="3">3</option> @@ -752,7 +752,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na <div class="navbar"> <form class="navbar-form pull-left"> - <input type="text" style="width: 200px;"> + <input type="text" class="form-control" style="width: 200px;"> <input type="checkbox"> <button type="submit" class="btn btn-default">Submit</button> </form> @@ -760,7 +760,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na <div class="navbar"> <form class="navbar-form pull-left"> - <input type="text" style="width: 200px;"> + <input type="text" class="form-control" style="width: 200px;"> <label class="checkbox-inline"> <input type="checkbox"> Remember me </label> @@ -771,7 +771,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na </div><!-- /example --> {% highlight html %} <form class="navbar-form pull-left"> - <input type="text" style="width: 200px;"> + <input type="text" class="form-control" style="width: 200px;"> <button type="submit" class="btn btn-default">Submit</button> </form> {% endhighlight %} @@ -934,7 +934,7 @@ body { padding-bottom: 70px; } </li> </ul> <form class="navbar-form pull-left" action=""> - <input type="text" class="col-lg-8" placeholder="Search"> + <input type="text" class="form-control col-lg-8" placeholder="Search"> </form> <ul class="nav navbar-nav pull-right"> <li><a href="#">Link</a></li> @@ -1011,7 +1011,7 @@ body { padding-bottom: 70px; } </li> </ul> <form class="navbar-form pull-left" action=""> - <input type="text" class="col-lg-8" placeholder="Search"> + <input type="text" class="form-control col-lg-8" placeholder="Search"> </form> <ul class="nav navbar-nav pull-right"> <li><a href="#">Link</a></li> diff --git a/customize.html b/customize.html index 7bde928b8..f38152f16 100644 --- a/customize.html +++ b/customize.html @@ -1,5 +1,5 @@ --- -layout: default +layout: customize title: Customize and download slug: customize lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to get your very own version. |