From a050fa887fbbda4ca20a01d35f157f8b245fad4a Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 4 Sep 2014 13:16:19 +1000 Subject: [PATCH] FIX: regression, go to quoted post missing in quotes refactors common code as well --- .../stylesheets/common/base/topic-post.scss | 28 ++++++++++++++++++- .../stylesheets/desktop/topic-post.scss | 16 +---------- app/assets/stylesheets/mobile/topic-post.scss | 15 +--------- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 9b80398b389..d9a9f57003b 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -57,4 +57,30 @@ aside.quote { .post-hidden { opacity: 0.5; -} \ No newline at end of file +} + + +.quote-controls { + float: right; + a { + margin: 0; + } + .back:before + { + display: inline-block; + margin-left: 8px; + font-family: "FontAwesome"; + position: relative; + z-index: 20; + content: "\f062"; + } + .quote-other-topic:before + { + display: inline-block; + margin-left: 8px; + font-family: "FontAwesome"; + position: relative; + z-index: 20; + content: "\f061"; + } +} diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 95e8cc308bc..bb5065d8775 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -702,22 +702,8 @@ blockquote > *:last-child { } -.quote-controls { - float: right; +.quote-controls, .quote-controls .back:before, .quote-controls .quote-other-topic:before { color: scale-color($primary, $lightness: 50%); - a { - margin: 0; - } - .back:before - { - display: inline-block; - margin-left: 8px; - color: scale-color($primary, $lightness: 50%); - font-family: "FontAwesome"; - position: relative; - z-index: 20; - content: "\f062"; - } } .gutter { diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index 343fe6e795d..3c2eae94c36 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -476,21 +476,8 @@ blockquote > *:last-child { margin-bottom: 0 !important; } -.quote-controls { - float: right; +.quote-controls, .quote-controls .back:before, .quote-controls .quote-other-topic:before { color: $primary; - a { - margin: 0; - } - .back:before { - display: inline-block; - margin-left: 8px; - color: $primary; - font-family: "FontAwesome"; - position: relative; - z-index: 20; - content: "\f062"; - } }