summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-04-07 13:27:39 -0700
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-04-07 13:27:39 -0700
commit422a9247587703ae149c1c716decc0fbb356afe2 (patch)
tree388d30b28b4b9a16596963e34dc1998c9b45a1d6
parent1060467bb8f1ce6886b05436d16f95996da2fa91 (diff)
downloadgitlab-ce-422a9247587703ae149c1c716decc0fbb356afe2.tar.gz
Fix side-by-side code format & commit message wrapcode-wrapping
-rw-r--r--app/assets/stylesheets/pages/commit.scss2
-rw-r--r--app/assets/stylesheets/pages/diff.scss4
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/commit.scss b/app/assets/stylesheets/pages/commit.scss
index 082911bd118..358d2f4ab9d 100644
--- a/app/assets/stylesheets/pages/commit.scss
+++ b/app/assets/stylesheets/pages/commit.scss
@@ -20,6 +20,8 @@
margin: 0;
padding: 0;
margin-top: 10px;
+ word-break: normal;
+ white-space: pre-wrap;
}
.commit-info-row {
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 939555bb260..97f4485beb8 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -109,6 +109,10 @@
display: table-cell;
}
}
+
+ .text-file.diff-wrap-lines table .line_holder td span {
+ white-space: pre-wrap;
+ }
}
.image {
background: #ddd;