Merge pull request #8413 from cvrebert/misc-less-refactoring

refactor {badges,jumbotron,media,popover,print}.less (mostly nesting)
This commit is contained in:
Mark Otto 2013-07-08 06:56:35 -07:00
commit b2b09f679a
5 changed files with 31 additions and 28 deletions

View File

@ -35,11 +35,9 @@ a.badge {
}
// Quick fix for labels/badges in buttons
.btn {
.badge {
position: relative;
top: -1px;
}
.btn .badge {
position: relative;
top: -1px;
}
// Account for counters in navs

View File

@ -18,13 +18,10 @@
p {
line-height: 1.4;
}
}
@media screen and (min-width: @screen-tablet) {
.jumbotron {
@media screen and (min-width: @screen-tablet) {
padding: 50px 60px;
border-radius: @border-radius-large; // Only round corners at higher resolutions
h1 {
font-size: (@font-size-base * 4.5);
}

View File

@ -36,11 +36,13 @@
// Media image alignment
// -------------------------
.media > .pull-left {
margin-right: 10px;
}
.media > .pull-right {
margin-left: 10px;
.media {
> .pull-left {
margin-right: 10px;
}
> .pull-right {
margin-left: 10px;
}
}

View File

@ -50,14 +50,16 @@
//
// .arrow is outer, .arrow:after is inner
.popover .arrow,
.popover .arrow:after {
position: absolute;
display: block;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
.popover .arrow {
&,
&:after {
position: absolute;
display: block;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
}
}
.popover .arrow {
border-width: @popover-arrow-outer-width;

View File

@ -71,13 +71,17 @@
.navbar {
display: none;
}
.table td,
.table th {
background-color: #fff !important;
.table {
td,
th {
background-color: #fff !important;
}
}
.btn > .caret,
.dropup > .btn > .caret {
border-top-color: #000 !important;
.btn,
.dropup > .btn {
> .caret {
border-top-color: #000 !important;
}
}
.label {
border: 1px solid #000;