Skip to content
GitLab
Commit 962acdc0 authored by Jacob Thornton's avatar Jacob Thornton
Browse files

Merge pull request #12 from rafBM/master 

Give docs page some ellipsis and apostrophe love
parents 4d0a80bd d2515876
Hide whitespace changes
Inline Side-by-side
Showing
with 29 additions and 29 deletions
+29 -29
docs/index.html
+ 29
- 29
View file @ 962acdc0
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<div class="row"> <div class="row">
<div class="span4 columns"> <div class="span4 columns">
<h2>Default grid</h2> <h2>Default grid</h2>
<p>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.</p> <p>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.</p>
</div> </div>
<div class="span12 columns"> <div class="span12 columns">
<h3>Example grid markup</h3> <h3>Example grid markup</h3>
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
<div class="span6 columns"> <div class="span6 columns">
<h3>Example paragraph</h3> <h3>Example paragraph</h3>
<p>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.</p> <p>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.</p>
<h1>Example heading<small>Has sub-heading...</small></h1> <h1>Example heading<small>Has sub-heading…</small></h1>
<p>You can also add subheadings with the <code>&lt;strong&gt;</code> and <code>&lt;em&gt;</code></p> <p>You can also add subheadings with the <code>&lt;strong&gt;</code> and <code>&lt;em&gt;</code></p>
</div> </div>
</div> </div>
...@@ -288,9 +288,9 @@ ...@@ -288,9 +288,9 @@
<p>Emphasis tags (<code>&lt;strong&gt;</code> and <code>&lt;em&gt;</code>) should be used to add visual distinction between a word or phrase and its surrounding copy. Use <code>&lt;strong&gt;</code> for plain old attention and <code>&lt;em&gt;</code> for <em>slick</em> attention and titles.</p> <p>Emphasis tags (<code>&lt;strong&gt;</code> and <code>&lt;em&gt;</code>) should be used to add visual distinction between a word or phrase and its surrounding copy. Use <code>&lt;strong&gt;</code> for plain old attention and <code>&lt;em&gt;</code> for <em>slick</em> attention and titles.</p>
<h3>Emphasis in a paragraph</h3> <h3>Emphasis in a paragraph</h3>
<p><a href="">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p> <p><a href="">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p>
<p><strong>Note:</strong> It's still okay to use <code>&lt;b&gt;</code> and <code>&lt;i&gt;</code> tags in HTML5, but they don't come with inherent styles anymore. <code>&lt;b&gt;</code> is meant to convey importance while <code>&lt;i&gt;</code> is mostly for voice, technical terms, etc.</p> <p><strong>Note:</strong> It’s still okay to use <code>&lt;b&gt;</code> and <code>&lt;i&gt;</code> tags in HTML5, but they don’t come with inherent styles anymore. <code>&lt;b&gt;</code> is meant to convey importance while <code>&lt;i&gt;</code> is mostly for voice, technical terms, etc.</p>
<h3>Addresses</h3> <h3>Addresses</h3>
<p>The <code>address</code> element is used for contact information for its nearest ancestor, or the entire body of work. Here's how it looks:</p> <p>The <code>address</code> element is used for contact information for its nearest ancestor, or the entire body of work. Here’s how it looks:</p>
<address> <address>
<strong>Twitter, Inc.</strong><br /> <strong>Twitter, Inc.</strong><br />
795 Folsom Ave, Suite 600<br /> 795 Folsom Ave, Suite 600<br />
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
<div class="span12 columns"> <div class="span12 columns">
<p>Be sure to wrap your <code>blockquote</code> around <code>paragraph</code> and <code>small</code> tags. When citing a source, use the <code>small</code> element. The CSS will automatically preface a name with an em dash (&amp;mdash;).</p> <p>Be sure to wrap your <code>blockquote</code> around <code>paragraph</code> and <code>small</code> tags. When citing a source, use the <code>small</code> element. The CSS will automatically preface a name with an em dash (&amp;mdash;).</p>
<blockquote> <blockquote>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua...</p> <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua…</p>
<small>Dr. Julius Hibbert</small> <small>Dr. Julius Hibbert</small>
</blockquote> </blockquote>
</div> </div>
...@@ -423,7 +423,7 @@ ...@@ -423,7 +423,7 @@
</p> </p>
<p>Tables are great&mdash;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.</p> <p>Tables are great&mdash;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.</p>
<p>Always wrap your column headers in a <code>thead</code> such that hierarchy is <code>thead</code> > <code>tr</code> > <code>th</code>.</p> <p>Always wrap your column headers in a <code>thead</code> such that hierarchy is <code>thead</code> > <code>tr</code> > <code>th</code>.</p>
<p>Similar to the column headers, all your table's body content should be wrapped in a <code>tbody</code> so your hierarchy is <code>tbody</code> > <code>tr</code> > <code>td</code>.</p> <p>Similar to the column headers, all your table’s body content should be wrapped in a <code>tbody</code> so your hierarchy is <code>tbody</code> > <code>tr</code> > <code>td</code>.</p>
</ul> </ul>
</div> </div>
<div class="span12 columns"> <div class="span12 columns">
...@@ -502,7 +502,7 @@ ...@@ -502,7 +502,7 @@
&lt;/table&gt;</pre> &lt;/table&gt;</pre>
<h3>Example: Zebra-striped w/ TableSorter.js</h3> <h3>Example: Zebra-striped w/ TableSorter.js</h3>
<p>Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via <a href="http://jquery.com">jQuery</a> and the <a href="http://tablesorter.com/docs/">Tablesorter</a> plugin. <strong>Click any column's header to change the sort.</strong></p> <p>Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via <a href="http://jquery.com">jQuery</a> and the <a href="http://tablesorter.com/docs/">Tablesorter</a> plugin. <strong>Click any column’s header to change the sort.</strong></p>
<table class="zebra-striped" id="sortTableExample"> <table class="zebra-striped" id="sortTableExample">
<thead> <thead>
<tr> <tr>
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
<div class="clearfix"> <div class="clearfix">
<label for="disabledInput">Disabled Input</label> <label for="disabledInput">Disabled Input</label>
<div class="input"> <div class="input">
<input class="xlarge disabled" id="disabledInput" name="disabledInput" size="30" type="text" placeholder="Disabled input here... carry on." disabled /> <input class="xlarge disabled" id="disabledInput" name="disabledInput" size="30" type="text" placeholder="Disabled input here… carry on." disabled />
</div> </div>
</div> <!-- /clearfix --> </div> <!-- /clearfix -->
<div class="clearfix error"> <div class="clearfix error">
...@@ -659,7 +659,7 @@ ...@@ -659,7 +659,7 @@
<li> <li>
<label> <label>
<input type="checkbox" name="optionsCheckboxes" value="option1" /> <input type="checkbox" name="optionsCheckboxes" value="option1" />
<span>Option one is this and that&mdash;be sure to include why it's great</span> <span>Option one is this and that&mdash;be sure to include why it’s great</span>
</label> </label>
</li> </li>
<li> <li>
...@@ -715,7 +715,7 @@ ...@@ -715,7 +715,7 @@
<li> <li>
<label> <label>
<input type="checkbox" name="optionsCheckboxes" value="option1" /> <input type="checkbox" name="optionsCheckboxes" value="option1" />
<span>Option one is this and that&mdash;be sure to include why it's great</span> <span>Option one is this and that&mdash;be sure to include why it’s great</span>
</label> </label>
</li> </li>
<li> <li>
...@@ -741,7 +741,7 @@ ...@@ -741,7 +741,7 @@
<div class="row"> <div class="row">
<div class="span4 columns"> <div class="span4 columns">
<h2>Stacked forms</h2> <h2>Stacked forms</h2>
<p>Add <code>.form-stacked</code> 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.</p> <p>Add <code>.form-stacked</code> 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.</p>
</div> </div>
<div class="span12 columns"> <div class="span12 columns">
<form action="" class="form-stacked"> <form action="" class="form-stacked">
...@@ -775,7 +775,7 @@ ...@@ -775,7 +775,7 @@
<li> <li>
<label> <label>
<input type="checkbox" name="optionsCheckboxes" value="option1" /> <input type="checkbox" name="optionsCheckboxes" value="option1" />
<span>Option one is this and that&mdash;be sure to include why it's great</span> <span>Option one is this and that&mdash;be sure to include why it’s great</span>
</label> </label>
</li> </li>
<li> <li>
...@@ -807,7 +807,7 @@ ...@@ -807,7 +807,7 @@
</div> </div>
<div class="span12 columns"> <div class="span12 columns">
<h3>Example buttons</h3> <h3>Example buttons</h3>
<p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you'll want to apply these to only <code>a</code>, <code>button</code>, and select <code>input</code> elements. Here's how it looks:</p> <p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code>a</code>, <code>button</code>, and select <code>input</code> elements. Here’s how it looks:</p>
<div class="well" style="padding: 14px 19px;"> <div class="well" style="padding: 14px 19px;">
<button type="submit" class="btn primary">Submit</button> <button type="submit" class="btn primary">Submit</button>
<button type="submit" class="btn">Cancel</button> <button type="submit" class="btn">Cancel</button>
...@@ -823,7 +823,7 @@ ...@@ -823,7 +823,7 @@
<a href="#" class="btn small">Action</a> <a href="#" class="btn small">Action</a>
</div> </div>
<h3>Disabled state</h3> <h3>Disabled state</h3>
<p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That's <code>.disabled</code> for links and <code>:disabled</code> for <code>button</code> elements.</p> <p>For buttons that are not active or are disabled by the app for one reason or another, use the disabled state. That’s <code>.disabled</code> for links and <code>:disabled</code> for <code>button</code> elements.</p>
<h4>Links</h4> <h4>Links</h4>
<div class="well"> <div class="well">
<a href="#" class="btn large primary disabled">Primary action</a> <a href="#" class="btn large primary disabled">Primary action</a>
...@@ -875,7 +875,7 @@ ...@@ -875,7 +875,7 @@
<div class="row"> <div class="row">
<div class="span5 columns"> <div class="span5 columns">
<h4>What is it</h4> <h4>What is it</h4>
<p>Our topbar is a fixed bar that houses a website's logo or name, primary navigation, and search form.</p> <p>Our topbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.</p>
</div> </div>
<div class="span5 columns"> <div class="span5 columns">
<h4>Customizable</h4> <h4>Customizable</h4>
...@@ -883,7 +883,7 @@ ...@@ -883,7 +883,7 @@
</div> </div>
<div class="span6 columns"> <div class="span6 columns">
<h4>Dropdowns included</h4> <h4>Dropdowns included</h4>
<p>As part of the main navigation, we've included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it's done.</p> <p>As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done.</p>
</div> </div>
</div> </div>
...@@ -954,7 +954,7 @@ ...@@ -954,7 +954,7 @@
<li class="active"><a href="">10</a></li> <li class="active"><a href="">10</a></li>
<li><a href="">11</a></li> <li><a href="">11</a></li>
<li><a href="">12</a></li> <li><a href="">12</a></li>
<li class="disabled"><a href="">...</a></li> <li class="disabled"><a href="">…</a></li>
<li><a href="">19</a></li> <li><a href="">19</a></li>
<li><a href="">20</a></li> <li><a href="">20</a></li>
<li><a href="">21</a></li> <li><a href="">21</a></li>
...@@ -1014,7 +1014,7 @@ ...@@ -1014,7 +1014,7 @@
</div> </div>
<div class="alert-message warning"> <div class="alert-message warning">
<a class="close" href="#">&times;</a> <a class="close" href="#">&times;</a>
<p><strong>Holy gaucamole!</strong> Best check yo self, you're not looking too good.</p> <p><strong>Holy gaucamole!</strong> Best check yo self, you’re not looking too good.</p>
</div> </div>
<div class="alert-message success"> <div class="alert-message success">
<a class="close" href="#">&times;</a> <a class="close" href="#">&times;</a>
...@@ -1022,7 +1022,7 @@ ...@@ -1022,7 +1022,7 @@
</div> </div>
<div class="alert-message info"> <div class="alert-message info">
<a class="close" href="#">&times;</a> <a class="close" href="#">&times;</a>
<p><strong>Heads up!</strong> This is an alert that needs your attention, but it's not a huge priority just yet.</p> <p><strong>Heads up!</strong> This is an alert that needs your attention, but it’s not a huge priority just yet.</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -1039,7 +1039,7 @@ ...@@ -1039,7 +1039,7 @@
</div> </div>
<div class="alert-message block-message warning"> <div class="alert-message block-message warning">
<a class="close" href="#">&times;</a> <a class="close" href="#">&times;</a>
<p><strong>Holy gaucamole! This is a warning!</strong> Best check yo self, you're not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p> <p><strong>Holy gaucamole! This is a warning!</strong> Best check yo self, you’re not looking too good. Nulla vitae elit libero, a pharetra augue. Praesent commodo cursus magna, vel scelerisque nisl consectetur et.</p>
<p><a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a></p> <p><a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a></p>
</div> </div>
<div class="alert-message block-message success"> <div class="alert-message block-message success">
...@@ -1049,7 +1049,7 @@ ...@@ -1049,7 +1049,7 @@
</div> </div>
<div class="alert-message block-message info"> <div class="alert-message block-message info">
<a class="close" href="#">&times;</a> <a class="close" href="#">&times;</a>
<p><strong>Heads up!</strong> This is an alert that needs your attention, but it's not a huge priority just yet.</p> <p><strong>Heads up!</strong> This is an alert that needs your attention, but it’s not a huge priority just yet.</p>
<p><a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a></p> <p><a class="btn small" href="#">Take this action</a> <a class="btn small" href="#">Or do this</a></p>
</div> </div>
</div> </div>
...@@ -1064,7 +1064,7 @@ ...@@ -1064,7 +1064,7 @@
<div class="row"> <div class="row">
<div class="span4 columns"> <div class="span4 columns">
<h2>Modals</h2> <h2>Modals</h2>
<p>Modals&mdash;dialogs or lightboxes&mdash;are great for contextual actions in situations where it's important that the background context be maintained.</p> <p>Modals&mdash;dialogs or lightboxes&mdash;are great for contextual actions in situations where it’s important that the background context be maintained.</p>
</div> </div>
<div class="span12 columns"> <div class="span12 columns">
<div class="well" style="background-color: rgba(0,0,0,0.5); border: none; padding: 40px;"> <div class="well" style="background-color: rgba(0,0,0,0.5); border: none; padding: 40px;">
...@@ -1074,7 +1074,7 @@ ...@@ -1074,7 +1074,7 @@
<a href="#" class="close">&times;</a> <a href="#" class="close">&times;</a>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>One fine body...</p> <p>One fine body…</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="" class="btn primary">Primary</a> <a href="" class="btn primary">Primary</a>
...@@ -1155,16 +1155,16 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita ...@@ -1155,16 +1155,16 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</div> </div>
<div class="span12 columns"> <div class="span12 columns">
<h2>How to use it</h2> <h2>How to use it</h2>
<p>Use this option to make full use of Bootstrap's Less variables, mixins, and nesting in CSS via javascript in your browser.</p> <p>Use this option to make full use of Bootstrap’s Less variables, mixins, and nesting in CSS via javascript in your browser.</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;link rel="stylesheet/less" href="less/bootstrap.less" media="all" /&gt; &lt;link rel="stylesheet/less" href="less/bootstrap.less" media="all" /&gt;
&lt;script src="js/less-1.0.41.min.js"&gt;&lt;/script&gt;</pre> &lt;script src="js/less-1.0.41.min.js"&gt;&lt;/script&gt;</pre>
<p>Not feeling the .js solution? <a href="http://incident57.com/less" target="_blank">Try the Less Mac app</a> or <a href="http://lesscss.org/#-client-side-usage" target="_blank">use Node.js</a> to compile when you deploy your code.</p> <p>Not feeling the .js solution? <a href="http://incident57.com/less" target="_blank">Try the Less Mac app</a> or <a href="http://lesscss.org/#-client-side-usage" target="_blank">use Node.js</a> to compile when you deploy your code.</p>
<h2>What's included</h2> <h2>What’s included</h2>
<p>Here are some of the highlights of what's included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.</p> <p>Here are some of the highlights of what’s included in Twitter Bootstrap as part of Bootstrap. Head over to the Bootstrap website or Github project page to download and learn more.</p>
<h3>Color variables</h3> <h3>Color variables</h3>
<p>Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you're set.</p> <p>Variables in Less are perfect for maintaining and updating your CSS headache free. When you want to change a color value or a frequently used value, update it in one spot and you’re set.</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
// Links // Links
@linkColor: #8b59c2; @linkColor: #8b59c2;
...@@ -1192,14 +1192,14 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita ...@@ -1192,14 +1192,14 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
</pre> </pre>
<h3>Commenting</h3> <h3>Commenting</h3>
<p>Less also provides another style of commenting in addition to CSS's normal <code>/* ... */</code> syntax.</p> <p>Less also provides another style of commenting in addition to CSS’s normal <code>/* ... */</code> syntax.</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
// This is a comment // This is a comment
/* This is also a comment */ /* This is also a comment */
</pre> </pre>
<h3>Mixins up the wazoo</h3> <h3>Mixins up the wazoo</h3>
<p>Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They're great for vendor prefixed properties like <code>box-shadow</code>, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.</p> <p>Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like <code>box-shadow</code>, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.</p>
<h4>Font stacks</h4> <h4>Font stacks</h4>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
#font { #font {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment