diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index ff6e37fe01..35eb7b83cb 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -12,12 +12,8 @@ body { position: relative; - padding-top: 80px; + padding-top: 40px; font-size: 14px; - background-color: #fff; - background-image: url(../img/grid-20px.png); - background-repeat: repeat-x; - background-position: 0 40px; } /* Code in headings */ @@ -87,7 +83,22 @@ hr.soften { ------------------------- */ .jumbotron { position: relative; + padding: 40px 0; + color: #fff; text-align: center; + text-shadow: 0 1px 5px rgba(0,0,0,.25), 0 0 30px rgba(0,0,0,.075); + background: #020031; /* Old browsers */ + background: -moz-linear-gradient(45deg, #020031 0%, #6d3353 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#020031), color-stop(100%,#6d3353)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* IE10+ */ + background: linear-gradient(45deg, #020031 0%,#6d3353 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#020031', endColorstr='#6d3353',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ + -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); + -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); + box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); + } .jumbotron h1 { font-size: 80px; @@ -118,22 +129,8 @@ hr.soften { ------------------------- */ .masthead { padding: 50px 0 60px; - margin-top: -40px; margin-bottom: 0; color: #fff; - text-align: center; - text-shadow: 0 1px 5px rgba(0,0,0,.25), 0 0 30px rgba(0,0,0,.075); - background: #020031; /* Old browsers */ - background: -moz-linear-gradient(45deg, #020031 0%, #6d3353 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left bottom, right top, color-stop(0%,#020031), color-stop(100%,#6d3353)); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(45deg, #020031 0%,#6d3353 100%); /* IE10+ */ - background: linear-gradient(45deg, #020031 0%,#6d3353 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#020031', endColorstr='#6d3353',GradientType=1 ); /* IE6-9 fallback on horizontal gradient */ - -webkit-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); - -moz-box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); - box-shadow: inset 0 -1px 0 rgba(0,0,0,.15); } .masthead h1 { font-size: 120px; @@ -211,6 +208,9 @@ hr.soften { .subhead h1 { font-size: 60px; } +.subhead p { + margin-bottom: 10px; +} .subhead .navbar { display: none; } @@ -736,7 +736,7 @@ form.bs-docs-example { padding-top: 0; } /* Widen masthead and social buttons to fill body padding */ - .masthead { + .jumbotron { margin-top: -20px; /* Offset bottom margin on .navbar */ } } @@ -750,7 +750,7 @@ form.bs-docs-example { } /* Widen masthead and social buttons to fill body padding */ - .masthead { + .jumbotron { padding: 40px 20px; margin-top: -20px; /* Offset bottom margin on .navbar */ margin-right: -20px; diff --git a/docs/base-css.html b/docs/base-css.html index b829dc3aef..fc04ea4c20 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -66,142 +66,143 @@ -
On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.
+On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes.
+All HTML headings, <h1>
through <h6>
are available.
All HTML headings, <h1>
through <h6>
are available.
Bootstrap's global default font-size
is 14px, with a line-height
of 20px. This is applied to the <body>
and all paragraphs. In addition, <p>
(paragraphs) receive a bottom margin of half their line-height (9px by default).
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.
-Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.
-Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
-Bootstrap's global default font-size
is 14px, with a line-height
of 20px. This is applied to the <body>
and all paragraphs. In addition, <p>
(paragraphs) receive a bottom margin of half their line-height (9px by default).
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.
+Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.
+Maecenas sed diam eget risus varius blandit sit amet non magna. Donec id elit non mi porta gravida at eget metus. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.
+Make a paragraph stand out by adding .lead
.
Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.
-Make a paragraph stand out by adding .lead
.
Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.
+The typographic scale is based on two LESS variables in variables.less: @baseFontSize
and @baseLineHeight
. The first is the base font-size used throughout and the second is the base line-height. We use those variables and some simple math to create the margins, paddings, and line-heights of all our type and more. Customize them and Bootstrap adapts.
The typographic scale is based on two LESS variables in variables.less: @baseFontSize
and @baseLineHeight
. The first is the base font-size used throughout and the second is the base line-height. We use those variables and some simple math to create the margins, paddings, and line-heights of all our type and more. Customize them and Bootstrap adapts.
Make use of HTML's default emphasis tags, <strong>
and <em>
.
Make use of HTML's default emphasis tags, <strong>
and <em>
.
<strong>
For emphasizing a snippet of text with important
-The following snippet of text is rendered as bold text.
-<strong>
For emphasizing a snippet of text with important
+The following snippet of text is rendered as bold text.
+<strong>rendered as bold text</strong>-
<em>
For emphasizing a snippet of text with stress
-The following snippet of text is rendered as italicized text.
-- <em>rendered as italicized text</em> -+
<em>
For emphasizing a snippet of text with stress
+The following snippet of text is rendered as italicized text.
++<em>rendered as italicized text</em> +-
Heads up! Feel free to use <b>
and <i>
in HTML5. <b>
is meant to highlight words or phrases without conveying additional importance while <i>
is mostly for voice, technical terms, etc.
Heads up! Feel free to use <b>
and <i>
in HTML5. <b>
is meant to highlight words or phrases without conveying additional importance while <i>
is mostly for voice, technical terms, etc.
Stylized implemenation of HTML's <abbr>
element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title
attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.
Stylized implemenation of HTML's <abbr>
element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a title
attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.
<abbr>
For expanded text on long hover of an abbreviation, include the title
attribute.
An abbreviation of the word attribute is attr.
-<abbr>
For expanded text on long hover of an abbreviation, include the title
attribute.
An abbreviation of the word attribute is attr.
+<abbr title="attribute">attr</abbr>-
<abbr class="initialism">
Add .initialism
to an abbreviation for a slightly smaller font-size.
HTML is the best thing since sliced bread.
-<abbr class="initialism">
Add .initialism
to an abbreviation for a slightly smaller font-size.
HTML is the best thing since sliced bread.
+<abbr title="attribute" class="initialism">attr</abbr>-
Present contact information for the nearest ancestor or the entire body of work.
+Present contact information for the nearest ancestor or the entire body of work.
-<address>
Preserve formatting by ending all lines with <br>
.
<address>
Preserve formatting by ending all lines with <br>
.
<address> <strong>Twitter, Inc.</strong><br> @@ -217,36 +218,36 @@-
For quoting blocks of content from another source within your document.
+For quoting blocks of content from another source within your document.
-Wrap <blockquote>
around any HTML as the quote. For straight quotes we recommend a <p>
.
--Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
-
Wrap <blockquote>
around any HTML as the quote. For straight quotes we recommend a <p>
.
++Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+
<blockquote> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> </blockquote>-
Style and content changes for simple variations on a standard blockquote.
+Style and content changes for simple variations on a standard blockquote.
-Add <small>
tag for identifying the source. Wrap the name of the source work in <cite>
.
--Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
- Someone famous in Source Title -
Add <small>
tag for identifying the source. Wrap the name of the source work in <cite>
.
++Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.
+ Someone famous in Source Title +
<blockquote> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> @@ -254,14 +255,14 @@ </blockquote>-
Use .pull-left
and .pull-right
classes for floated, right-aligned blockquote content.
Use .pull-left
and .pull-right
classes for floated, right-aligned blockquote content.
<blockquote class="pull-right"> <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.</p> @@ -270,16 +271,63 @@-
A list of items in which the order does not explicitly matter.
+A list of items in which the order does not explicitly matter.
++<ul> + <li>...</li> +</ul> ++ +
A list of items in which the order does explicitly matter.
++<ol> + <li>...</li> +</ol> ++ +
A list of items with no list-style
or additional left padding.
-<ul> - <li>...</li> -</ul> -- -
A list of items in which the order does explicitly matter.
--<ol> - <li>...</li> -</ol> -- -
A list of items with no list-style
or additional left padding.
<ul class="unstyled"> <li>...</li> </ul>-
A list of terms with their associated descriptions.
-A list of terms with their associated descriptions.
+<dl> <dt>...</dt> @@ -370,50 +371,50 @@ </dl>-
Make terms and descriptions in <dl>
line up side-by-side.
Make terms and descriptions in <dl>
line up side-by-side.
<dl class="dl-horizontal"> <dt>...</dt> <dd>...</dd> </dl>-
- Heads up!
- Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow
. In narrower viewports, they will change to the default stacked layout.
-
+ Heads up!
+ Horizontal description lists will truncate terms that are too long to fit in the left column fix text-overflow
. In narrower viewports, they will change to the default stacked layout.
+
Wrap inline snippets of code with <code>
.
Wrap inline snippets of code with <code>
.
For example, <code>section</code> should be wrapped as inline.-
Use <pre>
for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.
Use <pre>
for multiple lines of code. Be sure to escape any angle brackets in the code for proper rendering.
<p>Sample text here...</p>@@ -422,53 +423,53 @@ For example, <code>section</code> should be wrapped as inline. <p>Sample text here...</p> </pre> -
Note: Be sure to keep code within <pre>
tags as close to the left as possible; it will render all tabs.
You may optionally add the .pre-scrollable
class which will set a max-height of 350px and provide a y-axis scrollbar.
Note: Be sure to keep code within <pre>
tags as close to the left as possible; it will render all tabs.
You may optionally add the .pre-scrollable
class which will set a max-height of 350px and provide a y-axis scrollbar.
For basic styling—light padding and only horizontal dividers—add the base class .table
to any <table>
.
# | -First Name | -Last Name | -Username | -
---|---|---|---|
1 | -Mark | -Otto | -@mdo | -
2 | -Jacob | -Thornton | -@fat | -
3 | -Larry | -the Bird | -
For basic styling—light padding and only horizontal dividers—add the base class .table
to any <table>
.
# | +First Name | +Last Name | +Username | +
---|---|---|---|
1 | +Mark | +Otto | +@mdo | +
2 | +Jacob | +Thornton | +@fat | +
3 | +Larry | +the Bird | +
<table class="table"> … @@ -476,168 +477,168 @@ For example, <code>section</code> should be wrapped as inline.-
Add any of the follow classes to the .table
base class.
Add any of the follow classes to the .table
base class.
.table-striped
Adds zebra-striping to any table row within the <tbody>
via the :nth-child
CSS selector (not available in IE7-IE8).
# | -First Name | -Last Name | -Username | -
---|---|---|---|
1 | -Mark | -Otto | -@mdo | -
2 | -Jacob | -Thornton | -@fat | -
3 | -Larry | -the Bird | -
.table-striped
Adds zebra-striping to any table row within the <tbody>
via the :nth-child
CSS selector (not available in IE7-IE8).
# | +First Name | +Last Name | +Username | +
---|---|---|---|
1 | +Mark | +Otto | +@mdo | +
2 | +Jacob | +Thornton | +@fat | +
3 | +Larry | +the Bird | +
<table class="table table-striped"> … </table>-
.table-bordered
Add borders and rounded corners to the table.
-# | -First Name | -Last Name | -Username | -
---|---|---|---|
1 | -Mark | -Otto | -@mdo | -
Mark | -Otto | -@TwBootstrap | -|
2 | -Jacob | -Thornton | -@fat | -
3 | -Larry the Bird | -
.table-bordered
Add borders and rounded corners to the table.
+# | +First Name | +Last Name | +Username | +
---|---|---|---|
1 | +Mark | +Otto | +@mdo | +
Mark | +Otto | +@TwBootstrap | +|
2 | +Jacob | +Thornton | +@fat | +
3 | +Larry the Bird | +
<table class="table table-bordered"> … </table>-
.table-hover
Enable a hover state on table rows within a <tbody>
.
# | -First Name | -Last Name | -Username | -
---|---|---|---|
1 | -Mark | -Otto | -@mdo | -
2 | -Jacob | -Thornton | -@fat | -
3 | -Larry the Bird | -
.table-hover
Enable a hover state on table rows within a <tbody>
.
# | +First Name | +Last Name | +Username | +
---|---|---|---|
1 | +Mark | +Otto | +@mdo | +
2 | +Jacob | +Thornton | +@fat | +
3 | +Larry the Bird | +
<table class="table table-hover"> … </table>-
.table-condensed
Makes tables more compact by cutting cell padding in half.
-# | -First Name | -Last Name | -Username | -
---|---|---|---|
1 | -Mark | -Otto | -@mdo | -
2 | -Jacob | -Thornton | -@fat | -
3 | -Larry the Bird | -
.table-condensed
Makes tables more compact by cutting cell padding in half.
+# | +First Name | +Last Name | +Username | +
---|---|---|---|
1 | +Mark | +Otto | +@mdo | +
2 | +Jacob | +Thornton | +@fat | +
3 | +Larry the Bird | +
<table class="table table-condensed"> … @@ -645,82 +646,82 @@ For example, <code>section</code> should be wrapped as inline.-
List of supported table HTML elements and how they should be used.
-Tag | -Description | -
---|---|
- <table>
- |
- - Wrapping element for displaying data in a tabular format - | -
- <thead>
- |
-
- Container element for table header rows (<tr> ) to label table columns
- |
-
- <tbody>
- |
-
- Container element for table rows (<tr> ) in the body of the table
- |
-
- <tr>
- |
-
- Container element for a set of table cells (<td> or <th> ) that appears on a single row
- |
-
- <td>
- |
- - Default table cell - | -
- <th>
- |
-
- Special table cell for column (or row, depending on scope and placement) labels - Must be used within a <thead>
- |
-
- <caption>
- |
- - Description or summary of what the table holds, especially useful for screen readers - | -
List of supported table HTML elements and how they should be used.
+Tag | +Description | +
---|---|
+ <table>
+ |
+ + Wrapping element for displaying data in a tabular format + | +
+ <thead>
+ |
+
+ Container element for table header rows (<tr> ) to label table columns
+ |
+
+ <tbody>
+ |
+
+ Container element for table rows (<tr> ) in the body of the table
+ |
+
+ <tr>
+ |
+
+ Container element for a set of table cells (<td> or <th> ) that appears on a single row
+ |
+
+ <td>
+ |
+ + Default table cell + | +
+ <th>
+ |
+
+ Special table cell for column (or row, depending on scope and placement) labels + Must be used within a <thead>
+ |
+
+ <caption>
+ |
+ + Description or summary of what the table holds, especially useful for screen readers + | +
<table> <thead> @@ -738,29 +739,29 @@ For example, <code>section</code> should be wrapped as inline. </table>-
Individual form controls receive styling, but without any required base class on the <form>
or large changes in markup. Results in stacked, left-aligned labels on top of form controls.
Individual form controls receive styling, but without any required base class on the <form>
or large changes in markup. Results in stacked, left-aligned labels on top of form controls.
<form class="well"> <label>Label name</label> @@ -774,18 +775,18 @@ For example, <code>section</code> should be wrapped as inline.-
Included with Bootstrap are three optional form layouts for common use cases.
+Included with Bootstrap are three optional form layouts for common use cases.
-Add .form-search
to the form and .search-query
to the <input>
for an extra-rounded text input.
Add .form-search
to the form and .search-query
to the <input>
for an extra-rounded text input.
<form class="form-search"> <input type="text" class="input-medium search-query"> @@ -793,16 +794,16 @@ For example, <code>section</code> should be wrapped as inline. </form>-
Add .form-inline
for left-aligned labels and inline-block controls for a compact layout.
Add .form-inline
for left-aligned labels and inline-block controls for a compact layout.
<form class="form-inline"> <input type="text" class="input-small" placeholder="Email"> @@ -814,37 +815,37 @@ For example, <code>section</code> should be wrapped as inline. </form>-
Right align labels and float them to the left to make them appear on the same line as controls. Requires the most markup changes from a default form:
-.form-horizontal
to the form.control-group
.control-label
to the label.controls
for proper alignment