summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-01-22 19:46:07 +0000
committerRobert Speicher <robert@gitlab.com>2016-01-22 19:46:07 +0000
commit06158a0ac52ea3fd606090ab394c6b8d1be72af0 (patch)
tree52ee5bf0f0485d02c123caaf637d09c71b06691d
parent3982219d98da1578d9b61bf685a7389371778eee (diff)
parentdb7d1dbe54714627bf156f0a4133d34ae750f3b5 (diff)
downloadgitlab-ce-06158a0ac52ea3fd606090ab394c6b8d1be72af0.tar.gz
Merge branch 'solarized-dark-old-lines' into 'master'
Make deleted line background color for Solarized Dark a little darker The difference is very slight, and I don't even _use_ Solarized Dark, but this annoyed me. See merge request !2563
-rw-r--r--app/assets/stylesheets/highlight/solarized_dark.scss2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/stylesheets/highlight/solarized_dark.scss b/app/assets/stylesheets/highlight/solarized_dark.scss
index ae7ecc65c39..b0aaadd0f7f 100644
--- a/app/assets/stylesheets/highlight/solarized_dark.scss
+++ b/app/assets/stylesheets/highlight/solarized_dark.scss
@@ -26,7 +26,7 @@
}
.diff-line-num.old, .line_content.old {
- @include diff_background(rgba(220, 50, 47, 0.2), rgba(220, 50, 47, 0.3), #808080);
+ @include diff_background(rgba(220, 50, 47, 0.3), rgba(220, 50, 47, 0.3), #808080);
}
.line_content.match {