From 6cf509454c07c6dacfe962498c57b85da168461f Mon Sep 17 00:00:00 2001 From: SansPseudoFix Date: Wed, 4 Mar 2015 18:47:09 +0100 Subject: [PATCH] fix overflow blockquote stream change word-break to wrap-wrap modified: app/assets/stylesheets/stream_element.scss remove useless word-wrap global prevent for overflow global overflow fix Remove useless word-wrap modified: app/assets/stylesheets/conversations.scss modified: app/assets/stylesheets/new_styles/_base.scss modified: app/assets/stylesheets/new_styles/_code.scss modified: app/assets/stylesheets/single-post-view.scss modified: app/assets/stylesheets/stream_element.scss indent --- app/assets/stylesheets/conversations.scss | 1 - app/assets/stylesheets/new_styles/_base.scss | 8 ++++++++ app/assets/stylesheets/new_styles/_code.scss | 5 +---- app/assets/stylesheets/single-post-view.scss | 1 - 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/conversations.scss b/app/assets/stylesheets/conversations.scss index cb6bc23e7..b47f415c3 100644 --- a/app/assets/stylesheets/conversations.scss +++ b/app/assets/stylesheets/conversations.scss @@ -14,7 +14,6 @@ p { margin: 0 0 1em 0; - word-wrap: break-word; &:last-child { margin-bottom: 0; } } &.new_message { border-bottom: none; } diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss index 2d09eb0aa..4e153d491 100644 --- a/app/assets/stylesheets/new_styles/_base.scss +++ b/app/assets/stylesheets/new_styles/_base.scss @@ -14,6 +14,14 @@ body { } } +/* Overflow */ +h1, h2, h3, h4, h5, h6, +p, +blockquote, +code, +pre { word-wrap: break-word; } +a.tag { word-break: break-all; } + /* new link color */ $link-blue : rgb(42,156,235); a { color : $link-blue } diff --git a/app/assets/stylesheets/new_styles/_code.scss b/app/assets/stylesheets/new_styles/_code.scss index 181f5951a..aae6a603f 100644 --- a/app/assets/stylesheets/new_styles/_code.scss +++ b/app/assets/stylesheets/new_styles/_code.scss @@ -1,7 +1,4 @@ -code { - white-space: normal; - word-wrap: break-word; -} +code { white-space: normal; } pre { overflow-x: auto; diff --git a/app/assets/stylesheets/single-post-view.scss b/app/assets/stylesheets/single-post-view.scss index 8d532088b..f931fc61f 100644 --- a/app/assets/stylesheets/single-post-view.scss +++ b/app/assets/stylesheets/single-post-view.scss @@ -120,7 +120,6 @@ width: auto; p { margin: 0 0 1em 0; - word-wrap: break-word; } .photo_attachments { padding-bottom: 10px;