diff options
author | Mark Otto <otto@github.com> | 2013-05-10 04:22:48 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2013-05-10 04:22:48 +0400 |
commit | 90e4ff73d25e426cf19bb84392510f78e2cd2fd8 (patch) | |
tree | f170cd1ba77245303235a16ece2846686557ffbf /less | |
parent | a19fda699daa56bb0e3fc1b9f3c48762cdab893f (diff) | |
parent | 1fdfee8de0e487f5d3710a94706e0a025d07919f (diff) |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Conflicts:
less/forms.less
Diffstat (limited to 'less')
-rw-r--r-- | less/forms.less | 60 | ||||
-rw-r--r-- | less/glyphicons.less | 1 |
2 files changed, 14 insertions, 47 deletions
diff --git a/less/forms.less b/less/forms.less index 4a99a77937..cc69e935f0 100644 --- a/less/forms.less +++ b/less/forms.less @@ -370,12 +370,8 @@ select:focus:invalid { .input-group-btn, .input-group input { display: table-cell; - /*margin: 0;*/ - border-radius: 0; - &.input-small { - border-radius: 0; - } - &.input-large { + + &:not(:first-child):not(:last-child) { border-radius: 0; } } @@ -398,40 +394,34 @@ select:focus:invalid { text-shadow: 0 1px 0 #fff; background-color: @gray-lighter; border: 1px solid #ccc; + border-radius: @border-radius-base; &.input-small { padding: @padding-small; font-size: @font-size-small; - } + border-radius: @border-radius-small; } &.input-large { padding: @padding-large; font-size: @font-size-large; + border-radius: @border-radius-large; } } // Reset rounded corners .input-group input:first-child, -.input-group-addon:first-child { - .border-left-radius(@border-radius-base); - &.input-small { - .border-left-radius(@border-radius-small); - } - &.input-large { - .border-left-radius(@border-radius-large); - } +.input-group-addon:first-child, +.input-group-btn:first-child > .btn:first-child, +.input-group-btn:first-child > .dropdown-toggle:first-child { + .border-right-radius(0); } .input-group-addon:first-child { border-right: 0; } .input-group input:last-child, -.input-group-addon:last-child { - .border-right-radius(@border-radius-base); - &.input-small { - .border-right-radius(@border-radius-small); - } - &.input-large { - .border-right-radius(@border-radius-large); - } +.input-group-addon:last-child, +.input-group-btn:last-child > .btn:last-child, +.input-group-btn:last-child > .dropdown-toggle { + .border-left-radius(0); } .input-group-addon:last-child { border-left: 0; @@ -446,7 +436,6 @@ select:focus:invalid { .input-group-btn > .btn { position: relative; float: left; // Collapse white-space - border-radius: 0; + .btn { margin-left: -1px; } @@ -457,29 +446,6 @@ select:focus:invalid { } } -// Prepended buttons -.input-group-btn:first-child { - // Round the left corners only - > .btn:first-child, - > .dropdown-toggle:first-child { - .border-left-radius(@border-radius-base); - &.btn-large { .border-left-radius(@border-radius-large); } - &.btn-small { .border-left-radius(@border-radius-small); } - } -} - -// Appended buttons -.input-group-btn:last-child { - // Round the right corners only - > .btn:last-child, - > .dropdown-toggle { - .border-right-radius(@border-radius-base); - &.btn-large { .border-right-radius(@border-radius-large); } - &.btn-small { .border-right-radius(@border-radius-small); } - } -} - - // Inline forms // -------------------------------------------------- diff --git a/less/glyphicons.less b/less/glyphicons.less index e8a96c05f0..0d935ea192 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -34,6 +34,7 @@ font-style: normal; font-weight: normal; line-height: 1; + -webkit-font-smoothing: antialiased; } // Individual icons |