aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-04-18 11:15:40 -0700
committerMark Otto <[email protected]>2015-04-18 11:15:40 -0700
commitb88c05d564dc9a8a5e3d8ac81f78d53e16943588 (patch)
tree80d8d428746e1b85c78af0096b07225541620c77
parent88a92e433d1ff6a563292aaa070bd71780788de1 (diff)
downloadbootstrap-b88c05d564dc9a8a5e3d8ac81f78d53e16943588.tar.xz
bootstrap-b88c05d564dc9a8a5e3d8ac81f78d53e16943588.zip
clean up comments and spacing
-rw-r--r--scss/_alert.scss5
-rw-r--r--scss/_badge.scss1
-rw-r--r--scss/_button-group.scss8
-rw-r--r--scss/_buttons.scss15
4 files changed, 20 insertions, 9 deletions
diff --git a/scss/_alert.scss b/scss/_alert.scss
index 8ec7d0662..2e6f46b16 100644
--- a/scss/_alert.scss
+++ b/scss/_alert.scss
@@ -3,8 +3,9 @@
// --------------------------------------------------
+//
// Base styles
-// -------------------------
+//
.alert {
padding: $alert-padding;
@@ -34,6 +35,7 @@
font-weight: $alert-link-font-weight;
}
+
// Dismissible alerts
//
// Expand the right padding and account for the close button's positioning.
@@ -50,6 +52,7 @@
}
}
+
// Alternate styles
//
// Generate contextual modifier classes for colorizing the alert.
diff --git a/scss/_badge.scss b/scss/_badge.scss
index b3afccd79..b264108f0 100644
--- a/scss/_badge.scss
+++ b/scss/_badge.scss
@@ -3,7 +3,6 @@
// --------------------------------------------------
-// Base class
.badge {
position: relative;
top: -.1em;
diff --git a/scss/_button-group.scss b/scss/_button-group.scss
index 0e61f881a..187166b00 100644
--- a/scss/_button-group.scss
+++ b/scss/_button-group.scss
@@ -2,6 +2,7 @@
// Button groups
// --------------------------------------------------
+
// Make the div behave like a button
.btn-group,
.btn-group-vertical {
@@ -103,8 +104,9 @@
.btn-group-lg > .btn { @extend .btn-lg; }
+//
// Split button dropdowns
-// ----------------------
+//
// Give the line between buttons some depth
.btn-group > .btn + .dropdown-toggle {
@@ -143,8 +145,10 @@
}
+
+//
// Vertical button groups
-// ----------------------
+//
.btn-group-vertical {
> .btn,
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index c434c8ab4..addc7b246 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -3,8 +3,9 @@
// --------------------------------------------------
+//
// Base styles
-// --------------------------------------------------
+//
.btn {
display: inline-block;
@@ -58,8 +59,9 @@ fieldset[disabled] a.btn {
}
+//
// Alternate buttons
-// --------------------------------------------------
+//
.btn-primary {
@include button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border);
@@ -81,8 +83,9 @@ fieldset[disabled] a.btn {
}
+//
// Link buttons
-// -------------------------
+//
// Make a button look and behave like a link
.btn-link {
@@ -121,8 +124,9 @@ fieldset[disabled] a.btn {
}
+//
// Button Sizes
-// --------------------------------------------------
+//
.btn-lg {
// line-height: ensure even-numbered height of button next to large input
@@ -137,8 +141,9 @@ fieldset[disabled] a.btn {
}
+//
// Block button
-// --------------------------------------------------
+//
.btn-block {
display: block;