aboutsummaryrefslogtreecommitdiff
path: root/dist/css/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-19 19:40:08 -0800
committerMark Otto <[email protected]>2013-12-19 19:40:08 -0800
commit2854c5c3fb65b709fbf32d05faccf7a294626cca (patch)
tree4cb9ef9d2b7f54cf0721a32a6a87ca8ee5414b2d /dist/css/bootstrap.css
parent81b1e6801faf71705a06e8e039a98b79b6c478c5 (diff)
downloadbootstrap-2854c5c3fb65b709fbf32d05faccf7a294626cca.tar.xz
bootstrap-2854c5c3fb65b709fbf32d05faccf7a294626cca.zip
Fixes #11952: Refactor blockquote styles
* Deprecate .pull-right class for .blockquote-reverse * Move font-size change to the parent, blockquote, instead of setting on the p element to allow more flexible content
Diffstat (limited to 'dist/css/bootstrap.css')
-rw-r--r--dist/css/bootstrap.css24
1 files changed, 15 insertions, 9 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 0aa4c49a9..7822815f6 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -616,18 +616,19 @@ abbr[data-original-title] {
blockquote {
padding: 10px 20px;
margin: 0 0 20px;
- border-left: 5px solid #eee;
-}
-blockquote p {
font-size: 17.5px;
+ border-left: 5px solid #eee;
}
-blockquote p:last-child {
+blockquote p:last-child,
+blockquote ul:last-child,
+blockquote ol:last-child {
margin-bottom: 0;
}
blockquote footer,
blockquote small,
blockquote .small {
display: block;
+ font-size: 80%;
line-height: 1.428571429;
color: #999;
}
@@ -636,22 +637,27 @@ blockquote small:before,
blockquote .small:before {
content: '\2014 \00A0';
}
+.blockquote-reverse,
blockquote.pull-right {
padding-right: 15px;
padding-left: 0;
+ text-align: right;
border-right: 5px solid #eee;
border-left: 0;
}
-blockquote.pull-right p,
-blockquote.pull-right small,
-blockquote.pull-right .small {
- text-align: right;
-}
+.blockquote-reverse footer:before,
+blockquote.pull-right footer:before,
+.blockquote-reverse small:before,
blockquote.pull-right small:before,
+.blockquote-reverse .small:before,
blockquote.pull-right .small:before {
content: '';
}
+.blockquote-reverse footer:after,
+blockquote.pull-right footer:after,
+.blockquote-reverse small:after,
blockquote.pull-right small:after,
+.blockquote-reverse .small:after,
blockquote.pull-right .small:after {
content: '\00A0 \2014';
}