mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-20 17:54:23 +01:00
compensate for ie7 button padding with no borders, fix indentation
This commit is contained in:
parent
f933a41c7b
commit
f3479a3953
4
docs/assets/css/bootstrap.css
vendored
4
docs/assets/css/bootstrap.css
vendored
@ -3253,8 +3253,8 @@ button.close {
|
|||||||
|
|
||||||
button.btn,
|
button.btn,
|
||||||
input[type="submit"].btn {
|
input[type="submit"].btn {
|
||||||
*padding-top: 2px;
|
*padding-top: 3px;
|
||||||
*padding-bottom: 2px;
|
*padding-bottom: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
button.btn::-moz-focus-inner,
|
button.btn::-moz-focus-inner,
|
||||||
|
@ -1257,7 +1257,7 @@ For example, <code>section</code> should be wrapped as inline.
|
|||||||
<span class="input-xlarge uneditable-input">Some value here</span>
|
<span class="input-xlarge uneditable-input">Some value here</span>
|
||||||
</form>
|
</form>
|
||||||
<pre class="prettyprint linenums">
|
<pre class="prettyprint linenums">
|
||||||
<span class="input-xlarge uneditable-input">Some value here</span>
|
<span class="input-xlarge uneditable-input">Some value here</span>
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
<h3>Form actions</h3>
|
<h3>Form actions</h3>
|
||||||
|
2
docs/templates/pages/base-css.mustache
vendored
2
docs/templates/pages/base-css.mustache
vendored
@ -1194,7 +1194,7 @@
|
|||||||
<span class="input-xlarge uneditable-input">Some value here</span>
|
<span class="input-xlarge uneditable-input">Some value here</span>
|
||||||
</form>
|
</form>
|
||||||
<pre class="prettyprint linenums">
|
<pre class="prettyprint linenums">
|
||||||
<span class="input-xlarge uneditable-input">Some value here</span>
|
<span class="input-xlarge uneditable-input">Some value here</span>
|
||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
<h3>{{_i}}Form actions{{/i}}</h3>
|
<h3>{{_i}}Form actions{{/i}}</h3>
|
||||||
|
@ -170,8 +170,9 @@ input[type="submit"].btn {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// IE7 has some default padding on button controls
|
// IE7 has some default padding on button controls
|
||||||
*padding-top: 2px;
|
*padding-top: 3px;
|
||||||
*padding-bottom: 2px;
|
*padding-bottom: 3px;
|
||||||
|
|
||||||
&.btn-large {
|
&.btn-large {
|
||||||
*padding-top: 7px;
|
*padding-top: 7px;
|
||||||
*padding-bottom: 7px;
|
*padding-bottom: 7px;
|
||||||
|
@ -605,7 +605,7 @@
|
|||||||
|
|
||||||
.offset (@columns) {
|
.offset (@columns) {
|
||||||
margin-left: (@fluidGridColumnWidth * @columns) + (@fluidGridGutterWidth * (@columns - 1)) + (@fluidGridGutterWidth*2);
|
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) {
|
.offsetFirstChild (@columns) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user