diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index a60106dcb8..82b269d1e5 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -37,12 +37,27 @@ aside.quote { margin-top: 1em; margin-bottom: 1em; + + .title { + border-left: 5px solid darken(scale-color-diff(), 10%); + background-color: scale-color-diff(); + color: scale-color($primary, $lightness: 30%); + padding: 12px 12px 0 12px; + /* blockquote is underneath this and has top margin */ + .avatar { margin-right: 7px; } + img { margin-top: -4px; } + } + // blockquote is docked within aside for content blockquote { margin-top: 0; } } +.quote-controls, .quote-controls .back:before, .quote-controls .quote-other-topic:before { + color: scale-color($primary, $lightness: 50%); +} + .cooked .highlight { background-color: dark-light-diff($tertiary, $secondary, 90%, -40%); padding: 2px; diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index d63912a4a4..be4f7f25ca 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -666,16 +666,6 @@ blockquote > *:last-child { } } - .title { - border-left: 5px solid darken(scale-color-diff(), 10%); - background-color: scale-color-diff(); - color: scale-color($primary, $lightness: 30%); - padding: 12px 12px 0 12px; - /* blockquote is underneath this and has top margin */ - .avatar { margin-right: 7px; } - img { margin-top: -4px; } - } - aside { .quote, .title, blockquote, .onebox, .onebox-result { background: darken(scale-color-diff(), 5%); @@ -689,9 +679,7 @@ blockquote > *:last-child { } -.quote-controls, .quote-controls .back:before, .quote-controls .quote-other-topic:before { - color: scale-color($primary, $lightness: 50%); -} + .gutter { margin-top: 13px; diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index 84a9e206ed..868256c11a 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -448,19 +448,6 @@ blockquote > *:last-child { margin-bottom: 0 !important; } -.quote-controls, .quote-controls .back:before, .quote-controls .quote-other-topic:before { - color: $primary; -} - - -.quote .title { - border-left: 5px solid scale-color($primary, $lightness: 75%); - background-color: scale-color-diff(); - padding: 10px 10px 10px 12px; - clear: both; - .avatar { margin-right: 7px; } -} - .gutter { display: none; } .posts-wrapper { position: relative;