Permalink
Browse files

Merge pull request #12 from m5o/master

adding forgotten bits (v1.4.0)
  • Loading branch information...
2 parents e8e1636 + 2fdde9d commit a60a0dca936bf1a6255d7089ea51672a45bf7ff0 @jlong committed Nov 28, 2011
Showing with 19 additions and 17 deletions.
  1. +6 −7 bootstrap-1.4.0.css
  2. +2 −2 bootstrap-1.4.0.min.css
  3. +3 −3 docs/index.html
  4. +1 −1 lib/bootstrap.scss
  5. +2 −2 lib/forms.scss
  6. +5 −2 lib/scaffolding.scss
View
@@ -1,5 +1,5 @@
/*
- * Bootstrap v1.3.0
+ * Bootstrap v1.4.0
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
@@ -9,7 +9,7 @@
*
* Converted to Sass by @johnwlong.
*
- * Date: Tue 8 Nov 2011 13:42:25 PST
+ * Date: So 13 Nov 2011 16:45:58 CET
*/
/* Reset.scss
* 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).
@@ -425,11 +425,10 @@ a:hover {
width: 620px;
}
-.offset-one-third {
+.row > .offset-one-third {
margin-left: 340px;
}
-
-.offset-two-thirds {
+.row > .offset-two-thirds {
margin-left: 660px;
}
@@ -1168,7 +1167,7 @@ textarea[readonly] {
padding-top: 0;
}
.inputs-list:first-child {
- padding-top: 5px;
+ padding-top: 6px;
}
.inputs-list li + li {
padding-top: 2px;
@@ -1187,7 +1186,7 @@ textarea[readonly] {
padding-top: 9px;
}
.form-stacked legend {
- margin-left: 0;
+ padding-left: 0;
}
.form-stacked label {
display: block;
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -89,7 +89,7 @@
<h6>Fork on GitHub</h6>
<p>Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.</p>
<p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub &raquo;</a></p>
- <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v1.3.0</a></p>
+ <p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v1.4.0</a></p>
</div>
</div><!-- /row -->
</div>
@@ -1822,7 +1822,7 @@ <h3 class="title">Popover Title</h3>
</tr>
<tr>
<td><a href="./javascript.html#buttons">bootstrap-buttons.js</a></td>
- <td>The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap topbar.</td>
+ <td>This plugin offers additional functionality for managing button state.</td>
</tr>
<tr>
<td><a href="./javascript.html#tabs">bootstrap-tabs.js</a></td>
@@ -1862,7 +1862,7 @@ <h3 class="title">Popover Title</h3>
<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">
&lt;link rel="stylesheet/less" href="less/bootstrap.less" media="all" /&gt;
-&lt;script src="js/less-1.1.3.min.js"&gt;&lt;/script&gt;</pre>
+&lt;script src="js/less-1.1.4.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>
<h2>What’s included</h2>
View
@@ -1,5 +1,5 @@
/*!
- * Bootstrap v1.3.0
+ * Bootstrap v1.4.0
*
* Copyright 2011 Twitter, Inc
* Licensed under the Apache License v2.0
View
@@ -417,7 +417,7 @@ textarea[readonly] {
padding-top: 0;
}
&:first-child {
- padding-top: 5px;
+ padding-top: 6px;
}
li + li {
padding-top: 2px;
@@ -437,7 +437,7 @@ textarea[readonly] {
padding-top: $baseline / 2;
}
legend {
- margin-left: 0;
+ padding-left: 0;
}
label {
display: block;
View
@@ -129,8 +129,11 @@ a {
> .offset11 { @include offset(11); }
> .offset12 { @include offset(12); }
}
+
// Unique column sizes for 16-column grid
.span-one-third { width: 300px; }
.span-two-thirds { width: 620px; }
-.offset-one-third { margin-left: 340px; }
-.offset-two-thirds { margin-left: 660px; }
+.row {
+ > .offset-one-third { margin-left: 340px; }
+ > .offset-two-thirds { margin-left: 660px; }
+}

0 comments on commit a60a0dc

Please sign in to comment.