From: Mark Otto Date: Tue, 31 Dec 2013 21:53:33 +0000 (-0800) Subject: Merge branch 'master' into docs_derp X-Git-Tag: v3.1.0~130 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b253cb2c1e34a41940c4933fb95c46da833fc5f9;p=thirdparty%2Fbootstrap.git Merge branch 'master' into docs_derp Conflicts: _config.yml docs/_includes/footer.html docs/_includes/nav-main.html docs/_includes/old-bs-docs.html docs/_layouts/default.html docs/_layouts/home.html docs/getting-started.html docs/index.html --- b253cb2c1e34a41940c4933fb95c46da833fc5f9 diff --cc _config.yml index ae7b5a1e6f,b6e18adbea..e4d64c79f4 --- a/_config.yml +++ b/_config.yml @@@ -29,9 -17,9 +17,10 @@@ url: http://localhost:900 current_version: 3.0.3 repo: https://github.com/twbs/bootstrap - download_source: https://github.com/twbs/bootstrap/archive/v3.0.3.zip - download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip - download_sass: https://github.com/twbs/bootstrap-sass/archive/v3.0.3.0.tar.gz + download: + source: https://github.com/twbs/bootstrap/archive/v3.0.3.zip + dist: https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip ++ sass: https://github.com/twbs/bootstrap-sass/archive/v3.0.3.0.tar.gz blog: http://blog.getbootstrap.com expo: http://expo.getbootstrap.com diff --cc docs/_includes/footer.html index c3ed5cde94,b8e19b5234..11f33fe9b3 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@@ -27,16 -2,15 +27,13 @@@ ================================================== --> - - - - - - + - + - + {% if page.slug == "customize" %} - - + + {% endif %} {% comment %} diff --cc docs/_layouts/default.html index da2376855b,1eb948e169..5a8ae85754 --- a/docs/_layouts/default.html +++ b/docs/_layouts/default.html @@@ -48,8 -51,31 +48,7 @@@ - - - {% include footer.html %} -- diff --cc docs/_layouts/home.html index 96e399d20d,fa2b0252cf..9020f6384a --- a/docs/_layouts/home.html +++ b/docs/_layouts/home.html @@@ -13,8 -13,35 +13,7 @@@ {{ content }} - - {% include footer.html %} -- diff --cc docs/css.html index e852e29ce6,91cd0218c3..35184cd2c6 --- a/docs/css.html +++ b/docs/css.html @@@ -2821,15 -2820,11 +2820,15 @@@ For example,

<section>
      Bootstrap's CSS is built on Less, a preprocessor with additional functionality like variables, mixins, and functions for compiling CSS. Those looking to use the source Less files instead of our compiled CSS files can make use of the numerous variables and mixins we use throughout the framework.
  
-     Grid variables and mixins are covered within the Grid system section.
+     Grid variables and mixins are covered within the Grid system section.
  
  
 +    Compiling Bootstrap
 +    Bootstrap can be used in at least two ways: with the compiled CSS or with the source LESS files. To compile the LESS files, visit the README for how to setup your development environment to run the necessary commands.
 +    Third party compilation tools may work with Bootstrap, but they are not supported by our core team.
 +
      Variables
-     Variables are used throughout the entire project as a way to centralize and share commonly used values like colors, spacing, or font stacks. For a complete breakdown, please see the Customizer.
+     Variables are used throughout the entire project as a way to centralize and share commonly used values like colors, spacing, or font stacks. For a complete breakdown, please see the Customizer.
  
      Colors
      Easily make use of two color schemes: grayscale and semantic. Grayscale colors provide quick access to commonly used shades of black while semantic include various colors assigned to meaningful contextual values.
diff --cc docs/getting-started.html
index 890993f82f,4a4ab1211c..0bdea4f455
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@@ -15,40 -14,44 +14,40 @@@ lead: "An overview of Bootstrap, how t
      
      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
++        Download Bootstrap
 +      
 +      
 +        Source code
 +        Source Less, JavaScript, and font files, along with our docs. Requires a Less compiler and some setup.
-         Download source
++        Download source
 +      
 +      
 +        Sass
 +        Bootstrap ported from Less to Sass for easy inclusion in Rails, Compass, or Sass-only projects.
-         Download Sass
++        Download Sass
 +      
      
  
      Bootstrap CDN
      The folks over at MaxCDN graciously provide CDN support for Bootstrap's CSS and JavaScript. Just use these Bootstrap CDN links.
  {% highlight html %}
  
- 
+ 
  
  
- 
+ 
  
  
- 
+ 
  {% 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 --cc docs/index.html
index 799045f0af,b63ae78432..1402f12426
--- a/docs/index.html
+++ b/docs/index.html
@@@ -6,80 -5,11 +5,82 @@@ title: Bootstra
  
  
    
 +    B
      Bootstrap
 -    Sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development.
 -    
 -      Download Bootstrap
 -      Download source
 +    
The most popular front-end framework for designing and building on the web.
-     Download Bootstrap
++    
++      Download Bootstrap
+     
 +    {% include ads.html %}
    
  
 +
 +
 +
 +  
 +    Designed for everyone, everywhere.
 +    Bootstrap is a responsive and mobile first framework for faster and easier web development. It's made for folks of all skill levels, devices of all shapes, and projects of all sizes.
 +
 +    
 +
 +    
 +      
 +        
 +        Preprocesors
 +        In addition to vanilla CSS, Bootstrap includes support for the two most popular CSS preprocessors, Less and Sass.
 +      
 +      
 +        
 +        One framework, every device.
 +        Bootstrap easily and efficiently scales your project from phones to tablets to desktops with a single CSS file.
 +      
 +      
 +        
 +        Comprehensive docs
 +        With Bootstrap, you get extensive and beautiful documentation with hundreds of live examples, code snippets, and more.
 +      
 +    
 +
 +    
 +
 +    Bootstrap is an open source project, hosted and maintained on GitHub.
 +    View the GitHub project
 +  
 +
 +
 +
 +  
 +    Built with Bootstrap.
 +    Millions of amazing sites across the web are being built with Bootstrap. Get started on your own with our growing collection of examples or by exploring some of our favorites from the Expo.
 +
 +    
 +
 +    
 +      
 +        
 +          
 +        
 +      
 +      
 +        
 +          
 +        
 +      
 +      
 +        
 +          
 +        
 +      
 +      
 +        
 +          
 +        
 +      
 +    
 +
 +    
 +
 +    Head to the Bootstrap Expo for dozens of inspiring projects built on Bootstrap.
 +    Explore the showcase
 +  
 +

Compiling Bootstrap

Variables

Colors

Compiled CSS, JS, and fonts

Additional downloads

- Download source code -

- Clone or fork via GitHub -

- Install with Bower -

Bootstrap

Source code

Sass

Bootstrap CDN

Compiling Bootstrap's LESS files

Install with Bower

Bootstrap

Designed for everyone, everywhere.

Preprocesors

One framework, every device.

Comprehensive docs

Built with Bootstrap.