2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00

Merge branch 'master' into restore_grid_mixins

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-10-13 18:32:34 -07:00
39 changed files with 356 additions and 332 deletions
+1 -1
View File
@@ -42,7 +42,7 @@ pre {
color: inherit;
white-space: pre-wrap;
background-color: transparent;
border: 0;
border-radius: 0;
}
}
+5 -7
View File
@@ -227,13 +227,11 @@
.clearfix();
}
// Show/hide tabbable areas
.tab-content > .tab-pane,
.pill-content > .pill-pane {
display: none;
}
.tab-content,
.pill-content {
// Hide tabbable panes to start, show them when `.active`
.tab-content {
> .tab-pane {
display: none;
}
> .active {
display: block;
}
+10 -5
View File
@@ -82,7 +82,8 @@ h1, h2, h3, h4, h5, h6,
line-height: @headings-line-height;
color: @headings-color;
small {
small,
.small {
font-weight: normal;
line-height: 1;
color: @headings-small-color;
@@ -95,7 +96,8 @@ h3 {
margin-top: @line-height-computed;
margin-bottom: (@line-height-computed / 2);
small {
small,
.small {
font-size: 65%;
}
}
@@ -105,7 +107,8 @@ h6 {
margin-top: (@line-height-computed / 2);
margin-bottom: (@line-height-computed / 2);
small {
small,
.small {
font-size: 75%;
}
}
@@ -240,10 +243,12 @@ blockquote {
border-right: 5px solid @blockquote-border-color;
border-left: 0;
p,
small {
small,
.small {
text-align: right;
}
small {
small,
.small {
&:before {
content: '';
}