diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 411d4cebfe..da4f6c9a58 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -873,8 +873,8 @@ input[type="hidden"] { .radio, .checkbox { + min-height: 18px; padding-left: 18px; - overflow: auto; } .radio input[type="radio"], @@ -2694,6 +2694,11 @@ button.close { color: rgba(255, 255, 255, 0.75); } +.btn { + border-color: #ccc; + border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); +} + .btn-primary { background-color: #0074cc; *background-color: #0055cc; @@ -3003,9 +3008,9 @@ input[type="submit"].btn.btn-mini { } .btn-group > .dropdown-toggle { - *padding-top: 3px; + *padding-top: 4px; padding-right: 8px; - *padding-bottom: 3px; + *padding-bottom: 4px; padding-left: 8px; -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05); @@ -3013,9 +3018,7 @@ input[type="submit"].btn.btn-mini { } .btn-group > .btn-mini.dropdown-toggle { - *padding-top: 1px; padding-right: 5px; - *padding-bottom: 1px; padding-left: 5px; } @@ -4773,6 +4776,10 @@ a.badge:hover { padding: 8px 15px; } +.accordion-toggle { + cursor: pointer; +} + .accordion-inner { padding: 9px 15px; border-top: 1px solid #e5e5e5; diff --git a/less/accordion.less b/less/accordion.less index 11a36b544e..31b8cdc33d 100644 --- a/less/accordion.less +++ b/less/accordion.less @@ -21,6 +21,11 @@ padding: 8px 15px; } +// General toggle styles +.accordion-toggle { + cursor: pointer; +} + // Inner needs the styles because you can't animate properly with any styles on the element .accordion-inner { padding: 9px 15px; diff --git a/less/button-groups.less b/less/button-groups.less index 7c6a02a67e..5338c5a450 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -41,6 +41,7 @@ -moz-border-radius-bottomleft: 4px; border-bottom-left-radius: 4px; } +// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it .btn-group > .btn:last-child, .btn-group > .dropdown-toggle { -webkit-border-top-right-radius: 4px; @@ -94,14 +95,12 @@ padding-left: 8px; padding-right: 8px; .box-shadow(~"inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)"); - *padding-top: 3px; - *padding-bottom: 3px; + *padding-top: 4px; + *padding-bottom: 4px; } .btn-group > .btn-mini.dropdown-toggle { padding-left: 5px; padding-right: 5px; - *padding-top: 1px; - *padding-bottom: 1px; } .btn-group > .btn-small.dropdown-toggle { *padding-top: 4px; diff --git a/less/buttons.less b/less/buttons.less index 7b85dc216e..c44ff3e6fc 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -131,6 +131,11 @@ // Set the backgrounds // ------------------------- +.btn { + // reset here as of 2.0.3 due to Recess property order + border-color: #ccc; + border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25); +} .btn-primary { .buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight); } diff --git a/less/forms.less b/less/forms.less index da94fa1fa6..7d967c6b3d 100644 --- a/less/forms.less +++ b/less/forms.less @@ -173,8 +173,8 @@ input[type="hidden"] { // Indent the labels to position radios/checkboxes as hanging .radio, .checkbox { + min-height: 18px; // clear the floating input if there is no label text padding-left: 18px; - overflow: auto; // clear the floating input if there is no label text } .radio input[type="radio"], .checkbox input[type="checkbox"] { diff --git a/less/variables.less b/less/variables.less index 279c163f1a..ca8e3ae40f 100644 --- a/less/variables.less +++ b/less/variables.less @@ -71,7 +71,7 @@ // ------------------------- @btnBackground: @white; @btnBackgroundHighlight: darken(@white, 10%); -@btnBorder: darken(@white, 20%); +@btnBorder: #ccc; @btnPrimaryBackground: @linkColor; @btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);