Merge branch 'master' of https://github.com/discourse/discourse

2015-05-01 01:30:16 -07:00 · 2015-05-01 01:30:16 -07:00 · 0810022caf
parent bafcfa5b6a 062c72336f
commit 0810022caf
2 changed files with 3 additions and 6 deletions
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@ -38,6 +38,9 @@
  video {
    max-width: 100%;
  }
+  sup sup {
+    top: 0;
+  }
 }
 // we use aside to hold expandable quotes (versus, say, static blockquotes)
 aside.quote {
--- a/app/assets/stylesheets/common/base/topic.scss
+++ b/app/assets/stylesheets/common/base/topic.scss
@ -26,12 +26,6 @@
  clear: both;
 }

-.topic-body {
-  sup sup {
-    top: 0;
-  }
-}
-
 .extra-info-wrapper {
  .badge-wrapper {
    float: left;