From 35ca9525aa3531bbf10be097956b10032d4861be Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 12 Sep 2014 22:58:15 -0700 Subject: [PATCH] move pre/kbd to base css, remove obscure CSS --- .../stylesheets/common/base/topic-post.scss | 28 ++++++++++ app/assets/stylesheets/desktop/topic.scss | 53 ------------------- 2 files changed, 28 insertions(+), 53 deletions(-) diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index ce763aa3490..a60106dcb80 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -120,3 +120,31 @@ aside.quote { color: scale-color($primary, $lightness: 70%); } } + + +pre { + code { + white-space: pre-wrap; + display: block; + padding: 5px 10px; + color: $primary; + background: scale-color-diff(); + max-height: 500px; + } +} + +kbd +{ + background-color: $secondary; + border: 1px solid scale-color-diff(); + border-radius: 3px; + box-shadow: 0 1px 0 rgba(0,0,0, .8); + color: $primary; + display: inline-block; + font-size: 12px; + line-height: 1.4; + margin: 0 .1em; + padding: .1em .6em; + + * * { display: none; } +} \ No newline at end of file diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss index 420e8f0dc2f..3e077d36554 100644 --- a/app/assets/stylesheets/desktop/topic.scss +++ b/app/assets/stylesheets/desktop/topic.scss @@ -242,59 +242,6 @@ a:hover.reply-new { z-index: 495 } -/* Code, KBD, Sub/sup formatting */ - -code,kbd,pre,samp { - font-size:1em; -} -pre { - code { - white-space:pre-wrap; - display: block; - padding: 5px 10px; - color: $primary; - background: scale-color-diff(); - max-height: 500px; - } -} -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; } -sup sup, sub sup, sup sub, sub sub { top: 0; } -figure{margin:0; } -fieldset{ - border:1px solid scale-color-diff(); - margin:0 2px; - padding:0.35em 0.625em 0.75em; -} -legend{ - border:0; - padding:0; -} - -kbd -{ - background-color: $secondary; - border:1px solid scale-color-diff(); - border-radius: 3px; - box-shadow: 0 1px 0 rgba(0,0,0, .8); - color: $primary; - display: inline-block; - font-size: 12px; - line-height: 1.4; - margin: 0 .1em; - padding: .1em .6em; - - * * { display: none; } -} - @media all and (max-width : 940px) {