From: Mark Otto Date: Sun, 21 Aug 2011 01:58:12 +0000 (-0700) Subject: updated docs to fix inconsistent display of code elements, update scaffolding to... X-Git-Tag: v1.1.0~18^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72899a4ee8f9c3b75ba5e015d6c88f5154705c62;p=thirdparty%2Fbootstrap.git updated docs to fix inconsistent display of code elements, update scaffolding to fix padding issue on fluid containers, add placeholder hero unit in patterns for future use, continue to refactor some rgba to hex values --- diff --git a/bootstrap-1.0.0.css b/bootstrap-1.0.0.css index dc9e16919d..a2ba3c38f4 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: Sat Aug 20 01:50:35 PDT 2011 + * Date: Sat Aug 20 18:40:26 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). @@ -339,7 +339,7 @@ html, body { background-color: #fff; } body { - margin: 0; + margin: 60px 0 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; font-weight: normal; @@ -352,7 +352,7 @@ div.container { margin: 0 auto; } div.container-fluid { - padding: 20px; + padding: 0 20px; zoom: 1; } div.container-fluid:before, div.container-fluid:after { @@ -1323,6 +1323,25 @@ div.topbar ul li ul li span { color: #808080; border-top: 1px solid rgba(0, 0, 0, 0.2); } +.hero-unit { + background-color: #f5f5f5; + margin-bottom: 30px; + padding: 60px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; + border-radius: 6px; +} +.hero-unit h1 { + margin-bottom: 0; + font-size: 60px; + line-height: 1; + letter-spacing: -1px; +} +.hero-unit p { + font-size: 18px; + font-weight: 200; + line-height: 27px; +} div.page-header { margin-bottom: 17px; border-bottom: 1px solid #ddd; @@ -1541,12 +1560,13 @@ div.pagination ul li.disabled a, div.pagination ul li.disabled a:hover { div.pagination ul li.next a, div.pagination ul li:last-child a { border: 0; } -div.well { - background: #f5f5f5; +.well { + background-color: #f5f5f5; margin-bottom: 20px; padding: 19px; min-height: 20px; - border: 1px solid #ddd; + border: 1px solid #eee; + border: 1px solid rgba(0, 0, 0, 0.05); -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; diff --git a/bootstrap-1.0.0.min.css b/bootstrap-1.0.0.min.css index b665c42884..6b0b218310 100644 --- a/bootstrap-1.0.0.min.css +++ b/bootstrap-1.0.0.min.css @@ -40,9 +40,9 @@ 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: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: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;} div.container{width:940px;margin:0 auto;} -div.container-fluid{padding:20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";} +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;} @@ -172,6 +172,8 @@ div.topbar ul li.menu.open ul li.active a{background-color:rgba(255, 255, 255, 0 div.topbar ul li ul{background-color:#333;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:0;text-align:left;border:0;zoom:1;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);box-shadow:0 1px 2px rgba(0, 0, 0, 0.6);}div.topbar ul li ul li{float:none;clear:both;display:block;background:none;font-size:12px;}div.topbar ul li ul li a{display:block;padding:6px 15px;clear:both;font-weight:normal;line-height:19px;color:#bbb;}div.topbar ul li ul li a:hover{background-color:#333;background-color:rgba(255, 255, 255, 0.25);color:#fff;} div.topbar ul li ul li.divider{height:1px;overflow:hidden;background:rgba(0, 0, 0, 0.2);border-bottom:1px solid rgba(255, 255, 255, 0.1);margin:5px 0;} div.topbar ul li ul li span{clear:both;display:block;background:rgba(0, 0, 0, 0.2);padding:6px 15px;cursor:default;color:#808080;border-top:1px solid rgba(0, 0, 0, 0.2);} +.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} +.hero-unit p{font-size:18px;font-weight:200;line-height:27px;} div.page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}div.page-header h1{margin-bottom:8px;} div.alert-message{background-color:rgba(0, 0, 0, 0.15);background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(transparent), to(rgba(0, 0, 0, 0.15)));background-image:-moz-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-ms-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, transparent), color-stop(100%, rgba(0, 0, 0, 0.15)));background-image:-webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-image:-o-linear-gradient(transparent, rgba(0, 0, 0, 0.15));-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0)";filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='transparent', endColorstr='rgba(0, 0, 0, 0.15)', GradientType=0);background-image:linear-gradient(transparent, rgba(0, 0, 0, 0.15));background-color:#e6e6e6;margin-bottom:18px;padding:8px 15px;color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-bottom:1px solid rgba(0, 0, 0, 0.25);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}div.alert-message p{color:#fff;margin-bottom:0;}div.alert-message p+p{margin-top:5px;} div.alert-message.error{background-color:#e06359;} @@ -198,7 +200,7 @@ div.pagination{height:36px;margin:18px 0;}div.pagination ul{float:left;margin:0; div.pagination ul li a:hover,div.pagination ul li.active a{background-color:#c7eefe;} div.pagination ul li.disabled a,div.pagination ul li.disabled a:hover{background-color:none;color:#bfbfbf;} div.pagination ul li.next a,div.pagination ul li:last-child a{border:0;} -div.well{background:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);} +.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);} div.modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;} div.modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;background-color:#ffffff;border:1px solid rgba(0, 0, 0, 0.3);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding;-moz-background-clip:padding;background-clip:padding;}div.modal .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}div.modal .modal-header a.close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;} div.modal .modal-body{padding:20px;} diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 7345a32441..ede141ce51 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -44,7 +44,7 @@ section { font-weight: bold; } #masthead { - margin-top: 40px; + margin-top: -20px; } #masthead h1, #masthead p { @@ -131,8 +131,8 @@ div.quickstart form textarea { /* Special grid styles -------------------------------------------------- */ .show-grid { - margin-top: 20px; - margin-bottom: 20px; + margin-top: 10px; + margin-bottom: 10px; } .show-grid .column, .show-grid .columns { background-color: #eee; diff --git a/docs/index.html b/docs/index.html index 85965e1b1d..7244191c94 100644 --- a/docs/index.html +++ b/docs/index.html @@ -3,6 +3,8 @@ Bootstrap, from Twitter + + + - + + + + + + - +
-
+

Bootstrap

  • Overview
    • +
  • About
  • Grid
  • Layouts
  • Typography
    • @@ -49,7 +58,7 @@ Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
    It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.

    -

    Nerd alert: Bootstrap is built with Less and was designed to work out of the gate with only modern browsers in mind.

    +

    Nerd alert: Bootstrap is built with Less and was designed to work out of the gate with modern browsers in mind.

@@ -89,15 +98,30 @@
-

History

+

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 +
+

Browser support

+

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

+ Tested and supported in Chrome, Safari, and Firefox +
    +
  • Latest Safari
    • +
  • Latest Google Chrome
    • +
  • Firefox v4
    • +
+
+
+

What's included

+

Bootstrap comes complete with compiled CSS, uncompiled, and example templates.

+
    +
  • All original .less files
    • +
  • Fully compiled and minified CSS
    • +
  • Complete styleguide documentation
    • +
  • Example page template (more to come soon)
    • +
@@ -298,16 +322,16 @@

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 convey 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:

+

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.

+

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.

+

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.

@@ -321,7 +345,7 @@

-

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

+

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 @@ -430,8 +454,8 @@ <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.

+

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>.

@@ -815,7 +839,7 @@

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:

+

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:

@@ -831,7 +855,7 @@ 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.

+

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 @@ -900,7 +924,7 @@

Tabs and pills

-

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

+

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.

@@ -1076,6 +1100,7 @@
+

Modal Heading

@@ -1090,34 +1115,35 @@
-
-
-
-

Tool Tips

-

Twipsies are super useful for aiding a confused user and pointing them in the right direction.

-
-
-
-
-

+

+
+ +
+
+

Tool Tips

+

Twipsies are super useful for aiding a confused user and pointing them in the right direction.

+
+
+
+
+

Lorem ipsum dolar sit amet illo error ipsum veritatis aut iste perspiciatis iste voluptas natus illo quasi odit aut natus consequuntur consequuntur, aut natus illo voluptatem odit perspiciatis laudantium rem doloremque totam voluptas. Voluptasdicta eaque beatae aperiam ut enim voluptatem explicabo explicabo, voluptas quia odit fugit accusantium totam totam architecto explicabo sit quasi fugit fugit, totam doloremque unde sunt sed dicta quae accusantium fugit voluptas nemo voluptas voluptatem rem quae aut veritatis quasi quae. -

-
-
-
below!
-
-
-
-
right!
-
-
-
-
left!
-
-
-
-
above!
-
+

+
+
+
below!
+
+
+
+
right!
+
+
+
+
left!
+
+
+
+
above!
@@ -1141,7 +1167,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
- +
diff --git a/lib/patterns.less b/lib/patterns.less index e540bd6010..eeb0107abd 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -236,6 +236,28 @@ div.topbar { } +// PAGE HEADERS +// ------------ + +.hero-unit { + background-color: #f5f5f5; + margin-bottom: 30px; + padding: 60px; + .border-radius(6px); + h1 { + margin-bottom: 0; + font-size: 60px; + line-height: 1; + letter-spacing: -1px; + } + p { + font-size: 18px; + font-weight: 200; + line-height: @baseline * 1.5; + } +} + + // PAGE HEADERS // ------------ @@ -453,12 +475,13 @@ div.pagination { // WELLS // ----- -div.well { - background: #f5f5f5; +.well { + background-color: #f5f5f5; margin-bottom: 20px; padding: 19px; min-height: 20px; - border: 1px solid #ddd; + border: 1px solid #eee; + border: 1px solid rgba(0,0,0,.05); .border-radius(4px); .box-shadow(inset 0 1px 1px rgba(0,0,0,.05); } diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 427dab2b89..5b41b64a4b 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -51,7 +51,7 @@ html, body { background-color: #fff; } body { - margin: 0; + margin: 60px 0 0; // Add margin to the top of the page for the topbar #font > .sans-serif(normal,@basefont,@baseline); color: @gray; text-rendering: optimizeLegibility; @@ -65,7 +65,7 @@ div.container { // Fluid layouts (left aligned, with sidebar, min- & max-width content) div.container-fluid { - padding: 20px; + padding: 0 20px; .clearfix(); div.sidebar { float: left; diff --git a/lib/type.less b/lib/type.less index 96a2310b1e..1091d149b2 100644 --- a/lib/type.less +++ b/lib/type.less @@ -10,7 +10,7 @@ p { #font > .shorthand(normal,@basefont,@baseline); margin-bottom: @baseline / 2; small { - font-size: 11px; + font-size: @basefont - 2; color: @grayLight; } }