mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-11 18:02:28 +03:00
Holy shit, buttons, button states, and input states updated
This commit is contained in:
+6
-5
@@ -13,13 +13,10 @@
|
||||
margin-bottom: 0; // For input.btn
|
||||
font-size: @font-size-base;
|
||||
line-height: @line-height-base;
|
||||
color: @gray;
|
||||
text-align: center;
|
||||
text-shadow: 0 1px 0 rgba(255,255,255,.75);
|
||||
vertical-align: middle;
|
||||
cursor: pointer;
|
||||
#gradient > .vertical(@btn-background, @btn-background-highlight);
|
||||
border: 1px solid darken(@btn-background, 20%);
|
||||
border: 1px solid #ccc;
|
||||
border-radius: @border-radius-base;
|
||||
.box-shadow(inset 0 1px 0 rgba(255,255,255,.25));
|
||||
|
||||
@@ -35,7 +32,7 @@
|
||||
&.active {
|
||||
outline: 0;
|
||||
background-image: none;
|
||||
.box-shadow(~"inset 0 3px 5px rgba(0,0,0,.15), 0 1px 0 rgba(255,255,255,.1)");
|
||||
.box-shadow(~"inset 0 3px 5px rgba(0,0,0,.125), 0 1px 0 rgba(255,255,255,.1)");
|
||||
}
|
||||
|
||||
&.disabled,
|
||||
@@ -116,6 +113,10 @@ input[type="button"] {
|
||||
// Alternate buttons
|
||||
// --------------------------------------------------
|
||||
|
||||
.btn {
|
||||
.buttonBackground(@btn-background, @btn-background-highlight, @gray, 0 1px 0 rgba(255,255,255,.75));
|
||||
}
|
||||
// Primary appears as blue
|
||||
.btn-primary {
|
||||
.buttonBackground(@btn-background-primary, @btn-background-primary-highlight);
|
||||
}
|
||||
|
||||
+1
-1
@@ -307,7 +307,7 @@ input[class*="span"],
|
||||
select[class*="span"],
|
||||
textarea[class*="span"],
|
||||
.uneditable-input[class*="span"] {
|
||||
height: 30px;
|
||||
height: @input-height;
|
||||
}
|
||||
// Control row for multiple inputs per line
|
||||
.controls-row {
|
||||
|
||||
+5
-2
@@ -409,7 +409,7 @@
|
||||
color: @text-color;
|
||||
text-shadow: @text-shadow;
|
||||
#gradient > .vertical(@background-start, @background-end);
|
||||
border-color: darken(@background-end, 5%);
|
||||
border-color: darken(@background-end, 7.5%);
|
||||
|
||||
&:hover,
|
||||
&:active,
|
||||
@@ -419,7 +419,10 @@
|
||||
background-position: 0 -15px;
|
||||
}
|
||||
&:active,
|
||||
&.active {
|
||||
&.active,
|
||||
&[disabled],
|
||||
&.disabled,
|
||||
fieldset[disabled] & {
|
||||
background-image: none;
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -79,7 +79,7 @@
|
||||
@btn-background-highlight: #dadada;
|
||||
|
||||
@btn-background-primary: @link-color;
|
||||
@btn-background-primary-highlight: spin(@btn-background-primary, 20%);
|
||||
@btn-background-primary-highlight: darken(@link-color, 10%);
|
||||
|
||||
@btn-background-success: #62c462;
|
||||
@btn-background-success-highlight: #51a351;
|
||||
|
||||
Reference in New Issue
Block a user