diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index a654061b57..dc9e16919d 100644 --- a/bootstrap-1.0.0.css +++ b/bootstrap-1.0.0.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: Fri Aug 19 22:27:16 PDT 2011 + * Date: Sat Aug 20 01:50:35 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -466,7 +466,7 @@ p { font-size: 13px; font-weight: normal; line-height: 18px; - margin-bottom: 18px; + margin-bottom: 9px; } p small { font-size: 11px; @@ -629,6 +629,7 @@ pre { margin: 0 0 18px; line-height: 18px; font-size: 12px; + border: 1px solid #ccc; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-border-radius: 3px; -moz-border-radius: 3px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 716e3cb888..b665c42884 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -54,7 +54,7 @@ a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3; .btn:disabled,.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} .btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.1),0 1px 2px rgba(0, 0, 0, 0.05);} button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;} -p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:18px;}p small{font-size:11px;color:#bfbfbf;} +p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;} h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;} h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;} h2{font-size:24px;line-height:36px;}h2 small{font-size:14px;} @@ -81,7 +81,7 @@ blockquote small{display:block;font-size:12px;font-weight:300;line-height:18px;c address{display:block;line-height:18px;margin-bottom:18px;} code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;} code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;} -pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre-wrap;} +pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre-wrap;} form{margin-bottom:18px;}form fieldset{margin-bottom:18px;padding-top:18px;}form fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;color:#404040;} form div.clearfix{margin-bottom:18px;} form label,form input,form select,form textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;} diff --git a/docs/assets/img/browsers.png b/docs/assets/img/browsers.png new file mode 100644 index 0000000000..0dae62c788 Binary files /dev/null and b/docs/assets/img/browsers.png differ diff --git a/docs/index.html b/docs/index.html index a6d2bc5ee1..85965e1b1d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -77,25 +77,43 @@

Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.

Bootstrap on GitHub »

- +
+
+
+

About Bootstrap Brief history, browser support, and more

+
+
+
+

History

+

In the earlier days of Twitter, engineers used almost any library they were familiar with to meet front-end requirements. Bootstrap began as an answer to the challenges that presented and development quickly accelerated during Twitter’s first Hackweek.

+

With the help and feedback of many engineers at Twitter, Bootstrap has grown significantly to encompass not only basic styles, but more elegant and durable front-end design patterns.

+

Read more on dev.twitter.com ›

+
+
+

Browser support

+

Bootstrap is tested and supported most thoroughly in modern browsers like Chrome, Safari, and Firefox. Full support for versions of Internet Explorer is in the works.

+ Tested and supported in Chrome, Safari, and Firefox +
+
+
-
-

Grid system Rock the standard 940px or roll your own

-
-
-
-

Default grid

-

The default grid system provided as part of Bootstrap is a 940px wide 16-column grid. It’s a flavor of the popular 960 grid system, but without the additional margin/padding on the left and right sides.

+
+

Grid system Rock the standard 940px or roll your own

-
-

Example grid markup

-

As shown here, a basic layout can be created with two "columns," each spanning a number of the 16 foundational columns we defined as part of our grid system. See the examples below for more variations.

+
+
+

Default grid

+

The default grid system provided as part of Bootstrap is a 940px wide 16-column grid. It’s a flavor of the popular 960 grid system, but without the additional margin/padding on the left and right sides.

+
+
+

Example grid markup

+

As shown here, a basic layout can be created with two "columns," each spanning a number of the 16 foundational columns we defined as part of our grid system. See the examples below for more variations.

 <div class="row">
   <div class="span6 columns">
@@ -106,94 +124,82 @@
   </div>
 </div>
-
-
- -
-
1
-
1
-
1
-
1
- -
1
-
1
-
1
-
1
- -
1
-
1
-
1
-
1
- -
1
-
1
-
1
-
1
-
- -
-
2
-
2
-
2
-
2
-
2
-
2
-
2
-
2
-
- -
-
3
-
3
-
3
-
3
-
3
-
1
-
- -
-
4
-
4
-
4
-
4
-
- -
-
4
-
6
-
6
-
- -
-
8
-
8
-
- -
-
5
-
11
-
- -
-
16
-
- -

Offsetting columns

-
-
4
-
8 offset 4
-
-
-
4 offset 4
-
4 offset 4
-
-
-
5 offset 3
-
5 offset 3
-
-
-
10 offset 6
-
+
+
+
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
1
+
+
+
2
+
2
+
2
+
2
+
2
+
2
+
2
+
2
+
+
+
3
+
3
+
3
+
3
+
3
+
1
+
+
+
4
+
4
+
4
+
4
+
+
+
4
+
6
+
6
+
+
+
8
+
8
+
+
+
5
+
11
+
+
+
16
+
+

Offsetting columns

+
+
4
+
8 offset 4
+
+
+
4 offset 4
+
4 offset 4
+
+
+
5 offset 3
+
5 offset 3
+
+
+
10 offset 6
+
diff --git a/lib/type.less b/lib/type.less index e2f745b264..96a2310b1e 100644 --- a/lib/type.less +++ b/lib/type.less @@ -8,7 +8,7 @@ p { #font > .shorthand(normal,@basefont,@baseline); - margin-bottom: @baseline; + margin-bottom: @baseline / 2; small { font-size: 11px; color: @grayLight; @@ -178,6 +178,7 @@ pre { margin: 0 0 @baseline; line-height: @baseline; font-size: 12px; + border: 1px solid #ccc; border: 1px solid rgba(0,0,0,.15); .border-radius(3px); white-space: pre-wrap;