From be27e1dfeee5faa07d5c2a9859752d4bb3efde72 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Tue, 29 Oct 2013 22:00:18 -0400 Subject: [PATCH] fixed compose preview spacing issue on blockquotes/paragraphs - made post selection buttons more prominent --- app/assets/stylesheets/desktop/compose.scss | 4 +-- app/assets/stylesheets/desktop/discourse.scss | 2 -- .../stylesheets/desktop/topic-post.scss | 33 +++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index ff78a67ae..bbfb05443 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -309,9 +309,7 @@ border: 1px dashed $gray; overflow: auto; visibility: visible; - p { - margin-top: 0; - } + &.hidden { width: 0; visibility: hidden; diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss index dc6f68751..a2261d332 100644 --- a/app/assets/stylesheets/desktop/discourse.scss +++ b/app/assets/stylesheets/desktop/discourse.scss @@ -668,10 +668,8 @@ body { .alert { padding: 8px 35px 8px 14px; margin-bottom: 18px; - text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5); background-color: #fcf8e3; border: 1px solid #fbeed5; - border-radius: 4px; color: #c09853; } .alert .close { diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 2fb3e059d..cb926bc62 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -637,6 +637,7 @@ h3 { blockquote { margin: 0; + margin-top: 17px; padding: 12px; } @@ -882,10 +883,42 @@ clear: both; } + #selected-posts { margin-left: 330px; width: 12%; + +.btn { + border: none; + color: $white; + font-weight: normal; + + color: #fff; + background: $btn-primary-background-color; + + &[href] { + color: $white; + } + &:hover + { + color: #fff; + background: darken($btn-primary-background-color, 12%); + } + &:active { + @include linear-gradient(darken($btn-primary-background-color, 18%), darken($btn-primary-background-color, 12%)); + @include box-shadow(inset 0 1px 3px rgba($black, 0.2)); + color: #fff; + } + &[disabled] { + text-shadow: 0 1px 0 rgba($black, 0.2); + @include linear-gradient($btn-primary-background-color, $btn-primary-background-color-dark); + @include box-shadow((inset 0 1px 0 rgba($white, 0.33), inset 0 -1px 2px rgba($black, 0.2))); + } +} + + + p { font-size: 13px; }