diff options
| author | Mark Otto <[email protected]> | 2013-07-17 22:58:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-07-17 22:58:49 -0700 |
| commit | 3ad0cf9e9417cc86ca6d18f2d47049e9180aef99 (patch) | |
| tree | 49acefa85c410995afa38c370bcb02c466a5ad5d | |
| parent | 9efba239b6c15b72a2872a6c5119fa3abe303951 (diff) | |
| download | bootstrap-3ad0cf9e9417cc86ca6d18f2d47049e9180aef99.tar.xz bootstrap-3ad0cf9e9417cc86ca6d18f2d47049e9180aef99.zip | |
add callouts for bootstrap 2.3.2 docs and 3.0 rc1 post
| -rw-r--r-- | docs/_includes/nav-main.html | 7 | ||||
| -rw-r--r-- | docs/_layouts/default.html | 2 | ||||
| -rw-r--r-- | docs/assets/css/docs.css | 56 | ||||
| -rw-r--r-- | docs/customize.html | 2 | ||||
| -rw-r--r-- | docs/index.html | 14 |
5 files changed, 46 insertions, 35 deletions
diff --git a/docs/_includes/nav-main.html b/docs/_includes/nav-main.html index fceeb7a86..40244d3a2 100644 --- a/docs/_includes/nav-main.html +++ b/docs/_includes/nav-main.html @@ -24,6 +24,13 @@ <a href="/customize">Customize</a> </li> </ul> + {% if page.layout == "default" %} + <ul class="nav navbar-nav pull-right"> + <li> + <a href="http://getbootstrap.com/2.3.2/">Looking for Bootstrap 2.3.2?</a> + </li> + </ul> + {% endif %} </div> </div> </div> diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html index 019d7626a..e3a440cb9 100644 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@ -1,4 +1,4 @@ -<!DOCTYPE html> + <!DOCTYPE html> <html lang="en"> <head> <!-- Meta, title, CSS, favicons, etc. --> diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index aae9e0635..aba1e489f 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -13,6 +13,19 @@ body { padding-top: 50px; /* Account for fixed navbar */ } +/* Custom docs button */ +.btn-bs { + color: #b94a48; + background-color: #fff; + border-color: #e5e5e5; +} +.btn-bs:hover, +.btn-bs:active { + color: #fff; + background-color: #b94a48; + border-color: #b94a48; +} + /* Top nav and header @@ -43,6 +56,15 @@ body { border-color: #993c3a; } +/* Old docs callout */ +.bs-old-docs { + padding: 15px 20px; + color: #777; + border-bottom: 1px solid #e5e5e5; +} +.bs-old-docs strong { + color: #555; +} /* Homepage masthead @@ -63,20 +85,11 @@ body { } /* Download button */ -.bs-masthead .btn { +.bs-masthead .btn-bs { margin-top: 5px; margin-bottom: 5px; padding: 18px 24px; font-size: 21px; - color: #b94a48; /* redeclare to override the `.jumbotron a` */ - background-color: #fff; - border-color: #e5e5e5; -} -.bs-masthead .btn:hover, -.bs-masthead .btn:active { - color: #fff; /* redeclare to override the `.jumbotron a` */ - background-color: #b94a48; - border-color: #b94a48; } /* Textual links */ @@ -95,12 +108,10 @@ body { } + /* Customize and Download button -------------------------------------------------- */ -.bs-customizer { - -} .bs-customizer .toggle { float: right; } @@ -116,23 +127,8 @@ body { background-color: #fafafa; } - .bs-customize-download { - text-align:center; -} -.bs-customize-download .btn { - margin-top: 5px; - margin-bottom: 5px; - padding: 18px 24px; - font-size: 21px; - color: #b94a48; - background-color: #fff; - border-color: #b94a48; -} -.bs-customize-download .btn:hover, -.bs-customize-download .btn:active { - color: #fff; - background-color: #b94a48; + text-align: center; } @@ -146,7 +142,7 @@ body { font-size: 16px; color: #5a5a5a; text-align: center; - border-bottom: 1px solid #ddd; + border-bottom: 1px solid #e5e5e5; } .bs-header h1 { color: #b94a48; diff --git a/docs/customize.html b/docs/customize.html index 876d81dde..511e94e41 100644 --- a/docs/customize.html +++ b/docs/customize.html @@ -1155,7 +1155,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge </div> <p class="lead">Hooray! Your custom version of Bootstrap is now ready to be compiled. Just click the button below to finish the process.</p> <div class="bs-customize-download"> - <a class="btn" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a> + <a class="btn btn-bs" href="#" onclick="_gaq.push(['_trackEvent', 'Customize', 'Download', 'Customize and Download']);">Customize and Download</a> </div> <div class="bs-callout bs-callout-danger"> <h4>What's included?</h4> diff --git a/docs/index.html b/docs/index.html index 49bdcb38e..f9abb75f8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -3,13 +3,22 @@ layout: home title: Bootstrap --- +<div class="bs-old-docs"> + <div class="container"> + <strong> + <a href="http://getbootstrap.com/2.3.2/">Looking for Bootstrap 2.3.2 docs?</a> + </strong> + We've moved it to a new home while we push forward with Bootstrap 3. <a href="http://blog.getbootstrap.com/">Read the blog post</a> for details. + </div> +</div> + <div class="container"> <div class="bs-masthead"> - <h1>Bootstrap</h1> + <h1>Bootstrap 3</h1> <p class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p> <p> - <a href="assets/bootstrap.zip" class="btn btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0']);">Download Bootstrap</a> + <a href="assets/bootstrap.zip" class="btn btn-bs btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 3.0.0.1']);">Download Bootstrap 3.0.0.1</a> </p> {% include social-buttons.html %} @@ -27,7 +36,6 @@ title: Bootstrap <li> <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a> </li> - <li>Version 3.0.0</li> </ul> </div> |