rework downloads to simplify and add sass

diff --git a/_config.yml b/_config.yml
index 32c94d3854c9ec4234ae3b195bec7df3680c09a2..baa1344c9091f84f07935dd2685ba78e53f6c892 100644 (file)
--- a/_config.yml
+++ b/_config.yml
@@ -16,6 +16,7 @@ repo:             https://github.com/twbs/bootstrap
 
 download_source:  https://github.com/twbs/bootstrap/archive/v3.1.0.zip
 download_dist:    https://github.com/twbs/bootstrap/releases/download/v3.1.0/bootstrap-3.1.0-dist.zip
+download_sass:    https://github.com/twbs/bootstrap-sass/archive/v3.1.0.0.tar.gz
 
 blog:             http://blog.getbootstrap.com
 expo:             http://expo.getbootstrap.com

diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html
index 4a8a2f8360b1b37342b39b3817b39efce2aab4e1..f4a98f2ace465aefa8a8fbd90ba355a146a0b978 100644 (file)
--- a/_includes/nav-getting-started.html
+++ b/_includes/nav-getting-started.html
@@ -1,10 +1,5 @@
 <li>
-  <a href="#download">Download Bootstrap</a>
-  <ul class="nav">
-    <li><a href="#download-compiled">Compiled CSS, JS, and fonts</a></li>
-    <li><a href="#download-additional">Additional downloads</a></li>
-    <li><a href="#download-cdn">Bootstrap CDN</a></li>
-  </ul>
+  <a href="#download">Download</a>
 </li>
 <li>
   <a href="#whats-included">What's included</a>

diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css
index 1a57678d92e3ba8d1f9eb0350546574d2a50f742..c8efba3ae97f5d971acc6bb1799196d6580128f6 100644 (file)
--- a/docs-assets/css/docs.css
+++ b/docs-assets/css/docs.css
@@ -232,13 +232,9 @@ body {
 }
 .bs-masthead .btn-outline {
   width: 100%;
-  margin: 10px 5px;
   padding: 14px 24px;
   font-size: 20px;
 }
-.bs-masthead .btn-outline + .btn-outline {
-  margin-top: 10px;
-}
 
 @media (min-width: 480px) {
   .bs-masthead .btn-outline {

diff --git a/getting-started.html b/getting-started.html
index 0cc159ec7bddf12fa850c79e45092c52ba3e7e1e..d778e351ef82e74327ba83f72b60cfe78c026bbd 100644 (file)
--- a/getting-started.html
+++ b/getting-started.html
@@ -11,29 +11,26 @@ base_url: "../"
   ================================================== -->
   <div class="bs-docs-section">
     <div class="page-header">
-      <h1 id="download">Download Bootstrap</h1>
+      <h1 id="download">Download</h1>
     </div>
     <p class="lead">Bootstrap has a few easy ways to quickly get started, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.</p>
 
-    <h3 id="download-compiled">Compiled CSS, JS, and fonts</h3>
-    <p>The fastest way to get Bootstrap is to download the precompiled and minified versions of our CSS, JavaScript, and fonts. No documentation or original source code files are included.</p>
-    <p><a class="btn btn-lg btn-primary" href="{{ site.download_dist }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);" role="button">Download Bootstrap</a></p>
-
-    <h3 id="download-additional">Additional downloads</h3>
-    <div class="bs-docs-dl-options">
-      <h4>
-        <a href="{{ site.download_source }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download source code</a>
-      </h4>
-      <p>Get the latest Bootstrap LESS and JavaScript source code by downloading it directly from GitHub.</p>
-      <h4>
-        <a href="{{ site.repo }}" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'GitHub project']);">Clone or fork via GitHub</a>
-      </h4>
-      <p>Visit us on GitHub to clone or fork the Bootstrap project.</p>
-      <h4>
-        Install with <a href="http://bower.io">Bower</a>
-      </h4>
-      <p>Install and manage Bootstrap's styles, JavaScript, and documentation using <a href="http://bower.io">Bower</a>.</p>
-      {% highlight bash %}$ bower install bootstrap{% endhighlight %}
+    <div class="row bs-downloads">
+      <div class="col-sm-4">
+        <h3 id="download-bootstrap">Bootstrap</h3>
+        <p>Compiled and minified CSS, JavaScript, and fonts. No docs or original source files are included.</p>
+        <a href="{{ site.download_dist }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a>
+      </div>
+      <div class="col-sm-4">
+        <h3 id="download-source">Source code</h3>
+        <p>Source Less, JavaScript, and font files, along with our docs. <strong>Requires a Less compiler and <a href="{{ site.repo }}#compiling-css-and-javascript">some setup.</a></strong></p>
+        <a href="{{ site.download_source }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download source</a>
+      </div>
+      <div class="col-sm-4">
+        <h3 id="download-sass">Sass</h3>
+        <p><a href="{{ site.sass }}">Bootstrap ported from Less to Sass</a> for easy inclusion in Rails, Compass, or Sass-only projects.</p>
+        <a href="{{ site.download_sass }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download Sass']);">Download Sass</a>
+      </div>
     </div>
 
     <h3 id="download-cdn">Bootstrap CDN</h3>
@@ -49,10 +46,9 @@ base_url: "../"
 <script src="{{ site.cdn_js }}"></script>
 {% endhighlight %}
 
-    <div class="bs-callout bs-callout-warning" id="callout-less-compilation">
-      <h4>Compiling Bootstrap's LESS files</h4>
-      <p>If you work with Bootstrap's uncompiled source code, you need to compile the LESS files to produce usable CSS files. For compiling LESS files into CSS, we only officially support <a href="http://twitter.github.io/recess/">Recess</a>, which is Twitter's CSS hinter based on <a href="http://lesscss.org">less.js</a>.</p>
-    </div>
+    <h3 id="download-bower">Install with Bower</h3>
+    <p>Install and manage Bootstrap's Less, CSS, JavaScript, and fonts using <a href="http://bower.io">Bower</a>.</p>
+    {% highlight bash %}$ bower install bootstrap{% endhighlight %}
   </div>
 
 

diff --git a/index.html b/index.html
index aba84ecf89cc07aa8dfe024a0a147b6872ed29a7..d59c6fb6e7df6473b89ddcf7b42524f3ff2c9cc8 100644 (file)
--- a/index.html
+++ b/index.html
@@ -9,10 +9,7 @@ base_url: "./"
     <span class="bs-booticon bs-booticon-lg">B</span>
     <h1>Bootstrap</h1>
     <p class="lead">The most popular front-end framework for designing and building on the web.</p>
-    <p class="lead">
-      <a href="{{ site.download_dist }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}']);" data-content="Quickly get started with Bootstrap's precompiled CSS, JavaScript, and fonts.">Download Bootstrap</a>
-      <a href="{{ site.download_source }}" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version source }}']);" data-content="Download Bootstrap's LESS, JavaScript, font, and documentation source code.">Download source</a>
-    </p>
+    <p class="lead"><a href="{{ page.base_url }}getting-started#download" class="btn btn-outline btn-lg" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download {{ site.current_version }}']);">Download Bootstrap</a></p>
     {% include ads.html %}
   </div>
 </main>