diff --git a/bootstrap.css b/bootstrap.css index fb3a3f2ab3..a33bd7312c 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Tue Jan 24 13:58:10 PST 2012 + * Date: Tue Jan 24 16:01:37 PST 2012 */ article, aside, @@ -411,15 +411,18 @@ address { code, pre { padding: 0 3px 2px; font-family: Menlo, Monaco, "Courier New", monospace; - font-size: 12px; + font-size: 11px; color: #333333; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; } code { - padding: 1px 3px; + padding: 3px 4px; background-color: #fee9cc; + color: #d14; + background-color: #f7f7f9; + border: 1px solid #e1e1e8; } pre { display: block; diff --git a/bootstrap.min.css b/bootstrap.min.css index f0412c724d..bf98b8c57d 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -82,8 +82,8 @@ blockquote small{display:block;line-height:18px;color:#999999;}blockquote small: blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;} q:before,q:after,blockquote:before,blockquote:after{content:"";} address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;} -code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} -code{padding:1px 3px;background-color:#fee9cc;} +code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:11px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} +code{padding:3px 4px;background-color:#fee9cc;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;} pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;} pre code{padding:0;background-color:transparent;} small{font-size:100%;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index b8d5bfcdc0..d78cea2b19 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -126,7 +126,6 @@ section { /* Subnav */ .subhead .nav { - padding: 0 10px; background-color: #eeeeee; /* Old browsers */ background-repeat: repeat-x; /* Repeat the gradient */ background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */ @@ -136,7 +135,7 @@ section { background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */ background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */ - border: 1px solid #eee; + border: 1px solid #e5e5e5; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -145,6 +144,9 @@ section { margin: 0; padding-top: 11px; padding-bottom: 11px; + font-size: 13px; + border-left: 1px solid #f5f5f5; + border-right: 1px solid #e5e5e5; -webkit-border-radius: 0; -moz-border-radius: 0; border-radius: 0; @@ -153,6 +155,15 @@ section { background-color: #fff; color: #333; } +.subhead .nav li:first-child a { + border-left: 0; + -webkit-border-radius: 4px 0 0 4px; + -moz-border-radius: 4px 0 0 4px; + border-radius: 4px 0 0 4px; +} +.subhead .nav li:last-child a { + border-right: 0; +} /* Quick links @@ -247,16 +258,19 @@ section { height: auto; margin-left: auto; margin-right: auto; - line-height: 21px; + font-family: Menlo, Monaco, "Courier New", monospace; + font-size: 12px; + line-height: 20px; white-space: nowrap; overflow: hidden; + background-color: #f5f5f5; /* Makes inputs behave like true block-level elements */ -webkit-box-sizing: border-box; /* Older Webkit */ -moz-box-sizing: border-box; /* Older FF */ -ms-box-sizing: border-box; /* IE8 */ box-sizing: border-box; /* CSS3 spec*/ /* Hacks for IE7 to make this work just okay enough to function */ - *width: 270px; + *width: 80%; *height: 24px; } diff --git a/docs/index.html b/docs/index.html index 0beff1e7e2..1e4b4a270b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -136,7 +136,7 @@ - +

Designed for everyone, everywhere.

Need reasons to love Bootstrap? Look no further.

diff --git a/docs/less.html b/docs/less.html index cd486ac986..735bd0dc64 100644 --- a/docs/less.html +++ b/docs/less.html @@ -63,207 +63,244 @@

Using LESS with Bootstrap

Customize and extend Bootstrap with LESS, a CSS preprocessor, to take advantage of the variables, mixins, and more used to build Bootstrap's CSS.

+
-
-

Built with LESS

-
-
-
-

Why LESS?

-

Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

+
+
+

Built with LESS

-
-

What's included?

-

As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.

+
+
+

Why LESS?

+

Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.

+
+
+

What's included?

+

As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.

+
+
+

Learn more

+ LESS CSS +

Visit the official website at http://lesscss.org to learn more.

+
-
-

Learn more

- LESS CSS -

Visit the official website at http://lesscss.org to learn more.

+
+
+

Variables

+

Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.

+
+
+

Mixins

+

Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.

+
+
+

Operations

+

Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.

+
-
-
-
-

Variables

-

Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.

-
-
-

Mixins

-

Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.

-
-
-

Operations

-

Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.

-
-
+
-
-

Variables from variables.less

-
+
+
+

Variables from variables.less

+
-

Hyperlinks

- - - - - - - - - - - - - - - - - - - - -
VariableValueUsage
@linkColor#0069d6Default link text color
@linkColorHoverdarken(@linkColor, 15)Default link text hover color
+

Hyperlinks

+ + + + + + + + + + + + + + + + + + + + +
VariableValueUsage
@linkColor#08cDefault link text color
@linkColorHoverdarken(@linkColor, 15%)Default link text hover color
-
-
-

Grayscale colors

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
@black#000
@grayDarklighten(@black, 25%)
@graylighten(@black, 50%)
@grayLightlighten(@black, 75%)
@grayLighterlighten(@black, 90%)
@white#fff
-
-
-

Accent colors

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@blue#049CDB
@green#46a546
@red#9d261d
@yellow#ffc40d
@orange#f89406
@pink#c3325f
@purple#7a43b6
-
-
+
+
+

Grayscale colors

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
VariableValue
@black#000
@grayDarker#222
@grayDark#333
@gray#555
@grayLight#999
@grayLighter#eee
@white#fff
+
+
+

Accent colors

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
VariableValue
@blue#049cdb
@green#46a546
@red#9d261d
@yellow#ffc40d
@orange#f89406
@pink#c3325f
@purple#7a43b6
+
+
+
+
+

Grid system

+ + + + + + + + + + + + + + + + + + + + + + + + + +
VariableValue
@gridColumns12
@gridColumnWidth60px
@gridGutterWidth20px
@siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
+
+
+

Typography

+ + + + + + + + + + + + + + + + + + + + + + +
VariableValue
@baseFontSize13px
@baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
@baseLineHeight18px
+
+
+
+
+

Visuals

+
+
+ + + + + + + + +
@primaryButtonColor@blue
+
+
+
-
-
-

Grid system

- - - - - - - - - - - - - - - - - - - -
@gridColumns12
@gridColumnWidth60px
@gridGutterWidth20px
@siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
-
-
-

Typography

- - - - - - - - - - - - - - - - -
@baseFontSize13px
@baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
@baseLineHeight18px
-
-
- -
-
-

Visuals

-
-
- - - - - - - - -
@primaryButtonColor@blue
-
-
-
-

{{_i}}Built with LESS{{/i}}

-
-
-
-

{{_i}}Why LESS?{{/i}}

-

{{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}

+
+
+

{{_i}}Built with LESS{{/i}}

-
-

{{_i}}What's included?{{/i}}

-

{{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}

+
+
+

{{_i}}Why LESS?{{/i}}

+

{{_i}}Bootstrap is made with LESS at it's core, a dynamic stylesheet language created by Alexis Sellier. It makes developing systems-based CSS faster, easier, and more fun.{{/i}}

+
+
+

{{_i}}What's included?{{/i}}

+

{{_i}}As an extension of CSS, LESS includes variables, mixins for reusable snippets of code, operations for simple math, nesting, and even color functions.{{/i}}

+
+
+

{{_i}}Learn more{{/i}}

+ LESS CSS +

{{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}

+
-
-

{{_i}}Learn more{{/i}}

- LESS CSS -

{{_i}}Visit the official website at http://lesscss.org to learn more.{{/i}}

+
+
+

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

+

{{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}

+
+
+

{{_i}}Mixins{{/i}}

+

{{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}

+
+
+

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

+

{{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}

+
-
-
-
-

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

-

{{_i}}Managing colors and pixel values in CSS can be a bit of a pain, usually full of copy and paste. Not with LESS though—assign colors or pixel values as variables and change them once.{{/i}}

-
-
-

{{_i}}Mixins{{/i}}

-

{{_i}}Those three border-radius declarations you need to make in regular ol' CSS? Now they're down to one line with the help of mixins, snippets of code you can reuse anywhere.{{/i}}

-
-
-

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

-

{{_i}}Make your grid, leading, and more super flexible by doing the math on the fly with operations. Multiple, divide, add, and subtract your way to CSS sanity.{{/i}}

-
-
+
-
-

{{_i}}Variables from variables.less{{/i}}

-
+
+
+

{{_i}}Variables from variables.less{{/i}}

+
-

{{_i}}Hyperlinks{{/i}}

- - - - - - - - - - - - - - - - - - - - -
{{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
@linkColor#0069d6{{_i}}Default link text color{{/i}}
@linkColorHoverdarken(@linkColor, 15){{_i}}Default link text hover color{{/i}}
+

{{_i}}Hyperlinks{{/i}}

+ + + + + + + + + + + + + + + + + + + + +
{{_i}}Variable{{/i}}{{_i}}Value{{/i}}{{_i}}Usage{{/i}}
@linkColor#08c{{_i}}Default link text color{{/i}}
@linkColorHoverdarken(@linkColor, 15%){{_i}}Default link text hover color{{/i}}
-
-
-

{{_i}}Grayscale colors{{/i}}

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
@black#000
@grayDarklighten(@black, 25%)
@graylighten(@black, 50%)
@grayLightlighten(@black, 75%)
@grayLighterlighten(@black, 90%)
@white#fff
-
-
-

{{_i}}Accent colors{{/i}}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@blue#049CDB
@green#46a546
@red#9d261d
@yellow#ffc40d
@orange#f89406
@pink#c3325f
@purple#7a43b6
-
-
+
+
+

{{_i}}Grayscale colors{{/i}}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{_i}}Variable{{/i}}{{_i}}Value{{/i}}
@black#000
@grayDarker#222
@grayDark#333
@gray#555
@grayLight#999
@grayLighter#eee
@white#fff
+
+
+

{{_i}}Accent colors{{/i}}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{_i}}Variable{{/i}}{{_i}}Value{{/i}}
@blue#049cdb
@green#46a546
@red#9d261d
@yellow#ffc40d
@orange#f89406
@pink#c3325f
@purple#7a43b6
+
+
+
+
+

{{_i}}Grid system{{/i}}

+ + + + + + + + + + + + + + + + + + + + + + + + + +
{{_i}}Variable{{/i}}{{_i}}Value{{/i}}
@gridColumns12
@gridColumnWidth60px
@gridGutterWidth20px
@siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
+
+
+

{{_i}}Typography{{/i}}

+ + + + + + + + + + + + + + + + + + + + + + +
{{_i}}Variable{{/i}}{{_i}}Value{{/i}}
@baseFontSize13px
@baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
@baseLineHeight18px
+
+
+
+
+

{{_i}}Visuals{{/i}}

+
+
+ + + + + + + + +
@primaryButtonColor@blue
+
+
+
-
-
-

{{_i}}Grid system{{/i}}

- - - - - - - - - - - - - - - - - - - -
@gridColumns12
@gridColumnWidth60px
@gridGutterWidth20px
@siteWidth(@gridColumns * @gridColumnWidth) + (@gridGutterWidth * (@gridColumns - 1))
-
-
-

{{_i}}Typography{{/i}}

- - - - - - - - - - - - - - - - -
@baseFontSize13px
@baseFontFamily"Helvetica Neue", Helvetica, Arial, sans-serif
@baseLineHeight18px
-
-
- -
-
-

{{_i}}Visuals{{/i}}

-
-
- - - - - - - - -
@primaryButtonColor@blue
-
-