Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove orphaned blockquote sizing

This commit is contained in:
Jeff Atwood 2014-06-30 03:03:54 -07:00
parent d2cf921791
commit f8f79b9388
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/desktop/discourse.scss
View File

@ -115,11 +115,6 @@ body {
} }
} }
blockquote {
/* 13px left is intentional here to properly align with post quotes */
padding: 10px 4px 4px 13px;
}
.topic-statuses { .topic-statuses {
float: left; float: left;
margin: 0 3px 0 0; margin: 0 3px 0 0;

6
app/assets/stylesheets/desktop/topic-post.scss
View File

@ -665,7 +665,7 @@ iframe {
/* solo quotes */ /* solo quotes */
blockquote { blockquote {
/* inherit only the default top and bottom margins here */ /* leave browser defaults for top and bottom here */
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;
padding: 12px; padding: 12px;
@ -675,10 +675,10 @@ blockquote {
// we assume blockquotes have their own margins, so all blockquotes // we assume blockquotes have their own margins, so all blockquotes
// will remove margins from first (top) and last (bottom) child elements // will remove margins from first (top) and last (bottom) child elements
blockquote > *:first-child { blockquote > *:first-child {
margin-top: 0; margin-top: 0 !important;
} }
blockquote > *:last-child { blockquote > *:last-child {
margin-bottom: 0; margin-bottom: 0 !important;
} }

4
app/assets/stylesheets/mobile/topic-post.scss
View File

@ -482,10 +482,10 @@ blockquote {
// we assume blockquotes have their own margins, so all blockquotes // we assume blockquotes have their own margins, so all blockquotes
// will remove margins from first (top) and last (bottom) child elements // will remove margins from first (top) and last (bottom) child elements
blockquote > *:first-child { blockquote > *:first-child {
margin-top: 0; margin-top: 0 !important;
} }
blockquote > *:last-child { blockquote > *:last-child {
margin-bottom: 0; margin-bottom: 0 !important;
} }
.quote-controls { .quote-controls {