summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClement Ho <clementh@hp.com>2016-08-01 12:20:38 -0500
committerClement Ho <clementh@hp.com>2016-08-01 14:08:45 -0500
commitd61b92a350f50fa1a443f0a180da401684f5cdca (patch)
tree55ebd16e444c5353ba4a3c1055d6cafdab8bed5a
parentab3dd9a106787b70c26e55e9f0dc7fe6c34b0769 (diff)
downloadgitlab-ce-d61b92a350f50fa1a443f0a180da401684f5cdca.tar.gz
Convert image diff background image to CSS
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/images/trans_bg.gifbin49 -> 0 bytes
-rw-r--r--app/assets/stylesheets/pages/diff.scss5
3 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 39b77460deb..71e837ad291 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,7 @@ v 8.11.0 (unreleased)
- Bump gitlab_git to speedup DiffCollection iterations
- Make branches sortable without push permission !5462 (winniehell)
- Check for Ci::Build artifacts at database level on pipeline partial
+ - Convert image diff background image to CSS (ClemMakesApps)
- Make "New issue" button in Issue page less obtrusive !5457 (winniehell)
- Gitlab::Metrics.current_transaction needs to be public for RailsQueueDuration
- Add GitLab Workhorse version to admin dashboard (Katarzyna Kobierska Ula Budziszewska)
diff --git a/app/assets/images/trans_bg.gif b/app/assets/images/trans_bg.gif
deleted file mode 100644
index 1a1c9c15ec7..00000000000
--- a/app/assets/images/trans_bg.gif
+++ /dev/null
Binary files differ
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index 21b1c223c88..21cee2e3a70 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -164,7 +164,10 @@
line-height: 0;
img {
border: 1px solid #fff;
- background: image-url('trans_bg.gif');
+ background-image: linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%),
+ linear-gradient(45deg, #e5e5e5 25%, transparent 25%, transparent 75%, #e5e5e5 75%, #e5e5e5 100%);
+ background-size: 10px 10px;
+ background-position: 0 0, 5px 5px;
max-width: 100%;
}
&.deleted {