Merge branch 'master' of https://github.com/strand/octopress into strand/octopress

This commit is contained in:
Frederic Hemberger
2011-10-16 13:19:42 +02:00
2 changed files with 16 additions and 4 deletions

View File

@ -115,7 +115,7 @@ blockquote {
}
}
.has-pullquote:before {
.pullquote-right:before, .pullquote-left:before {
/* Reset metrics. */
padding: 0;
border: none;
@ -134,6 +134,15 @@ blockquote {
font-size: 1.4em;
line-height: 1.45em;
}
.pullquote-left:before {
/* Make left pullquotes align properly. */
float: left;
margin: .5em 1.5em 1em 0;
}
/* @extend this to force long lines of continuous text to wrap */
.force-wrap {
white-space: -moz-pre-wrap;