From b80cd05c49a7b8888d2787c7c4fb4c97165a9a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Mon, 12 Oct 2015 16:11:21 +0200 Subject: [PATCH] Bug 1213595 - Tweak .toolbarbutton-1 colors. r=gijs --- browser/themes/linux/browser.css | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index c5cabf455a0d..537efb6feb4e 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -21,15 +21,15 @@ :root { --backbutton-urlbar-overlap: 6px; - --toolbarbutton-hover-background: hsla(0,0%,100%,.3) linear-gradient(hsla(0,0%,100%,.7), hsla(0,0%,100%,.2)); - --toolbarbutton-hover-boxshadow: 0 1px 0 hsla(0,0%,100%,.3) inset, 0 0 0 1px hsla(0,0%,100%,.2) inset, 0 1px 0 hsla(0,0%,0%,.03); - --toolbarbutton-hover-bordercolor: rgb(154,154,154); + --toolbarbutton-hover-background: rgba(255,255,255,.5) linear-gradient(rgba(255,255,255,.5), transparent); + --toolbarbutton-hover-bordercolor: rgba(0,0,0,.25); + --toolbarbutton-hover-boxshadow: none; - --toolbarbutton-active-boxshadow: 0 1px 1px hsla(0,0%,0%,.1) inset, 0 0 1px hsla(0,0%,0%,.3) inset; - --toolbarbutton-active-bordercolor: rgb(154,154,154); - --toolbarbutton-active-background: rgba(154,154,154,.5) linear-gradient(hsla(0,0%,100%,.7), hsla(0,0%,100%,.4)); + --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; - --toolbarbutton-checkedhover-backgroundcolor: rgba(154,154,154,.15); + --toolbarbutton-checkedhover-backgroundcolor: rgba(200,200,200,.5); --identity-box-verified-background-color: #fff; @@ -626,8 +626,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):hover > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):hover > .toolbarbutton-icon { background: var(--toolbarbutton-hover-background); - border-width: 1px; - border-style: solid; + background-clip: padding-box; border-color: var(--toolbarbutton-hover-bordercolor); box-shadow: var(--toolbarbutton-hover-boxshadow); } @@ -644,9 +643,8 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-stack, :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon { background: var(--toolbarbutton-active-background); + background-clip: padding-box; box-shadow: var(--toolbarbutton-active-boxshadow); - border-width: 1px; - border-style: solid; border-color: var(--toolbarbutton-active-bordercolor); transition-duration: 10ms; }