diff options
| author | Mark Otto <[email protected]> | 2012-08-14 15:44:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-08-14 15:44:25 -0700 |
| commit | f3479a39537b7b10bf66846c11d500f3364af88a (patch) | |
| tree | aa9ca6343c8bac3c80372d6f153ab43366b5f9f5 | |
| parent | f933a41c7bb71e58a4c151389748b92c8a204a27 (diff) | |
| download | bootstrap-f3479a39537b7b10bf66846c11d500f3364af88a.tar.xz bootstrap-f3479a39537b7b10bf66846c11d500f3364af88a.zip | |
compensate for ie7 button padding with no borders, fix indentation
| -rw-r--r-- | docs/assets/css/bootstrap.css | 4 | ||||
| -rw-r--r-- | docs/base-css.html | 2 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 2 | ||||
| -rw-r--r-- | less/buttons.less | 5 | ||||
| -rw-r--r-- | less/mixins.less | 2 |
5 files changed, 8 insertions, 7 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 8e7abe9f3..a70f305a3 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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, diff --git a/docs/base-css.html b/docs/base-css.html index cd550adc3..56f6bde95 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -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"> - <span class="input-xlarge uneditable-input">Some value here</span> +<span class="input-xlarge uneditable-input">Some value here</span> </pre> <h3>Form actions</h3> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index b0fe47c55..9f96cc634 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1194,7 +1194,7 @@ <span class="input-xlarge uneditable-input">Some value here</span> </form> <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> <h3>{{_i}}Form actions{{/i}}</h3> diff --git a/less/buttons.less b/less/buttons.less index f3cb1bdef..a1d8989b6 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -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; diff --git a/less/mixins.less b/less/mixins.less index 1b2f0bcfb..b1b8ae80a 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -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) { |