Skip to content
GitLab
Commit a34470ac authored by Mark Otto's avatar Mark Otto
Browse files

Merge branch 'bs3_old_docs_callout' into bs3_rc1

parents 94253823 3ad0cf9e
Hide whitespace changes
Inline Side-by-side
Showing
with 46 additions and 35 deletions
+46 -35
docs/_includes/nav-main.html
+ 7
- 0
View file @ a34470ac
...@@ -24,6 +24,13 @@ ...@@ -24,6 +24,13 @@
<a href="/customize">Customize</a> <a href="/customize">Customize</a>
</li> </li>
</ul> </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> </div>
</div> </div>
docs/_layouts/default.html
+ 1
- 1
View file @ a34470ac
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<!-- Meta, title, CSS, favicons, etc. --> <!-- Meta, title, CSS, favicons, etc. -->
......
docs/assets/css/docs.css
+ 26
- 30
View file @ a34470ac
...@@ -13,6 +13,19 @@ body { ...@@ -13,6 +13,19 @@ body {
padding-top: 50px; /* Account for fixed navbar */ 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 /* Top nav and header
...@@ -43,6 +56,15 @@ body { ...@@ -43,6 +56,15 @@ body {
border-color: #993c3a; 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 /* Homepage masthead
...@@ -63,20 +85,11 @@ body { ...@@ -63,20 +85,11 @@ body {
} }
/* Download button */ /* Download button */
.bs-masthead .btn { .bs-masthead .btn-bs {
margin-top: 5px; margin-top: 5px;
margin-bottom: 5px; margin-bottom: 5px;
padding: 18px 24px; padding: 18px 24px;
font-size: 21px; 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 */ /* Textual links */
...@@ -95,12 +108,10 @@ body { ...@@ -95,12 +108,10 @@ body {
} }
/* Customize and Download button /* Customize and Download button
-------------------------------------------------- */ -------------------------------------------------- */
.bs-customizer {
}
.bs-customizer .toggle { .bs-customizer .toggle {
float: right; float: right;
} }
...@@ -116,23 +127,8 @@ body { ...@@ -116,23 +127,8 @@ body {
background-color: #fafafa; background-color: #fafafa;
} }
.bs-customize-download { .bs-customize-download {
text-align:center; 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;
} }
...@@ -146,7 +142,7 @@ body { ...@@ -146,7 +142,7 @@ body {
font-size: 16px; font-size: 16px;
color: #5a5a5a; color: #5a5a5a;
text-align: center; text-align: center;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #e5e5e5;
} }
.bs-header h1 { .bs-header h1 {
color: #b94a48; color: #b94a48;
......
docs/customize.html
+ 1
- 1
View file @ a34470ac
...@@ -1155,7 +1155,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge ...@@ -1155,7 +1155,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
</div> </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> <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"> <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>
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
<h4>What's included?</h4> <h4>What's included?</h4>
......
docs/index.html
+ 11
- 3
View file @ a34470ac
...@@ -3,13 +3,22 @@ layout: home ...@@ -3,13 +3,22 @@ layout: home
title: Bootstrap 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="container">
<div class="bs-masthead"> <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 class="lead">Sleek, intuitive, and powerful mobile-first front-end framework for faster and easier web development.</p>
<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> </p>
{% include social-buttons.html %} {% include social-buttons.html %}
...@@ -27,7 +36,6 @@ title: Bootstrap ...@@ -27,7 +36,6 @@ title: Bootstrap
<li> <li>
<a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a> <a href="http://expo.getbootstrap.com" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Bootstrap Expo</a>
</li> </li>
<li>Version 3.0.0</li>
</ul> </ul>
</div> </div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment