mirror of
https://github.com/twbs/bootstrap.git
synced 2025-03-15 15:29:22 +01:00
Merge branch '2.0.3-wip' of github.com:twitter/bootstrap into 2.0.3-wip
This commit is contained in:
commit
fc871a4821
17
docs/assets/css/bootstrap.css
vendored
17
docs/assets/css/bootstrap.css
vendored
@ -873,8 +873,8 @@ input[type="hidden"] {
|
|||||||
|
|
||||||
.radio,
|
.radio,
|
||||||
.checkbox {
|
.checkbox {
|
||||||
|
min-height: 18px;
|
||||||
padding-left: 18px;
|
padding-left: 18px;
|
||||||
overflow: auto;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.radio input[type="radio"],
|
.radio input[type="radio"],
|
||||||
@ -2694,6 +2694,11 @@ button.close {
|
|||||||
color: rgba(255, 255, 255, 0.75);
|
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 {
|
.btn-primary {
|
||||||
background-color: #0074cc;
|
background-color: #0074cc;
|
||||||
*background-color: #0055cc;
|
*background-color: #0055cc;
|
||||||
@ -3003,9 +3008,9 @@ input[type="submit"].btn.btn-mini {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.btn-group > .dropdown-toggle {
|
.btn-group > .dropdown-toggle {
|
||||||
*padding-top: 3px;
|
*padding-top: 4px;
|
||||||
padding-right: 8px;
|
padding-right: 8px;
|
||||||
*padding-bottom: 3px;
|
*padding-bottom: 4px;
|
||||||
padding-left: 8px;
|
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);
|
-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);
|
-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 {
|
.btn-group > .btn-mini.dropdown-toggle {
|
||||||
*padding-top: 1px;
|
|
||||||
padding-right: 5px;
|
padding-right: 5px;
|
||||||
*padding-bottom: 1px;
|
|
||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4773,6 +4776,10 @@ a.badge:hover {
|
|||||||
padding: 8px 15px;
|
padding: 8px 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.accordion-toggle {
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
.accordion-inner {
|
.accordion-inner {
|
||||||
padding: 9px 15px;
|
padding: 9px 15px;
|
||||||
border-top: 1px solid #e5e5e5;
|
border-top: 1px solid #e5e5e5;
|
||||||
|
@ -21,6 +21,11 @@
|
|||||||
padding: 8px 15px;
|
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
|
// Inner needs the styles because you can't animate properly with any styles on the element
|
||||||
.accordion-inner {
|
.accordion-inner {
|
||||||
padding: 9px 15px;
|
padding: 9px 15px;
|
||||||
|
@ -41,6 +41,7 @@
|
|||||||
-moz-border-radius-bottomleft: 4px;
|
-moz-border-radius-bottomleft: 4px;
|
||||||
border-bottom-left-radius: 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 > .btn:last-child,
|
||||||
.btn-group > .dropdown-toggle {
|
.btn-group > .dropdown-toggle {
|
||||||
-webkit-border-top-right-radius: 4px;
|
-webkit-border-top-right-radius: 4px;
|
||||||
@ -94,14 +95,12 @@
|
|||||||
padding-left: 8px;
|
padding-left: 8px;
|
||||||
padding-right: 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)");
|
.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-top: 4px;
|
||||||
*padding-bottom: 3px;
|
*padding-bottom: 4px;
|
||||||
}
|
}
|
||||||
.btn-group > .btn-mini.dropdown-toggle {
|
.btn-group > .btn-mini.dropdown-toggle {
|
||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
padding-right: 5px;
|
padding-right: 5px;
|
||||||
*padding-top: 1px;
|
|
||||||
*padding-bottom: 1px;
|
|
||||||
}
|
}
|
||||||
.btn-group > .btn-small.dropdown-toggle {
|
.btn-group > .btn-small.dropdown-toggle {
|
||||||
*padding-top: 4px;
|
*padding-top: 4px;
|
||||||
|
@ -131,6 +131,11 @@
|
|||||||
|
|
||||||
// Set the backgrounds
|
// 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 {
|
.btn-primary {
|
||||||
.buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
|
.buttonBackground(@btnPrimaryBackground, @btnPrimaryBackgroundHighlight);
|
||||||
}
|
}
|
||||||
|
@ -173,8 +173,8 @@ input[type="hidden"] {
|
|||||||
// Indent the labels to position radios/checkboxes as hanging
|
// Indent the labels to position radios/checkboxes as hanging
|
||||||
.radio,
|
.radio,
|
||||||
.checkbox {
|
.checkbox {
|
||||||
|
min-height: 18px; // clear the floating input if there is no label text
|
||||||
padding-left: 18px;
|
padding-left: 18px;
|
||||||
overflow: auto; // clear the floating input if there is no label text
|
|
||||||
}
|
}
|
||||||
.radio input[type="radio"],
|
.radio input[type="radio"],
|
||||||
.checkbox input[type="checkbox"] {
|
.checkbox input[type="checkbox"] {
|
||||||
|
@ -71,7 +71,7 @@
|
|||||||
// -------------------------
|
// -------------------------
|
||||||
@btnBackground: @white;
|
@btnBackground: @white;
|
||||||
@btnBackgroundHighlight: darken(@white, 10%);
|
@btnBackgroundHighlight: darken(@white, 10%);
|
||||||
@btnBorder: darken(@white, 20%);
|
@btnBorder: #ccc;
|
||||||
|
|
||||||
@btnPrimaryBackground: @linkColor;
|
@btnPrimaryBackground: @linkColor;
|
||||||
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
|
@btnPrimaryBackgroundHighlight: spin(@btnPrimaryBackground, 15%);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user