1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00

Make more components mixin-friendly

This commit is contained in:
Mark Otto 2013-07-01 17:32:07 -07:00
parent 2d2828d36c
commit a27ecfccf3
7 changed files with 69 additions and 94 deletions

View file

@ -2326,6 +2326,11 @@ input[type="button"].btn-block {
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
} }
.list-group-item > .badge {
float: right;
margin-right: -15px;
}
.list-group-item-heading { .list-group-item-heading {
margin-top: 0; margin-top: 0;
margin-bottom: 5px; margin-bottom: 5px;
@ -2365,16 +2370,6 @@ a.list-group-item.active .list-group-item-text {
color: #e1edf7; color: #e1edf7;
} }
.list-group-item > .badge,
.list-group-item > .glyphicon-chevron-right {
float: right;
margin-right: -15px;
}
.list-group-item > .glyphicon + .badge {
margin-right: 5px;
}
.panel { .panel {
padding: 15px; padding: 15px;
margin-bottom: 20px; margin-bottom: 20px;
@ -4279,9 +4274,6 @@ a.list-group-item.active > .badge,
.accordion-heading .accordion-toggle { .accordion-heading .accordion-toggle {
display: block; display: block;
padding: 8px 15px; padding: 8px 15px;
}
.accordion-toggle {
cursor: pointer; cursor: pointer;
} }

View file

@ -16,15 +16,12 @@
} }
.accordion-heading { .accordion-heading {
border-bottom: 0; border-bottom: 0;
}
.accordion-heading .accordion-toggle { .accordion-toggle {
display: block; display: block;
padding: 8px 15px; padding: 8px 15px;
}
// General toggle styles
.accordion-toggle {
cursor: pointer; 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

View file

@ -82,11 +82,12 @@
.alert-block { .alert-block {
padding-top: 15px; padding-top: 15px;
padding-bottom: 15px; padding-bottom: 15px;
}
.alert-block > p, > p,
.alert-block > ul { > ul {
margin-bottom: 0; margin-bottom: 0;
} }
.alert-block p + p { p + p {
margin-top: 5px; margin-top: 5px;
}
} }

View file

@ -8,15 +8,10 @@
position: relative; position: relative;
} }
// Wrap all slides, but only show the active one
.carousel-inner { .carousel-inner {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
width: 100%; width: 100%;
}
// Immediate parent of all slides
.carousel-inner {
> .item { > .item {
display: none; display: none;
@ -80,13 +75,8 @@
color: #fff; color: #fff;
text-align: center; text-align: center;
text-shadow: 0 1px 2px rgba(0,0,0,.6); text-shadow: 0 1px 2px rgba(0,0,0,.6);
// We can't have this transition here because webkit cancels the carousel
// we can't have this transition here // animation if you trip this while in the middle of another animation.
// because webkit cancels the carousel
// animation if you trip this while
// in the middle of another animation
// ;_;
// .transition(opacity .2s linear);
// Set gradients for backgrounds // Set gradients for backgrounds
&.left { &.left {

View file

@ -19,15 +19,15 @@
cursor: pointer; cursor: pointer;
.opacity(.5); .opacity(.5);
} }
}
// Additional properties for button version // Additional properties for button version
// iOS requires the button element instead of an anchor tag. // iOS requires the button element instead of an anchor tag.
// If you want the anchor version, it requires `href="#"`. // If you want the anchor version, it requires `href="#"`.
button.close { button& {
padding: 0; padding: 0;
cursor: pointer; cursor: pointer;
background: transparent; background: transparent;
border: 0; border: 0;
-webkit-appearance: none; -webkit-appearance: none;
}
} }

View file

@ -22,16 +22,22 @@
// Place the border on the list items and negative margin up for better styling // Place the border on the list items and negative margin up for better styling
margin-bottom: -1px; margin-bottom: -1px;
border: 1px solid @list-group-border; border: 1px solid @list-group-border;
}
// Round the first and last items // Round the first and last items
.list-group-item:first-child { &:first-child {
.border-top-radius(@border-radius-base); .border-top-radius(@border-radius-base);
} }
.list-group-item:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
.border-bottom-radius(@border-radius-base); .border-bottom-radius(@border-radius-base);
} }
// Align badges within list items
> .badge {
float: right;
margin-right: -15px;
}
}
// Custom content options // Custom content options
// ------------------------- // -------------------------
@ -50,23 +56,23 @@
// Custom content within linked items // Custom content within linked items
a.list-group-item { a.list-group-item {
// Colorize content accordingly
.list-group-item-heading { .list-group-item-heading {
color: #333; color: #333;
} }
.list-group-item-text { .list-group-item-text {
color: #555; color: #555;
} }
}
// Hover state // Hover state
a.list-group-item:hover, &:hover,
a.list-group-item:focus { &:focus {
text-decoration: none; text-decoration: none;
background-color: @list-group-hover-bg; background-color: @list-group-hover-bg;
} }
// Active class on item itself, not parent // Active class on item itself, not parent
a.list-group-item.active { &.active {
z-index: 2; // Place active items above their siblings for proper border styling z-index: 2; // Place active items above their siblings for proper border styling
color: @list-group-active-color; color: @list-group-active-color;
background-color: @list-group-active-bg; background-color: @list-group-active-bg;
@ -79,16 +85,5 @@ a.list-group-item.active {
.list-group-item-text { .list-group-item-text {
color: lighten(@list-group-active-bg, 40%); color: lighten(@list-group-active-bg, 40%);
} }
} }
// Chevrons and badges within list items
// -------------------------
.list-group-item > .badge,
.list-group-item > .glyphicon-chevron-right {
float: right;
margin-right: -15px;
}
.list-group-item > .glyphicon + .badge {
margin-right: 5px;
} }