summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2019-01-28 17:12:17 +0200
committerAndrew Newdigate <andrew@gitlab.com>2019-01-28 17:13:04 +0200
commit0a3efa5d5f6b9f03ef6004d61722ffc203498783 (patch)
treeb0ea771581bf8caf3780b7253ac7ae350626b9c5
parent2bb0d089ad70bf633071fc79dda0cc745a1c02a3 (diff)
downloadgitlab-ce-an-colourblind-accessibility-canary-icon.tar.gz
favicon-yellow.png represents the canary favicon. This yellow is almost totally indistinguishable from the normal orange icon for colourblind GitLab users. This change renames it to favicon-canary.png, which better represents what the favicon is used for, and also changes it's appearance to make it easier for colourblind users to distinguish.
-rw-r--r--app/assets/images/favicon-canary.pngbin0 -> 3399 bytes
-rw-r--r--app/assets/images/favicon-yellow.pngbin1667 -> 0 bytes
-rw-r--r--lib/gitlab/favicon.rb2
-rw-r--r--spec/lib/gitlab/favicon_spec.rb2
4 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/images/favicon-canary.png b/app/assets/images/favicon-canary.png
new file mode 100644
index 00000000000..d7eeda11b12
--- /dev/null
+++ b/app/assets/images/favicon-canary.png
Binary files differ
diff --git a/app/assets/images/favicon-yellow.png b/app/assets/images/favicon-yellow.png
deleted file mode 100644
index 2d5289818b4..00000000000
--- a/app/assets/images/favicon-yellow.png
+++ /dev/null
Binary files differ
diff --git a/lib/gitlab/favicon.rb b/lib/gitlab/favicon.rb
index 1ae2f9dfd93..f421d881da9 100644
--- a/lib/gitlab/favicon.rb
+++ b/lib/gitlab/favicon.rb
@@ -8,7 +8,7 @@ module Gitlab
if appearance_favicon.exists?
appearance_favicon.url
elsif Gitlab::Utils.to_boolean(ENV['CANARY'])
- 'favicon-yellow.png'
+ 'favicon-canary.png'
elsif Rails.env.development?
'favicon-blue.png'
else
diff --git a/spec/lib/gitlab/favicon_spec.rb b/spec/lib/gitlab/favicon_spec.rb
index 49a423191bb..9c2b12f060f 100644
--- a/spec/lib/gitlab/favicon_spec.rb
+++ b/spec/lib/gitlab/favicon_spec.rb
@@ -14,7 +14,7 @@ RSpec.describe Gitlab::Favicon, :request_store do
it 'has yellow favicon for canary' do
stub_env('CANARY', 'true')
- expect(described_class.main).to match_asset_path 'favicon-yellow.png'
+ expect(described_class.main).to match_asset_path 'favicon-canary.png'
end
it 'uses the custom favicon if a favicon appearance is present' do