diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-07 01:25:30 +0300 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-07 01:25:30 +0300 |
commit | d2f7813078b2a2adc81bee594ed9cfab578e812b (patch) | |
tree | 2fb1b497f515e38b3704ee7bb4c2126d0c0a0bf8 | |
parent | 3a40e523a25631477cd351b511bfe4d6c1282901 (diff) | |
parent | 86d346b6f4991e0562061f9b9709cffc16fe1ee7 (diff) |
Merge branch '14866-url-overflow' into 'master'
Wrap code blocks to next line
Closes #14866
![Screen_Shot_2016-04-06_at_9.27.06_AM](/uploads/8bed5c17b17c9d15fe34dc7161d31e09/Screen_Shot_2016-04-06_at_9.27.06_AM.png)
See merge request !3573
-rw-r--r-- | app/assets/stylesheets/framework/files.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/detail_page.scss | 8 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 2 |
5 files changed, 14 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss index a26ace5cc19..b15f4e7bd5e 100644 --- a/app/assets/stylesheets/framework/files.scss +++ b/app/assets/stylesheets/framework/files.scss @@ -20,6 +20,7 @@ margin: 0; text-align: left; padding: 10px $gl-padding; + word-wrap: break-word; .file-actions { float: right; diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index ea8e1c902cb..c8f86d60e3b 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -84,6 +84,7 @@ .md-preview-holder { min-height: 167px; padding: 10px 0; + overflow-x: auto; } .markdown-area { diff --git a/app/assets/stylesheets/pages/detail_page.scss b/app/assets/stylesheets/pages/detail_page.scss index d3eda1a57e6..5917f089720 100644 --- a/app/assets/stylesheets/pages/detail_page.scss +++ b/app/assets/stylesheets/pages/detail_page.scss @@ -33,8 +33,12 @@ .description { margin-top: 6px; - p:last-child { - margin-bottom: 0; + p { + overflow-x: auto; + + &:last-child { + margin-bottom: 0; + } } } } diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index f1368d74b3b..7a12aa96476 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -59,10 +59,15 @@ border-collapse: separate; margin: 0; padding: 0; + .line_holder td { line-height: $code_line_height; font-size: $code_font_size; } + + td { + white-space: nowrap; + } } tr.line_holder.parallel { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 614ca48b901..aca86457c70 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -82,7 +82,7 @@ ul.notes { // On diffs code should wrap nicely and not overflow pre { code { - white-space: pre-wrap; + white-space: pre; } } |