Permalink
Browse files

Merge branch 'master' of https://github.com/twitter/bootstrap

  • Loading branch information...
fat committed Jan 4, 2012
2 parents eb123f6 + 1c7c5f7 commit 3237047ac30fe4905dc515258bac050cdf811426
Showing with 15 additions and 6 deletions.
  1. +4 −1 bootstrap.css
  2. +2 −2 bootstrap.min.css
  3. +5 −2 docs/index.html
  4. +1 −1 docs/javascript.html
  5. +3 −0 lib/patterns.less
View
@@ -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 Nov 20 21:42:29 PST 2011
* Date: Sun Dec 25 20:18:31 PST 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).
@@ -2177,6 +2177,8 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
top: 50%;
left: 50%;
z-index: 11000;
max-height: 500px;
overflow: auto;
width: 560px;
margin: -250px 0 0 -280px;
background-color: #ffffff;
@@ -2415,6 +2417,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
text-shadow: none;
}
.label.important {
background-color: #c43c35;
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -897,7 +897,10 @@ <h3>Example: Condensed table</h3>
</tr>
</tbody>
</table>
<pre class="prettyprint linenums">
&lt;table class="condensed-table"&gt;
...
&lt;/table&gt;</pre>
<h3>Example: Bordered table</h3>
<p>Make your tables look just a wee bit sleeker by rounding their corners and adding borders on all sides.</p>
<table class="bordered-table">
@@ -1971,7 +1974,7 @@ <h3>Ways to compile</h3>
<td>Node with makefile</td>
<td>
<p>Install the less command line compiler with npm by running the following command:</p>
<pre>$ npm install lessc</pre>
<pre>$ npm install less</pre>
<p>Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.</p>
<p>Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).</p>
</td>
View
@@ -385,7 +385,7 @@ <h3>Markup</h3>
<h3>Methods</h3>
<h4>$().tabs or $().pills</h4>
<p>
Activates tab and pill functionality for a given container. Tab links should reference id's in the document.
Activates tab and pill functionality for a given container. Tab links should reference IDs in the document.
</p>
<pre class="prettyprint linenums">
&lt;ul class="tabs"&gt;
View
@@ -834,6 +834,8 @@ input[type=submit].btn {
top: 50%;
left: 50%;
z-index: 11000;
max-height: 500px;
overflow: auto;
width: 560px;
margin: -250px 0 0 -280px;
background-color: @white;
@@ -1025,6 +1027,7 @@ input[type=submit].btn {
white-space: nowrap;
background-color: @grayLight;
.border-radius(3px);
text-shadow: none;
&.important { background-color: #c43c35; }
&.warning { background-color: @orange; }
&.success { background-color: @green; }

0 comments on commit 3237047

Please sign in to comment.