Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <tak.noguchi.iridge@gmail.com>2017-07-12 12:50:26 +0300
committerTakuya Noguchi <takninnovationresearch@gmail.com>2017-11-03 05:17:23 +0300
commita03f8d255df1564ce9f07c7289f540ac381c6c65 (patch)
tree64436fcff0a7d121a1899761a07f1c1c0858a575 /app/assets/stylesheets/pages/diff.scss
parentd51ad1ea6407d3cb9eafd9fc891c7348b10b108f (diff)
Enable MergeableSelector in scss-lint
Diffstat (limited to 'app/assets/stylesheets/pages/diff.scss')
-rw-r--r--app/assets/stylesheets/pages/diff.scss8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 09f831dcb29..faa3d1fb4d5 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -380,6 +380,10 @@
}
}
}
+
+ .line_content {
+ white-space: pre-wrap;
+ }
}
.file-content .diff-file {
@@ -387,10 +391,6 @@
border: none;
}
-.diff-file .line_content {
- white-space: pre-wrap;
-}
-
.diff-wrap-lines .line_content {
white-space: pre-wrap;
}