From eef1fcde76f407e96ddc4ee7af95eff2b73a8385 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 20 Aug 2011 20:24:08 -0700 Subject: [PATCH] updated docs to include about section and changes from new branch --- index.html | 473 ++++++++++++++++++++++++++++------------------------- 1 file changed, 254 insertions(+), 219 deletions(-) diff --git a/index.html b/index.html index 35646207..cbf6cd34 100644 --- a/index.html +++ b/index.html @@ -2,29 +2,41 @@ - Twitter Bootstrap + Bootstrap, from Twitter + + + + + - + + - + + + + + + - +
-
-

+
+

Bootstrap

  • Overview
    • +
  • About
  • Grid
  • Layouts
  • Typography
    • @@ -41,12 +53,12 @@
    -

    Twitter Bootstrap

    +

    Bootstrap, from Twitter

    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.

    @@ -74,25 +86,58 @@

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

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">
@@ -103,94 +148,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
+
@@ -256,7 +289,7 @@

Headings and copy

A standard typographic hierarchy for structuring your webpages.

-
+

h1. Heading 1

h2. Heading 2

h3. Heading 3

@@ -264,11 +297,10 @@
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 headingHas sub-heading…

-

You can also add subheadings with the <strong> and <em>

+

Example heading Has sub-heading…

@@ -287,19 +319,19 @@

When to use

Emphasis tags (<strong> and <em>) should be used to add visual distinction between a word or phrase and its surrounding copy. Use <strong> for plain old attention and <em> for slick attention and titles.

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.

+

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.

@@ -313,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 @@ -321,6 +353,7 @@
+

Lists

@@ -421,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>.

@@ -806,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:

@@ -822,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 @@ -847,12 +880,12 @@
-

+

Project Name

@@ -861,10 +894,10 @@
  • Dropdown
    • @@ -891,40 +924,40 @@

    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.

     <ul class="tabs">
-  <li class="active"><a href="">Home</a></li>
-  <li><a href="">Profile</a></li>
-  <li><a href="">Messages</a></li>
-  <li><a href="">Settings</a></li>
-  <li><a href="">Contact</a></li>
+  <li class="active"><a href="#">Home</a></li>
+  <li><a href="#">Profile</a></li>
+  <li><a href="#">Messages</a></li>
+  <li><a href="#">Settings</a></li>
+  <li><a href="#">Contact</a></li>
 </ul>
 
     <ul class="pills">
-  <li class="active"><a href="">Home</a></li>
-  <li><a href="">Profile</a></li>
-  <li><a href="">Messages</a></li>
-  <li><a href="">Settings</a></li>
-  <li><a href="">Contact</a></li>
+  <li class="active"><a href="#">Home</a></li>
+  <li><a href="#">Profile</a></li>
+  <li><a href="#">Messages</a></li>
+  <li><a href="#">Settings</a></li>
+  <li><a href="#">Contact</a></li>
 </ul>
    @@ -938,55 +971,55 @@ 
     <div class="pagination">
   <ul>
-    <li class="prev disabled"><a href="">&larr; Previous</a></li>
-    <li class="active"><a href="">1</a></li>
-    <li><a href="">2</a></li>
-    <li><a href="">3</a></li>
-    <li><a href="">4</a></li>
-    <li><a href="">5</a></li>
-    <li class="next"><a href="">Next &rarr;</a></li>
+    <li class="prev disabled"><a href="#">&larr; Previous</a></li>
+    <li class="active"><a href="#">1</a></li>
+    <li><a href="#">2</a></li>
+    <li><a href="#">3</a></li>
+    <li><a href="#">4</a></li>
+    <li><a href="#">5</a></li>
+    <li class="next"><a href="#">Next &rarr;</a></li>
   </ul>
 </div>
    @@ -1067,6 +1100,7 @@
    +

    Modal Heading

    @@ -1076,39 +1110,40 @@

    One fine body…

    - Primary - Secondary + Primary + Secondary
    -
    -
    -
    -

    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!
    @@ -1118,7 +1153,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita

    Popovers

    -

    Use popovers to provide subtextual information to a page without effecting layout.

    +

    Use popovers to provide subtextual information to a page without affecting layout.

    @@ -1132,7 +1167,7 @@ Lorem ipsum dolar sit amet illo error ipsum verita
    - +
    @@ -1312,4 +1347,4 @@ Lorem ipsum dolar sit amet illo error ipsum verita
    - + \ No newline at end of file