2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-14 18:42:30 +03:00

Require .btn-default for regular buttons

* Instead of , use  for standard, gray button
* Improves ability to customize buttons by encouraging folks to not override .btn and thus overriding all button modifier classes
* Updates docs to reflect the change
* Reorganize buttons CSS
This commit is contained in:
Mark Otto
2013-05-07 18:07:06 -07:00
parent ad5f88e1c5
commit d7f84d1220
6 changed files with 217 additions and 218 deletions
+54 -65
View File
@@ -17,7 +17,7 @@
text-align: center;
vertical-align: middle;
cursor: pointer;
border: 1px solid @btn-border;
border: 1px solid transparent;
border-radius: @border-radius-base;
white-space: nowrap;
@@ -50,91 +50,35 @@
}
// Button Sizes
// -------------------------
// Large
.btn-large {
padding: @padding-large;
font-size: @font-size-large;
border-radius: @border-radius-large;
}
// Small
.btn-small {
padding: @padding-small;
font-size: @font-size-small;
border-radius: @border-radius-small;
}
// Mini
.btn-mini {
padding: @padding-mini;
font-size: @font-size-mini;
border-radius: @border-radius-small;
}
// Icons in buttons
// -------------------------
// TODO: figure this shit out
// Block button
// -------------------------
.btn-block {
display: block;
width: 100%;
padding-left: 0;
padding-right: 0;
}
// Vertically space out multiple block buttons
.btn-block + .btn-block {
margin-top: 5px;
}
// Specificity overrides
input[type="submit"],
input[type="reset"],
input[type="button"] {
&.btn-block {
width: 100%;
}
}
// Alternate buttons
// --------------------------------------------------
.btn {
color: @btn-color;
.btn-pseudo-states(@btn-bg, @btn-border);
.btn-default {
.btn-pseudo-states(@btn-default-color, @btn-default-bg, @btn-default-border);
}
.btn-primary {
.btn-pseudo-states(@btn-primary-bg, @btn-primary-border);
.btn-pseudo-states(@btn-primary-color, @btn-primary-bg, @btn-primary-border);
}
// Warning appears as orange
.btn-warning {
.btn-pseudo-states(@btn-warning-bg, @btn-warning-border);
.btn-pseudo-states(@btn-warning-color, @btn-warning-bg, @btn-warning-border);
}
// Danger and error appear as red
.btn-danger {
.btn-pseudo-states(@btn-danger-bg, @btn-danger-border);
.btn-pseudo-states(@btn-danger-color, @btn-danger-bg, @btn-danger-border);
}
// Success appears as green
.btn-success {
.btn-pseudo-states(@btn-success-bg, @btn-success-border);
.btn-pseudo-states(@btn-success-color, @btn-success-bg, @btn-success-border);
}
// Info appears as blue-green
.btn-info {
.btn-pseudo-states(@btn-info-bg, @btn-info-border);
.btn-pseudo-states(@btn-info-color, @btn-info-bg, @btn-info-border);
}
// Link buttons
// --------------------------------------------------
// -------------------------
// Make a button look and behave like a link
.btn-link,
@@ -173,3 +117,48 @@ fieldset[disabled] .btn-link {
}
}
}
// Button Sizes
// --------------------------------------------------
.btn-large {
padding: @padding-large;
font-size: @font-size-large;
border-radius: @border-radius-large;
}
.btn-small {
padding: @padding-small;
font-size: @font-size-small;
border-radius: @border-radius-small;
}
.btn-mini {
padding: @padding-mini;
font-size: @font-size-mini;
border-radius: @border-radius-small;
}
// Block button
// --------------------------------------------------
.btn-block {
display: block;
width: 100%;
padding-left: 0;
padding-right: 0;
}
// Vertically space out multiple block buttons
.btn-block + .btn-block {
margin-top: 5px;
}
// Specificity overrides
input[type="submit"],
input[type="reset"],
input[type="button"] {
&.btn-block {
width: 100%;
}
}