From be27e1dfeee5faa07d5c2a9859752d4bb3efde72 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Tue, 29 Oct 2013 22:00:18 -0400 Subject: [PATCH 1/3] 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 ff78a67ae7d..bbfb05443aa 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 dc6f6875162..a2261d332d5 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 2fb3e059d52..cb926bc622b 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; } From ef954f46ba8576333c056bb99711b71ad3b37db4 Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Tue, 29 Oct 2013 22:33:09 -0400 Subject: [PATCH 2/3] fixing blockquote that I just broke --- app/assets/stylesheets/desktop/topic-post.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index cb926bc622b..ac92dbb17c6 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -637,7 +637,6 @@ h3 { blockquote { margin: 0; - margin-top: 17px; padding: 12px; } From 7900fa01842bc3c7dc00c0f8e03cd4e59090da4d Mon Sep 17 00:00:00 2001 From: Kris Aubuchon Date: Wed, 30 Oct 2013 09:11:05 -0400 Subject: [PATCH 3/3] fixing pre/sub/sup/code/kbd formatting --- .../stylesheets/desktop/topic-post.scss | 4 +++ app/assets/stylesheets/desktop/topic.scss | 27 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index ac92dbb17c6..ed0d0bc5166 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -1007,3 +1007,7 @@ a.attachment:before { font-family: "FontAwesome"; content: "\f019"; } + + + + diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index 2188767c742..5264fd04427 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -193,3 +193,30 @@ i {background: #e4f2f8; } +/* Code, KBD, Sub/sup formatting */ + + +code,kbd,pre,samp{ + font-family:monospace, serif;font-size:1em +} +pre { white-space:pre-wrap= } +q{ quotes:"\201C" "\201D" "\2018" "\2019" } +small{ font-size:80% } +sub,sup{ + font-size:75%; + line-height:0; + position:relative; + vertical-align:baseline +} +sup{top:-0.5em} +sub{bottom:-0.25em} +figure{margin:0} +fieldset{ + border:1px solid #c0c0c0; + margin:0 2px; + padding:0.35em 0.625em 0.75em +} +legend{ + border:0; + padding:0 +}