diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index d77366625c..0e1ab56a24 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: Sun Aug 21 21:42:07 PDT 2011 + * Date: Sun Aug 21 21:42:52 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). @@ -121,6 +121,26 @@ aside { .container:after { clear: both; } +/*.button(@color: #fff, @padding: 4px 14px, @textColor: #333, @textShadow: 0 1px 1px rgba(255,255,255,.75), @fontSize: 13px, @borderColor: rgba(0,0,0,.1), @borderRadius: 4px) { + display: inline-block; + #gradient > .vertical-three-colors(@color, @color, 0.25, darken(@color, 10%)); + padding: @padding; + text-shadow: @textShadow; + color: @textColor; + font-size: @fontSize; + line-height: @baseline; + border: 1px solid; + border-color: #ccc #ccc #bbb; + border-color: borderColor borderColor fadein(@borderColor, 15%); + .border-radius(@borderRadius); + @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05); + .box-shadow(@shadow); + &:hover { + background-position: 0 -15px; + color: @textColor; + text-decoration: none; + } +}*/ /* * Scaffolding * Basic and global styles for generating a grid system, structural layout, and page templates @@ -339,7 +359,7 @@ html, body { background-color: #fff; } body { - margin: 60px 0 0; + margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; @@ -375,6 +395,7 @@ a { color: #0069d6; text-decoration: none; line-height: inherit; + font-weight: inherit; } a:hover { color: #0050a3; @@ -392,28 +413,24 @@ a:hover { background-image: linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6); padding: 4px 14px; text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75); - color: #333333; + color: #333; font-size: 13px; line-height: 18px; - border: 1px solid; - border-color: #ccc #ccc #bbb; - border-color: borderColor borderColor rgba(0, 0, 0, 0.25); + border: 1px solid #ccc; + border-bottom-color: #bbb; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); - -webkit-transition: 0.1s linear all; - -moz-transition: 0.1s linear all; - transition: 0.1s linear all; } .btn:hover { background-position: 0 -15px; - color: #333333; + color: #333; text-decoration: none; } -.btn.primary { +.primary { background-color: #0064cd; background-repeat: repeat-x; background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd)); @@ -423,6 +440,20 @@ a:hover { background-image: -webkit-linear-gradient(#049cdb, #0064cd); background-image: -o-linear-gradient(#049cdb, #0064cd); background-image: linear-gradient(#049cdb, #0064cd); + color: #fff; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + border: 1px solid #004b9a; + border-bottom-color: #003f81; +} +.primary:hover { + color: #fff; +} +.btn { + -webkit-transition: 0.1s linear all; + -moz-transition: 0.1s linear all; + transition: 0.1s linear all; +} +.btn.primary { color: #fff; text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); border-color: #0064cd #0064cd #003f81; @@ -752,7 +783,7 @@ form input[type=text]:focus, form input[type=password]:focus, form textarea:focu -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6); } -form .error { +form div.error { background: #fae5e3; padding: 10px 0; margin: -10px 0 10px; @@ -760,22 +791,22 @@ form .error { -moz-border-radius: 4px; border-radius: 4px; } -form .error > label, form .error span.help-inline, form .error span.help-block { +form div.error > label, form div.error span.help-inline, form div.error span.help-block { color: #9d261d; } -form .error input[type=text], form .error input[type=password], form .error textarea { +form div.error input[type=text], form div.error input[type=password], form div.error textarea { border-color: #c87872; -webkit-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); -moz-box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); box-shadow: 0 0 3px rgba(171, 41, 32, 0.25); } -form .error input[type=text]:focus, form .error input[type=password]:focus, form .error textarea:focus { +form div.error input[type=text]:focus, form div.error input[type=password]:focus, form div.error textarea:focus { border-color: #b9554d; -webkit-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); -moz-box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); box-shadow: 0 0 6px rgba(171, 41, 32, 0.5); } -form .error .input-prepend span.add-on, form .error .input-append span.add-on { +form div.error .input-prepend span.add-on, form div.error .input-append span.add-on { background: #f4c8c5; border-color: #c87872; color: #b9554d; @@ -994,6 +1025,13 @@ form.form-stacked .inputs-list li label { font-weight: normal; padding-top: 0; } +form.form-stacked div.error { + padding-top: 10px; + padding-bottom: 10px; + padding-left: 10px; + margin-top: 0; + margin-left: -10px; +} form.form-stacked .actions { margin-left: -20px; padding-left: 20px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index 82f7db59ce..f20af750a7 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -40,15 +40,16 @@ header,section,footer,article,aside{display:block;} .row .offset11{margin-left:680px !important;}.row .offset11:first-child{margin-left:660px !important;} .row .offset12{margin-left:740px !important;}.row .offset12:first-child{margin-left:720px !important;} html,body{background-color:#fff;} -body{margin:60px 0 0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;} +body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;text-rendering:optimizeLegibility;} div.container{width:940px;margin:0 auto;} div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";} div.container-fluid:after{clear:both;} div.container-fluid div.sidebar{float:left;width:220px;} div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;} -a{color:#0069d6;text-decoration:none;line-height:inherit;}a:hover{color:#0050a3;text-decoration:underline;} -.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333333;font-size:13px;line-height:18px;border:1px solid;border-color:#ccc #ccc #bbb;border-color:borderColor borderColor rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn:hover{background-position:0 -15px;color:#333333;text-decoration:none;} -.btn.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} +a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;} +.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, color-stop(0.25, #ffffff), #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:-o-linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);background-image:linear-gradient(#ffffff, color-stop(#ffffff, 0.25), #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;} +.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(#049cdb, #0064cd);background-image:-ms-linear-gradient(#049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(#049cdb, #0064cd);background-image:-o-linear-gradient(#049cdb, #0064cd);background-image:linear-gradient(#049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;} +.btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;} .btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;} .btn.small{padding-right:9px;padding-left:9px;font-size:11px;} .btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;} @@ -97,9 +98,9 @@ form :-moz-placeholder{color:#bfbfbf;} form ::-webkit-input-placeholder{color:#bfbfbf;} form input[type=text],form input[type=password],form select,form textarea{-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1);} form input[type=text]:focus,form input[type=password]:focus,form textarea:focus{outline:none;border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 3px rgba(0, 0, 0, 0.1),0 0 8px rgba(82, 168, 236, 0.6);} -form .error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form .error>label,form .error span.help-inline,form .error span.help-block{color:#9d261d;} -form .error input[type=text],form .error input[type=password],form .error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form .error input[type=text]:focus,form .error input[type=password]:focus,form .error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} -form .error .input-prepend span.add-on,form .error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} +form div.error{background:#fae5e3;padding:10px 0;margin:-10px 0 10px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}form div.error>label,form div.error span.help-inline,form div.error span.help-block{color:#9d261d;} +form div.error input[type=text],form div.error input[type=password],form div.error textarea{border-color:#c87872;-webkit-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);-moz-box-shadow:0 0 3px rgba(171, 41, 32, 0.25);box-shadow:0 0 3px rgba(171, 41, 32, 0.25);}form div.error input[type=text]:focus,form div.error input[type=password]:focus,form div.error textarea:focus{border-color:#b9554d;-webkit-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);-moz-box-shadow:0 0 6px rgba(171, 41, 32, 0.5);box-shadow:0 0 6px rgba(171, 41, 32, 0.5);} +form div.error .input-prepend span.add-on,form div.error .input-append span.add-on{background:#f4c8c5;border-color:#c87872;color:#b9554d;} form .input-mini,form input.mini,form textarea.mini,form select.mini{width:60px;} form .input-small,form input.small,form textarea.small,form select.small{width:90px;} form .input-medium,form input.medium,form textarea.medium,form select.medium{width:150px;} @@ -132,6 +133,7 @@ form.form-stacked legend{margin-left:0;} form.form-stacked label{display:block;float:none;width:auto;font-weight:bold;text-align:left;line-height:20px;padding-top:0;} form.form-stacked .clearfix{margin-bottom:9px;}form.form-stacked .clearfix div.input{margin-left:0;} form.form-stacked .inputs-list{margin-bottom:0;}form.form-stacked .inputs-list li{padding-top:0;}form.form-stacked .inputs-list li label{font-weight:normal;padding-top:0;} +form.form-stacked div.error{padding-top:10px;padding-bottom:10px;padding-left:10px;margin-top:0;margin-left:-10px;} form.form-stacked .actions{margin-left:-20px;padding-left:20px;} table{width:100%;margin-bottom:18px;padding:0;border-collapse:separate;font-size:13px;}table th,table td{padding:10px 10px 9px;line-height:13.5px;text-align:left;vertical-align:middle;border-bottom:1px solid #ddd;} table th{padding-top:9px;font-weight:bold;border-bottom-width:2px;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 96c9ffb978..b7d241994b 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -44,7 +44,7 @@ section { font-weight: bold; } #masthead { - margin-top: -20px; + margin-top: 40px; } #masthead h1, #masthead p { @@ -146,34 +146,6 @@ div.quickstart form textarea { .show-grid:hover .column, .show-grid:hover .columns { background: rgba(0, 0, 0, 0.25); } -/* Hashgrid.js grid (press G & H to view) --------------------------------------------------- */ -#grid { - width: 980px; - position: absolute; - top: 0; - left: 50%; - margin-left: -490px; -} -#grid div.vert { - background-color: rgba(0, 206, 209, 0.075); - width: 39px; - border: solid darkturquoise; - border-width: 0 1px; - margin-right: 19px; -} -#grid div.vert.first-line { - margin-left: 19px; -} -#grid div.horiz { - height: 19px; - border-bottom: 1px solid rgba(255, 0, 0, 0.1); - margin: 0; - padding: 0; -} -#grid div.horiz:nth-child(5n) { - border-color: rgba(255, 0, 0, 0.25); -} /* Render mini layout previews -------------------------------------------------- */ div.mini-layout { @@ -199,7 +171,9 @@ div.mini-layout div.mini-layout-body { width: 450px; height: 340px; } -div.mini-layout.fluid div.mini-layout-sidebar, div.mini-layout.fluid div.mini-layout-header, div.mini-layout.fluid div.mini-layout-body { +div.mini-layout.fluid div.mini-layout-sidebar, +div.mini-layout.fluid div.mini-layout-header, +div.mini-layout.fluid div.mini-layout-body { float: left; } div.mini-layout.fluid div.mini-layout-sidebar { diff --git a/docs/index.html b/docs/index.html index cfd77581c3..0b9cbd825f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -31,6 +31,8 @@ +
@@ -52,6 +54,8 @@
+
@@ -65,6 +69,8 @@
+
@@ -94,6 +100,10 @@
+ + +

About Bootstrap Brief history, browser support, and more

@@ -128,6 +138,10 @@
+ + +

Grid system Rock the standard 940px or roll your own

@@ -230,11 +244,14 @@ - +

Layouts Basic templates to create webpages

+ +

Fixed layout

@@ -252,7 +269,9 @@ </body>
-
+
+ +

Fluid layout

@@ -276,286 +295,291 @@ </body>
-
+
+
-
-

Typography Headings, paragraphs, lists, and other inline type elements

-
+
+

Typography Headings, paragraphs, lists, and other inline type elements

+
-
-
-

Headings and copy

-

A standard typographic hierarchy for structuring your webpages.

+ +
+
+

Headings and copy

+

A standard typographic hierarchy for structuring your webpages.

+
+
+

h1. Heading 1

+

h2. Heading 2

+

h3. Heading 3

+

h4. Heading 4

+
h5. Heading 5
+
h6. Heading 6
+
+
+

Example paragraph

+

Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.

+

Example heading Has sub-heading…

+
-
-

h1. Heading 1

-

h2. Heading 2

-

h3. Heading 3

-

h4. Heading 4

-
h5. Heading 5
-
h6. Heading 6
-
-
-

Example paragraph

-

Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula ut id elit.

-

Example heading Has sub-heading…

-
-
-
-
-

Misc. elements

-

Using emphasis, addresses, & abbreviations

-

- <strong> - <em> - <address> - <abbr> -

-
-
-

When to use

-

Emphasis tags (<strong> and <em>) should be used to indicate additional importance or emphasis of a word or phrase relative to its surrounding copy. Use <strong> for importance and <em> for stress emphasis.

-

Emphasis in a paragraph

-

Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.

-

Note: It's still okay to use <b> and <i> tags in HTML5, but they don't come with inherent styles anymore. <b> is meant to highlight words or phrases without conveying additional importance, while <i> is mostly for voice, technical terms, etc.

-

Addresses

-

The <address> element is used for contact information for its nearest ancestor, or the entire body of work. Here’s how it looks:

-
- Twitter, Inc.
- 795 Folsom Ave, Suite 600
- San Francisco, CA 94107
- P: (123) 456-7890 -
-

Note: Each line in an <address> must end with a line-break (<br />) or be wrapped in a block-level tag (e.g., <p>) to properly structure the content.

-

Abbreviations

-

For abbreviations and acronyms, use the <abbr> tag (<acronym> is deprecated in HTML5). Put the shorthand form within the tag and set a title for the complete name.

-
-
+ +
+
+

Misc. elements

+

Using emphasis, addresses, & abbreviations

+

+ <strong> + <em> + <address> + <abbr> +

+
+
+

When to use

+

Emphasis tags (<strong> and <em>) should be used to indicate additional importance or emphasis of a word or phrase relative to its surrounding copy. Use <strong> for importance and <em> for stress emphasis.

+

Emphasis in a paragraph

+

Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.

+

Note: It's still okay to use <b> and <i> tags in HTML5, but they don't come with inherent styles anymore. <b> is meant to highlight words or phrases without conveying additional importance, while <i> is mostly for voice, technical terms, etc.

+

Addresses

+

The <address> element is used for contact information for its nearest ancestor, or the entire body of work. Here’s how it looks:

+
+ Twitter, Inc.
+ 795 Folsom Ave, Suite 600
+ San Francisco, CA 94107
+ P: (123) 456-7890 +
+

Note: Each line in an <address> must end with a line-break (<br />) or be wrapped in a block-level tag (e.g., <p>) to properly structure the content.

+

Abbreviations

+

For abbreviations and acronyms, use the <abbr> tag (<acronym> is deprecated in HTML5). Put the shorthand form within the tag and set a title for the complete name.

+
+
-
-
-

Blockquotes

-

- <blockquote> - <p> - <small> -

-
-
-

Be sure to wrap your <blockquote> around <p> and <small> tags. When citing a source, use the <small> element. The CSS will automatically preface a name with an em dash (&mdash;).

-
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua…

- Dr. Julius Hibbert -
-
-
+ +
+
+

Blockquotes

+

+ <blockquote> + <p> + <small> +

+
+
+

Be sure to wrap your <blockquote> around <p> and <small> tags. When citing a source, use the <small> element. The CSS will automatically preface a name with an em dash (&mdash;).

+
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua…

+ Dr. Julius Hibbert +
+
+
- -

Lists

-
-
-

Unordered <ul>

-
    -
  • Lorem ipsum dolor sit amet
    • -
  • Consectetur adipiscing elit
    • -
  • Integer molestie lorem at massa
    • -
  • Facilisis in pretium nisl aliquet
    • -
  • Nulla volutpat aliquam velit -
      -
    • Phasellus iaculis neque
      • -
    • Purus sodales ultricies
      • -
    • Vestibulum laoreet porttitor sem
      • -
    • Ac tristique libero volutpat at
      • -
    -
    • -
  • Faucibus porta lacus fringilla vel
    • -
  • Aenean sit amet erat nunc
    • -
  • Eget porttitor lorem
    • -
-
-
-

Unstyled <ul.unstyled>

-
    -
  • Lorem ipsum dolor sit amet
    • -
  • Consectetur adipiscing elit
    • -
  • Integer molestie lorem at massa
    • -
  • Facilisis in pretium nisl aliquet
    • -
  • Nulla volutpat aliquam velit -
      -
    • Phasellus iaculis neque
      • -
    • Purus sodales ultricies
      • -
    • Vestibulum laoreet porttitor sem
      • -
    • Ac tristique libero volutpat at
      • -
    -
    • -
  • Faucibus porta lacus fringilla vel
    • -
  • Aenean sit amet erat nunc
    • -
  • Eget porttitor lorem
    • -
-
-
-

Ordered <ol>

-
    -
  1. Lorem ipsum dolor sit amet
    2. -
  2. Consectetur adipiscing elit
    3. -
  3. Integer molestie lorem at massa
    4. -
  4. Facilisis in pretium nisl aliquet
    5. -
  5. Nulla volutpat aliquam velit
    6. -
  6. Faucibus porta lacus fringilla vel
    7. -
  7. Aenean sit amet erat nunc
    8. -
  8. Eget porttitor lorem
    9. -
-
-
-

Description dl

-
-
Description lists
-
A description list is perfect for defining terms.
-
Euismod
-
Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
-
Donec id elit non mi porta gravida at eget metus.
-
Malesuada porta
-
Etiam porta sem malesuada magna mollis euismod.
-
-
-
+

Lists

+
+
+

Unordered <ul>

+
    +
  • Lorem ipsum dolor sit amet
    • +
  • Consectetur adipiscing elit
    • +
  • Integer molestie lorem at massa
    • +
  • Facilisis in pretium nisl aliquet
    • +
  • Nulla volutpat aliquam velit +
      +
    • Phasellus iaculis neque
      • +
    • Purus sodales ultricies
      • +
    • Vestibulum laoreet porttitor sem
      • +
    • Ac tristique libero volutpat at
      • +
    +
    • +
  • Faucibus porta lacus fringilla vel
    • +
  • Aenean sit amet erat nunc
    • +
  • Eget porttitor lorem
    • +
+
+
+

Unstyled <ul.unstyled>

+
    +
  • Lorem ipsum dolor sit amet
    • +
  • Consectetur adipiscing elit
    • +
  • Integer molestie lorem at massa
    • +
  • Facilisis in pretium nisl aliquet
    • +
  • Nulla volutpat aliquam velit +
      +
    • Phasellus iaculis neque
      • +
    • Purus sodales ultricies
      • +
    • Vestibulum laoreet porttitor sem
      • +
    • Ac tristique libero volutpat at
      • +
    +
    • +
  • Faucibus porta lacus fringilla vel
    • +
  • Aenean sit amet erat nunc
    • +
  • Eget porttitor lorem
    • +
+
+
+

Ordered <ol>

+
    +
  1. Lorem ipsum dolor sit amet
    2. +
  2. Consectetur adipiscing elit
    3. +
  3. Integer molestie lorem at massa
    4. +
  4. Facilisis in pretium nisl aliquet
    5. +
  5. Nulla volutpat aliquam velit
    6. +
  6. Faucibus porta lacus fringilla vel
    7. +
  7. Aenean sit amet erat nunc
    8. +
  8. Eget porttitor lorem
    9. +
+
+
+

Description dl

+
+
Description lists
+
A description list is perfect for defining terms.
+
Euismod
+
Vestibulum id ligula porta felis euismod semper eget lacinia odio sem nec elit.
+
Donec id elit non mi porta gravida at eget metus.
+
Malesuada porta
+
Etiam porta sem malesuada magna mollis euismod.
+
+
+
-
-
-

Tables For, you guessed it, tabular data

-
-
-
-

Building tables

-

- <table> - <thead> - <tbody> - <tr> - <th> - <td> - <colspan> - <caption> -

-

Tables are great—for a lot of things. Great tables, however, need a bit of markup love to be useful, scalable, and readable (at the code level). Here are a few tips to help.

-

Always wrap your column headers in a <thead> such that hierarchy is <thead> > <tr> > <th>.

-

Similar to the column headers, all your table’s body content should be wrapped in a <tbody> so your hierarchy is <tbody> > <tr> > <td>.

+ +
+
+

Tables For, you guessed it, tabular data

-
-

Example: Default table styles

-

All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameLanguage
1SomeOneEnglish
2JoeSixpackEnglish
3StuDentCode
+ +
+
+

Building tables

+

+ <table> + <thead> + <tbody> + <tr> + <th> + <td> + <colspan> + <caption> +

+

Tables are great—for a lot of things. Great tables, however, need a bit of markup love to be useful, scalable, and readable (at the code level). Here are a few tips to help.

+

Always wrap your column headers in a <thead> such that hierarchy is <thead> > <tr> > <th>.

+

Similar to the column headers, all your table’s body content should be wrapped in a <tbody> so your hierarchy is <tbody> > <tr> > <td>.

+
+
+

Example: Default table styles

+

All tables will be automatically styled with only the essential borders to ensure readability and maintain structure. No need to add extra classes or attributes.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameLanguage
1SomeOneEnglish
2JoeSixpackEnglish
3StuDentCode
 <table class="common-table">
   ...
 </table>
- -

Example: Zebra-striped

-

Get a little fancy with your tables by adding zebra-striping—just add the .zebra-striped class.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameLanguage
1SomeOneEnglish
2JoeSixpackEnglish
3StuDentCode
+

Example: Zebra-striped

+

Get a little fancy with your tables by adding zebra-striping—just add the .zebra-striped class.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameLanguage
1SomeOneEnglish
2JoeSixpackEnglish
3StuDentCode
 <table class="common-table zebra-striped">
 ...
 </table>
- -

Example: Zebra-striped w/ TableSorter.js

-

Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameLanguage
1YourOneEnglish
2JoeSixpackEnglish
3StuDentCode
+

Example: Zebra-striped w/ TableSorter.js

+

Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via jQuery and the Tablesorter plugin. Click any column’s header to change the sort.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#First NameLast NameLanguage
1YourOneEnglish
2JoeSixpackEnglish
3StuDentCode
 <script src="js/jquery/jquery.tablesorter.min.js"></script>
 <script >
@@ -566,13 +590,16 @@
 <table class="common-table zebra-striped">
   ...
 </table>
-
-
+
+
+
+<<<<<<< HEAD

Forms

@@ -825,54 +852,327 @@

Buttons

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

All buttons default to a light gray style, but a blue .primary class is available. Plus, rolling your own styles is easy peasy.

+======= +
+

Forms

+>>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
-
-

Example buttons

-

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

-
+
+
+

Default styles

+

All forms are given default styles to present them in a readable and scalable way. Styles are provided for text inputs, select lists, textareas, radio buttons and checkboxes, and buttons.

+
+
+<<<<<<< HEAD   +======= +
+ Example form legend +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ Some Value Here +
+
+
+ +
+ +
+
+
+ +
+ + Small snippet of help text +
+
+
+
+ Example form legend +
+ +
+
+ @ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ Example form legend +
+ +
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+ + Note: Labels surround all the options for much larger click areas and a more usable form. + +
+
+
+ +
+
+ + + to + + + All times are shown as Pacific Standard Time (GMT -08:00). +
+
+
+
+ +
+ + + Block of help text to describe the field above if need be. + +
+
+
+ +
+
    +
  • + +
    • +
  • + +
    • +
+
+
+
+ + +
+
+>>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
-

Alternate sizes

-

Fancy larger or smaller buttons? Have at it!

-
- Primary action - Action +
+ +
+ +
+
+

Stacked forms

+

Add .form-stacked to your form’s HTML and you’ll have labels on top of their fields instead of to their left. This works great if your forms are short or you have two columns of inputs for heavier forms.

-
- Primary action - Action +
+
+
+ Example form legend +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ Example form legend +
+ +
+ + Small snippet of help text +
+
+
+ +
+
    +
  • + +
    • +
  • + +
    • +
+ + Note: Labels surround all the options for much larger click areas and a more usable form. + +
+
+
+
+ + +
+
-

Disabled state

-

For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

-

Note: If you're developing for older browsers like IE8 or below -- you're going to want to use the .disabled class for <button> elements as well. -

Links

-
- Primary action - Action +
+ +
+
+

Buttons

+

As a convention, buttons are used for actions while links are used for objects. For instance, "Download" could be a button and "recent activity" could be a link.

+

All buttons default to a light gray style, but a blue .primary class is available. Plus, rolling your own styles is easy peasy.

+<<<<<<< HEAD

Buttons

 
+======= +
+

Example buttons

+

Button styles can be applied to anything with the .btn applied. Typically you’ll want to apply these to only <a>, <button>, and select <input> elements. Here’s how it looks:

+
+ + +
+

Alternate sizes

+

Fancy larger or smaller buttons? Have at it!

+
+ Primary action + Action +
+
+ Primary action + Action +
+

Disabled state

+

For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s .disabled for links and :disabled for <button> elements.

+

Links

+
+ Primary action + Action +
+

Buttons

+
+ + +
+>>>>>>> f169c99f726c250f0bb2f68ea4eedaaf3fbe15c0
-
-
+
+
+

What is it

@@ -915,20 +1216,20 @@
-
-
-

Tabs and pills

-

Create simple secondary navigation with a <ul>. Swap between tabs or pills by adding the appropriate class.

-

Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.

-
-
- +
+
+

Tabs and pills

+

Create simple secondary navigation with a <ul>. Swap between tabs or pills by adding the appropriate class.

+

Great for sub-sections of content like our account settings pages and user timelines for toggling between pages of like content. Available in tabbed or pill styles.

+
+
+ 
 <ul class="tabs">
   <li class="active"><a href="#">Home</a></li>
@@ -938,13 +1239,13 @@
   <li><a href="#">Contact</a></li>
 </ul>
- + 
 <ul class="pills">
   <li class="active"><a href="#">Home</a></li>
@@ -954,56 +1255,57 @@
   <li><a href="#">Contact</a></li>
 </ul>
-
-
+
+
-
-
-

Pagination

-

Ultra simplistic and minimally styled pagination inspired by Rdio. The large block is hard to miss, easily scalable, and provides large click areas.

-
-
- - - +
+

Alerts & Errors Styles for success, warning, and error messages or alerts

+

Basic alerts

@@ -1051,7 +1356,8 @@

Heads up! This is an alert that needs your attention, but it’s not a huge priority just yet.

-
+
+

Block messages

@@ -1079,10 +1385,12 @@

Take this action Or do this

-
+
+

Popovers Components for displaying content in modals, tooltips, and popovers

@@ -1112,6 +1420,7 @@
+

Tool Tips

@@ -1144,6 +1453,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
+

Popovers

@@ -1170,6 +1480,8 @@ Lorem ipsum dolar sit amet illo error ipsum verita +

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

@@ -1326,6 +1638,8 @@ Lorem ipsum dolar sit amet illo error ipsum verita
+ +