summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework/files.scss
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2016-01-29 19:37:17 +0100
committerDouwe Maan <douwe@selenight.nl>2016-01-29 19:37:17 +0100
commit677b4db9e682b29bb15dddb84fe80b976490a671 (patch)
treea0cfa62dd011bfe897d01ad0ef87540d4ccc23a9 /app/assets/stylesheets/framework/files.scss
parente221990ebac72b8b229b8c3ff38069edbf7776a7 (diff)
downloadgitlab-ce-677b4db9e682b29bb15dddb84fe80b976490a671.tar.gz
Mark inline difference between old and new paths when a file is renamed
Diffstat (limited to 'app/assets/stylesheets/framework/files.scss')
-rw-r--r--app/assets/stylesheets/framework/files.scss26
1 files changed, 26 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/files.scss b/app/assets/stylesheets/framework/files.scss
index 00cb756b376..c7f3604850d 100644
--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -36,6 +36,20 @@
}
}
+ .filename {
+ &.old {
+ span.idiff {
+ background-color: #f8cbcb;
+ }
+ }
+
+ &.new {
+ span.idiff {
+ background-color: #a6f3a6;
+ }
+ }
+ }
+
.left-options {
margin-top: -3px;
}
@@ -158,3 +172,15 @@
}
}
}
+
+span.idiff {
+ &.left {
+ border-top-left-radius: 2px;
+ border-bottom-left-radius: 2px;
+ }
+
+ &.right {
+ border-top-right-radius: 2px;
+ border-bottom-right-radius: 2px;
+ }
+}