summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2016-04-21 15:53:58 +0000
committerJacob Schatz <jschatz@gitlab.com>2016-04-21 15:53:58 +0000
commitd2bf73b7763a4cf51d3319cf8056534a2ce22fda (patch)
tree028628b740d73290b10f261584663679b52a3d38
parentcd19ce8b05cf65f7dfeb6ffc09e010aed145a83d (diff)
parent1641e81971353b9f1b715716181a0f2b45d6e52a (diff)
downloadgitlab-ce-d2bf73b7763a4cf51d3319cf8056534a2ce22fda.tar.gz
Merge branch '15445-file-renames' into 'master'
File name change appears on one line Closes #15445 <img src="/uploads/51714555be63af16b810cf528de49192/Screen_Shot_2016-04-21_at_9.22.43_AM.png" width="500px"> See merge request !3854
-rw-r--r--app/assets/stylesheets/framework/files.scss2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 789df42fb66..148a7cab6e2 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -38,12 +38,14 @@
.filename {
&.old {
+ display: inline-block;
span.idiff {
background-color: #f8cbcb;
}
}
&.new {
+ display: inline-block;
span.idiff {
background-color: #a6f3a6;
}