From 84bf0fdb0890f707464d59e1579c1f405ad5710b Mon Sep 17 00:00:00 2001 From: jayati Date: Fri, 3 Apr 2020 13:15:58 +0000 Subject: [PATCH] Bug 1619314 - Improve visibility of mobile protection icons in high contrast mode. r=ntim Differential Revision: https://phabricator.services.mozilla.com/D68701 --HG-- rename : browser/base/content/logos/etp-mobile-light.svg => browser/base/content/logos/etp-mobile.svg rename : browser/base/content/logos/lockwise-light.svg => browser/base/content/logos/lockwise-mobile.svg extra : moz-landing-system : lando --- .../base/content/logos/etp-mobile-dark.svg | 4 -- .../base/content/logos/etp-mobile-light.svg | 4 -- browser/base/content/logos/etp-mobile.svg | 13 ++++ browser/base/content/logos/lockwise-dark.svg | 4 -- browser/base/content/logos/lockwise-light.svg | 4 -- .../base/content/logos/lockwise-mobile.svg | 64 +++++++++++++++++++ browser/base/jar.mn | 8 +-- .../protections/content/protections.css | 13 +--- .../protections/content/protections.html | 6 +- 9 files changed, 84 insertions(+), 36 deletions(-) delete mode 100644 browser/base/content/logos/etp-mobile-dark.svg delete mode 100644 browser/base/content/logos/etp-mobile-light.svg create mode 100644 browser/base/content/logos/etp-mobile.svg delete mode 100644 browser/base/content/logos/lockwise-dark.svg delete mode 100644 browser/base/content/logos/lockwise-light.svg create mode 100644 browser/base/content/logos/lockwise-mobile.svg diff --git a/browser/base/content/logos/etp-mobile-dark.svg b/browser/base/content/logos/etp-mobile-dark.svg deleted file mode 100644 index 933e54ed4715..000000000000 --- a/browser/base/content/logos/etp-mobile-dark.svg +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/browser/base/content/logos/etp-mobile-light.svg b/browser/base/content/logos/etp-mobile-light.svg deleted file mode 100644 index 976cc68544bf..000000000000 --- a/browser/base/content/logos/etp-mobile-light.svg +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/browser/base/content/logos/etp-mobile.svg b/browser/base/content/logos/etp-mobile.svg new file mode 100644 index 000000000000..dfb6eed9c514 --- /dev/null +++ b/browser/base/content/logos/etp-mobile.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + diff --git a/browser/base/content/logos/lockwise-dark.svg b/browser/base/content/logos/lockwise-dark.svg deleted file mode 100644 index b00c95741216..000000000000 --- a/browser/base/content/logos/lockwise-dark.svg +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/browser/base/content/logos/lockwise-light.svg b/browser/base/content/logos/lockwise-light.svg deleted file mode 100644 index 3bafe18f91b7..000000000000 --- a/browser/base/content/logos/lockwise-light.svg +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/browser/base/content/logos/lockwise-mobile.svg b/browser/base/content/logos/lockwise-mobile.svg new file mode 100644 index 000000000000..ee0a1e665059 --- /dev/null +++ b/browser/base/content/logos/lockwise-mobile.svg @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/browser/base/jar.mn b/browser/base/jar.mn index 92c13e927db3..2000c15d9fa1 100644 --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -14,11 +14,9 @@ browser.jar: content/browser/aboutRobots.xhtml (content/aboutRobots.xhtml) content/browser/aboutRobots.js (content/aboutRobots.js) content/browser/aboutRobots.css (content/aboutRobots.css) - content/browser/logos/etp-mobile-dark.svg (content/logos/etp-mobile-dark.svg) - content/browser/logos/etp-mobile-light.svg (content/logos/etp-mobile-light.svg) - content/browser/logos/lockwise-light.svg (content/logos/lockwise-light.svg) - content/browser/logos/lockwise-dark.svg (content/logos/lockwise-dark.svg) - content/browser/logos/lockwise.svg (content/logos/lockwise.svg) + content/browser/logos/etp-mobile.svg (content/logos/etp-mobile.svg) + content/browser/logos/lockwise-mobile.svg (content/logos/lockwise-mobile.svg) + content/browser/logos/lockwise.svg (content/logos/lockwise.svg) content/browser/logos/monitor.svg (content/logos/monitor.svg) content/browser/logos/proxy.svg (content/logos/proxy.svg) content/browser/logos/send.svg (content/logos/send.svg) diff --git a/browser/components/protections/content/protections.css b/browser/components/protections/content/protections.css index 338cf3dfcecf..b9c5d41ce326 100644 --- a/browser/components/protections/content/protections.css +++ b/browser/components/protections/content/protections.css @@ -113,7 +113,6 @@ h2 { .etp-card.custom-not-blocking #protection-details, #manage-protections, .etp-card .icon.dark, -.mobile-app-icon.dark, a.hidden, .loading .card-body, .lockwise-card.hidden, @@ -160,17 +159,8 @@ a.hidden, .etp-card .icon.light { display: none; } - - .mobile-app-icon.dark { - display: block; - } - - .mobile-app-icon.light { - display: none; - } } - .card { display: grid; grid-template-columns: 100%; @@ -602,10 +592,11 @@ label[for="tab-cryptominer"]:hover ~ #highlight-hover { grid-gap: 10px; } -.lockwise-mobile-app-icon, .mobile-app-icon { height: 56px; width: auto; + -moz-context-properties: fill; + fill: currentColor; } #lockwise-app-links, diff --git a/browser/components/protections/content/protections.html b/browser/components/protections/content/protections.html index 34902aca8ae7..b4687ccd7d77 100644 --- a/browser/components/protections/content/protections.html +++ b/browser/components/protections/content/protections.html @@ -118,8 +118,7 @@
- - +

@@ -224,8 +223,7 @@