fixes #10372: two download buttons on homepage; also fixes broke button styles

diff --git a/_config.yml b/_config.yml
index b93496ae09a2ac07e4315345fed66a234e09b9f5..3767148eaeab4055e6c6476f50240086298bde5e 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -13,7 +13,8 @@ port:             9001
 # Custom vars
 current_version:  3.0.0
 repo:             https://github.com/twbs/bootstrap
-download:         https://github.com/twbs/bootstrap/archive/v3.0.0.zip
+
+download_source:  https://github.com/twbs/bootstrap/archive/v3.0.0.zip
 download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.0.0/bootstrap-3.0.0-dist.zip
 
 blog:             http://blog.getbootstrap.com

diff --git a/assets/css/docs.css b/assets/css/docs.css
index 4654230ce88fda3716f64702240e8c877f872897..cc5b6aa4d4202a8a7bfea45b879155a464379c3e 100644 (file)
--- a/assets/css/docs.css
+++ b/assets/css/docs.css
@@ -222,11 +222,8 @@ body {
   line-height: 1;
   color: #fff;
 }
-.bs-masthead .btn-outline {
-  margin-top: 20px;
-  margin-bottom: 20px;
-  padding: 18px 24px;
-  font-size: 21px;
+.bs-masthead .btn-outline-inverse {
+  margin: 10px;
 }
 
 /* Links to project-level content like the repo, Expo, etc */
@@ -260,6 +257,12 @@ body {
     margin-right: 25%;
     font-size: 30px;
   }
+  .bs-masthead .btn-outline-inverse {
+    width: auto;
+    margin: 20px 5px 20px 0;
+    padding: 18px 24px;
+    font-size: 21px;
+  }
   .bs-masthead-links {
     padding: 0;
     text-align: left;

diff --git a/getting-started.html b/getting-started.html
index 026a39c350606432398f72f5dcbb64f34f286d1f..79252dcca87ddd4b6f26140dd4323cc89a1df6dc 100644 (file)
--- a/getting-started.html
+++ b/getting-started.html
@@ -22,7 +22,7 @@ base_url: "../"
     <h3 id="download-additional">Additional downloads</h3>
     <div class="bs-docs-dl-options">
       <h4>
-        <a href="{{ site.download }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download source code</a>
+        <a href="{{ site.download_source }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download source code</a>
       </h4>
       <p>Get the latest Bootstrap CSS and JavaScript source code by downloading it directly from GitHub.</p>
       <h4>

diff --git a/index.html b/index.html
index 71c34922e7d5667d87dd28cb46b9afb3d6758090..9e8485e87295b74a1ed4b02d787241faeb9adf76 100644 (file)
--- a/index.html
+++ b/index.html
@@ -9,7 +9,8 @@ base_url: "./"
     <h1>Bootstrap</h1>
     <p class="lead">Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.</p>
     <p>
-      <a href="{{ site.download }}" class="btn btn-outline-inverse btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}']);">Download Bootstrap</a>
+      <a href="{{ site.download_dist }}" class="btn btn-outline-inverse btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}']);">Download Bootstrap</a>
+      <a href="{{ site.download_source }}" class="btn btn-outline-inverse btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version source }}']);">Download source</a>
     </p>
   </div>
 </main>