From: Mark Otto Date: Wed, 25 Jan 2012 09:23:50 +0000 (-0800) Subject: Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip X-Git-Tag: v2.0.0~6^2~200 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f4f7296fa8b371ed06addd4e7d1f0662c01b2b76;p=thirdparty%2Fbootstrap.git Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip Conflicts: docs/less.html docs/templates/pages/less.mustache --- f4f7296fa8b371ed06addd4e7d1f0662c01b2b76 diff --cc docs/less.html index 6bb04e8d86,955f900a2f..ac75dd3469 --- a/docs/less.html +++ b/docs/less.html @@@ -396,8 -554,85 +396,9 @@@
-

Mixins from mixins.less

+

Bootstrap mixins

+ - - - -
-

Operations

-
- - - - -
-

Compiling LESS and Bootstrap

-
- - - - - -
-
-

Using Bootstrap with Less Supercharge your CSS with variables, mixins, and functions

-
-
-
-

Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.

-

Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.

-
-
-

How to use it

-

Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.

-
 -<link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
 -<script src="js/less-1.2.1.min.js"></script>
-

Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.

- -

What’s included

-

Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.

-

Variables

-

Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.

-
 -// Links
 -@linkColor:         #8b59c2;
 -@linkColorHover:    darken(@linkColor, 10);
 -
 -// Grays
 -@black:             #000;
 -@grayDark:          lighten(@black, 25%);
 -@gray:              lighten(@black, 50%);
 -@grayLight:         lighten(@black, 70%);
 -@grayLighter:       lighten(@black, 90%);
 -@white:             #fff;
 -
 -// Accent Colors
 -@blue:              #08b5fb;
 -@green:             #46a546;
 -@red:               #9d261d;
 -@yellow:            #ffc40d;
 -@orange:            #f89406;
 -@pink:              #c3325f;
 -@purple:            #7a43b6;
 -
 -// Baseline grid
 -@basefont:          13px;
 -@baseline:          18px;
 -
- -

Commenting

-

Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.

-
 -// This is a comment
 -/* This is also a comment */
 -
-

Mixins up the wazoo

Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.

Font stacks

diff --cc docs/templates/pages/less.mustache index 76ecf70c9e,ed70002036..b3b9c15ebe --- a/docs/templates/pages/less.mustache +++ b/docs/templates/pages/less.mustache @@@ -333,8 -494,85 +333,9 @@@
-

{{_i}}Mixins from mixins.less{{/i}}

-
- - - - -
-

{{_i}}Operations{{/i}}

+

{{_i}}Bootstrap mixins {{/i}}

+ - - - -
-

{{_i}}Compiling LESS and Bootstrap{{/i}}

-
- - - - - -
-
-

{{_i}}Using Bootstrap with Less Supercharge your CSS with variables, mixins, and functions{{/i}}

-
-
-
-

{{_i}}Bootstrap was built with Preboot, an open-source pack of mixins and variables to be used in conjunction with Less, a CSS preprocessor for faster and easier web development.{{/i}}

-

{{_i}}Check out how we used Preboot in Bootstrap and how you can make use of it should you choose to run Less on your next project.{{/i}}

-
-
-

{{_i}}How to use it{{/i}}

-

{{_i}}Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.{{/i}}

-
 -<link rel="stylesheet/less" href="less/bootstrap.less" media="all" />
 -<script src="js/less-1.2.1.min.js"></script>
-

{{_i}}Not feeling the .js solution? Try the Less Mac app or use Node.js to compile when you deploy your code.{{/i}}

- -

{{_i}}What’s included{{/i}}

-

{{_i}}Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.{{/i}}

-

{{_i}}Variables{{/i}}

-

{{_i}}Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.{{/i}}

-
 -// Links
 -@linkColor:         #8b59c2;
 -@linkColorHover:    darken(@linkColor, 10);
 -
 -// Grays
 -@black:             #000;
 -@grayDark:          lighten(@black, 25%);
 -@gray:              lighten(@black, 50%);
 -@grayLight:         lighten(@black, 70%);
 -@grayLighter:       lighten(@black, 90%);
 -@white:             #fff;
 -
 -// Accent Colors
 -@blue:              #08b5fb;
 -@green:             #46a546;
 -@red:               #9d261d;
 -@yellow:            #ffc40d;
 -@orange:            #f89406;
 -@pink:              #c3325f;
 -@purple:            #7a43b6;
 -
 -// Baseline grid
 -@basefont:          13px;
 -@baseline:          18px;
 -
- -

{{_i}}Commenting{{/i}}

-

{{_i}}Less also provides another style of commenting in addition to CSS’s normal /* ... */ syntax.{{/i}}

-
 -// This is a comment
 -/* This is also a comment */
 -
-

{{_i}}Mixins up the wazoo{{/i}}

{{_i}}Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like box-shadow, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.{{/i}}

{{_i}}Font stacks{{/i}}