Commit d2f78130 authored by Jacob Schatz's avatar Jacob Schatz

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
parents 3a40e523 86d346b6
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
margin: 0; margin: 0;
text-align: left; text-align: left;
padding: 10px $gl-padding; padding: 10px $gl-padding;
word-wrap: break-word;
.file-actions { .file-actions {
float: right; float: right;
......
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
.md-preview-holder { .md-preview-holder {
min-height: 167px; min-height: 167px;
padding: 10px 0; padding: 10px 0;
overflow-x: auto;
} }
.markdown-area { .markdown-area {
......
...@@ -33,8 +33,12 @@ ...@@ -33,8 +33,12 @@
.description { .description {
margin-top: 6px; margin-top: 6px;
p:last-child { p {
overflow-x: auto;
&:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
} }
}
} }
...@@ -59,10 +59,15 @@ ...@@ -59,10 +59,15 @@
border-collapse: separate; border-collapse: separate;
margin: 0; margin: 0;
padding: 0; padding: 0;
.line_holder td { .line_holder td {
line-height: $code_line_height; line-height: $code_line_height;
font-size: $code_font_size; font-size: $code_font_size;
} }
td {
white-space: nowrap;
}
} }
tr.line_holder.parallel { tr.line_holder.parallel {
......
...@@ -82,7 +82,7 @@ ul.notes { ...@@ -82,7 +82,7 @@ ul.notes {
// On diffs code should wrap nicely and not overflow // On diffs code should wrap nicely and not overflow
pre { pre {
code { code {
white-space: pre-wrap; white-space: pre;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment