From 176e35d33d1dfc5a81df58462d158e90e4cf4cd8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 21 Dec 2013 13:40:42 -0800 Subject: [PATCH] rework downloads to simplify and add sass --- _config.yml | 1 + _includes/nav-getting-started.html | 7 +---- docs-assets/css/docs.css | 4 --- getting-started.html | 44 ++++++++++++++---------------- index.html | 5 +--- 5 files changed, 23 insertions(+), 38 deletions(-) diff --git a/_config.yml b/_config.yml index 32c94d3854..baa1344c90 100644 --- 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 4a8a2f8360..f4a98f2ace 100644 --- a/_includes/nav-getting-started.html +++ b/_includes/nav-getting-started.html @@ -1,10 +1,5 @@
  • - Download Bootstrap - + Download
  • What's included diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index 1a57678d92..c8efba3ae9 100644 --- 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 0cc159ec7b..d778e351ef 100644 --- a/getting-started.html +++ b/getting-started.html @@ -11,29 +11,26 @@ base_url: "../" ================================================== -->

    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.

    -

    Compiled CSS, JS, and fonts

    -

    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.

    -

    Download Bootstrap

    - -

    Additional downloads

    -
    -

    - Download source code -

    -

    Get the latest Bootstrap LESS and JavaScript source code by downloading it directly from GitHub.

    -

    - Clone or fork via GitHub -

    -

    Visit us on GitHub to clone or fork the Bootstrap project.

    -

    - Install with Bower -

    -

    Install and manage Bootstrap's styles, JavaScript, and documentation using Bower.

    - {% highlight bash %}$ bower install bootstrap{% endhighlight %} +
    +
    +

    Bootstrap

    +

    Compiled and minified CSS, JavaScript, and fonts. No docs or original source files are included.

    + Download Bootstrap +
    +
    +

    Source code

    +

    Source Less, JavaScript, and font files, along with our docs. Requires a Less compiler and some setup.

    + Download source +
    +
    +

    Sass

    +

    Bootstrap ported from Less to Sass for easy inclusion in Rails, Compass, or Sass-only projects.

    + Download Sass +

    Bootstrap CDN

    @@ -49,10 +46,9 @@ base_url: "../" {% endhighlight %} -
    -

    Compiling Bootstrap's LESS files

    -

    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 Recess, which is Twitter's CSS hinter based on less.js.

    -
    +

    Install with Bower

    +

    Install and manage Bootstrap's Less, CSS, JavaScript, and fonts using Bower.

    + {% highlight bash %}$ bower install bootstrap{% endhighlight %}
    diff --git a/index.html b/index.html index aba84ecf89..d59c6fb6e7 100644 --- a/index.html +++ b/index.html @@ -9,10 +9,7 @@ base_url: "./" B

    Bootstrap

    The most popular front-end framework for designing and building on the web.

    -

    - Download Bootstrap - Download source -

    +

    Download Bootstrap

    {% include ads.html %}