root
/
bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

compensate for ie7 button padding with no borders, fix indentation

This commit is contained in:
Mark Otto 2012-08-14 15:44:25 -07:00
parent f933a41c7b
commit f3479a3953
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/assets/css/bootstrap.css vendored
View File

@ -3253,8 +3253,8 @@ button.close {
button.btn,
input[type="submit"].btn {
*padding-top: 2px;
*padding-bottom: 2px;
*padding-top: 3px;
*padding-bottom: 3px;
}
button.btn::-moz-focus-inner,

2
docs/base-css.html
View File

@ -1257,7 +1257,7 @@ For example, <code>section</code> should be wrapped as inline.
<span class="input-xlarge uneditable-input">Some value here</span>
</form>
<pre class="prettyprint linenums">
&lt;span class="input-xlarge uneditable-input"&gt;Some value here&lt;/span&gt;
&lt;span class="input-xlarge uneditable-input"&gt;Some value here&lt;/span&gt;
</pre>
<h3>Form actions</h3>

2
docs/templates/pages/base-css.mustache vendored
View File

@ -1194,7 +1194,7 @@
<span class="input-xlarge uneditable-input">Some value here</span>
</form>
<pre class="prettyprint linenums">
&lt;span class="input-xlarge uneditable-input"&gt;Some value here&lt;/span&gt;
&lt;span class="input-xlarge uneditable-input"&gt;Some value here&lt;/span&gt;
</pre>
<h3>{{_i}}Form actions{{/i}}</h3>

5
less/buttons.less
View File

@ -170,8 +170,9 @@ input[type="submit"].btn {
}
// IE7 has some default padding on button controls
*padding-top: 2px;
*padding-bottom: 2px;
*padding-top: 3px;
*padding-bottom: 3px;
&.btn-large {
*padding-top: 7px;
*padding-bottom: 7px;

2
less/mixins.less
View File

@ -605,7 +605,7 @@
.offset (@columns) {
margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2);
*margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%);
*margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) - (.5 / @gridRowWidth * 100 * 1%) + (@fluidGridGutterWidth*2) - (.5 / @gridRowWidth * 100 * 1%);
}
.offsetFirstChild (@columns) {