From 4e3f82bfc869bfbd7289e17a706d0162c2688b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Fri, 26 May 2017 22:15:49 +0200 Subject: [PATCH] Bug 1368161 - Remove some non-Photon CSS variable declarations from Photon. r=nhnt11 MozReview-Commit-ID: CoWkJPnFWRo --HG-- extra : rebase_source : 86ea8efd58e5f00d935288eea920f30e2370c4da --- browser/themes/linux/browser.css | 6 +++--- browser/themes/osx/browser.css | 2 +- browser/themes/shared/toolbarbuttons.inc.css | 3 +-- browser/themes/windows/browser.css | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index ca3923e82a16..32f4f8b87b1b 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -23,9 +23,6 @@ --backbutton-background: rgba(255,255,255,.15); --backbutton-border-color: var(--urlbar-border-color-hover); -%endif - - --toolbarbutton-vertical-text-padding: calc(var(--toolbarbutton-inner-padding) - 1px); --toolbarbutton-hover-background: rgba(255,255,255,.5) linear-gradient(rgba(255,255,255,.5), transparent); --toolbarbutton-hover-bordercolor: rgba(0,0,0,.25); @@ -34,6 +31,9 @@ --toolbarbutton-active-background: rgba(154,154,154,.5) linear-gradient(rgba(255,255,255,.7), rgba(255,255,255,.4)); --toolbarbutton-active-bordercolor: rgba(0,0,0,.3); --toolbarbutton-active-boxshadow: 0 1px 1px rgba(0,0,0,.1) inset, 0 0 1px rgba(0,0,0,.3) inset; +%endif + + --toolbarbutton-vertical-text-padding: calc(var(--toolbarbutton-inner-padding) - 1px); --toolbarbutton-checkedhover-backgroundcolor: rgba(200,200,200,.5); diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index f1ac97c9706a..492bb9c3e789 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -31,7 +31,6 @@ --backbutton-border-color: rgba(0,0,0,0.2); --backbutton-background: linear-gradient(rgba(255,255,255,0.9), rgba(255,255,255,0.7)) repeat-x; -%endif --toolbarbutton-hover-bordercolor: hsla(0,0%,0%,.2); --toolbarbutton-hover-boxshadow: 0 1px 0 hsla(0,0%,100%,.5), @@ -41,6 +40,7 @@ --toolbarbutton-active-boxshadow: 0 1px 0 hsla(0,0%,100%,.5), 0 1px 0 hsla(0,0%,0%,.05) inset, 0 1px 1px hsla(0,0%,0%,.2) inset; +%endif --toolbarbutton-checkedhover-backgroundcolor: hsla(0,0%,0%,.09); diff --git a/browser/themes/shared/toolbarbuttons.inc.css b/browser/themes/shared/toolbarbuttons.inc.css index 82bbeea14bfa..01709d253b39 100644 --- a/browser/themes/shared/toolbarbuttons.inc.css +++ b/browser/themes/shared/toolbarbuttons.inc.css @@ -38,13 +38,12 @@ toolbar:-moz-lwtheme { %ifndef MOZ_PHOTON_THEME --toolbarbutton-hover-background: rgba(255,255,255,.25); --toolbarbutton-active-background: rgba(70%,70%,70%,.25); -%endif --toolbarbutton-hover-bordercolor: rgba(0,0,0,.2); --toolbarbutton-active-bordercolor: rgba(0,0,0,.3); --toolbarbutton-active-boxshadow: 0 0 2px rgba(0,0,0,.6) inset; - +%endif --toolbarbutton-checkedhover-backgroundcolor: rgba(85%,85%,85%,.25); } diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index dc394e597033..ce4ca031d93b 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -29,13 +29,13 @@ --backbutton-border-color: var(--urlbar-border-color-hover); --backbutton-background: rgba(255,255,255,.15); -%endif --toolbarbutton-hover-bordercolor: rgba(0,0,0,.2); --toolbarbutton-hover-boxshadow: none; --toolbarbutton-active-bordercolor: rgba(0,0,0,.3); --toolbarbutton-active-boxshadow: 0 0 0 1px rgba(0,0,0,.15) inset; +%endif --toolbarbutton-checkedhover-backgroundcolor: rgba(0,0,0,.1);