Bug 1180202 - Identity block should change background color on hover and always be separated from page address. r=ttaubert

--HG--
extra : commitid : C0WMlrc5a5M
extra : rebase_source : 7407d0c70e6a3cb5caf8caedd3624cd0e203cac8
extra : source : 7875ccb3913303964335d55131cf2e88a8f518c5
This commit is contained in:
Paolo Amadini 2015-07-09 16:52:38 +01:00
parent cb3f37b97d
commit 72c89381bc
4 changed files with 40 additions and 26 deletions

View File

@ -970,7 +970,10 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
/* identity box */
#identity-box {
padding: 1px;
margin: -1px;
-moz-margin-end: 4px;
padding: 2px;
-moz-padding-end: 1px;
font-size: .9em;
}
@ -1020,12 +1023,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
padding-right: 5.01px;
}
#urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-moz-margin-end: 4px;
}
#identity-box.verifiedIdentity:not(:-moz-lwtheme) {
#identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover) {
background-color: var(--verified-identity-box-backgroundcolor);
}

View File

@ -1647,14 +1647,31 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
}
#identity-box {
margin: 0;
-moz-margin-end: 3px;
padding-top: 1px;
padding-bottom: 1px;
-moz-padding-start: 4px;
-moz-padding-end: 0;
padding: 1px 4px;
font-size: .9em;
}
#urlbar:not([focused="true"]) > #identity-box {
margin: -1px 0;
-moz-margin-end: 3px;
padding: 2px 4px;
}
@media (-moz-mac-yosemite-theme) {
#urlbar:not([focused="true"]) > #identity-box {
margin: -2px 0;
-moz-margin-end: 3px;
padding: 3px 4px;
}
#urlbar > #identity-box:hover,
#urlbar > #identity-box[open=true] {
background-color: rgb(240,237,237);
}
}
#identity-box:-moz-locale-dir(ltr) {
border-top-left-radius: 2px;
border-bottom-left-radius: 2px;
@ -1699,11 +1716,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="toolbar"] > .toolbarbutton-ba
padding-right: 10.01px;
}
#urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-moz-padding-end: 4px;
}
#identity-box:-moz-focusring {
box-shadow: 0 0 2px 1px -moz-mac-focusring inset,
0 0 2px 2px -moz-mac-focusring;

View File

@ -5,6 +5,10 @@
%endif
:root {
--identity-box-background-image: linear-gradient(hsla(0,0%,16%,0),
hsla(0,0%,16%,.2) 35%,
hsla(0,0%,16%,.2) 65%,
hsla(0,0%,16%,0));
--identity-box-verified-color: hsl(92,100%,30%);
--identity-box-verified-background-image: linear-gradient(hsla(92,81%,16%,0),
hsla(92,81%,16%,.2) 35%,
@ -33,18 +37,22 @@
%endif
}
#urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
#identity-box {
background-position: right;
background-size: 1px;
background-repeat: no-repeat;
background-image: var(--identity-box-background-image);
}
#urlbar[pageproxystate="valid"] > #identity-box.chromeUI:-moz-locale-dir(rtl),
#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity:-moz-locale-dir(rtl) {
#identity-box:-moz-locale-dir(rtl) {
background-position: left;
}
#identity-box:hover,
#identity-box[open=true] {
background-color: rgb(231,230,230);
}
#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
color: var(--identity-box-verified-color);
background-image: var(--identity-box-verified-background-image);

View File

@ -1407,6 +1407,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
#identity-box {
padding: 2px;
font-size: .9em;
-moz-margin-end: 4px;
}
#identity-box:-moz-locale-dir(ltr) {
@ -1455,12 +1456,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
padding-right: 5.01px;
}
#urlbar[pageproxystate="valid"] > #identity-box.chromeUI,
#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity {
-moz-margin-end: 4px;
}
#identity-box.verifiedIdentity:not(:-moz-lwtheme) {
#identity-box.verifiedIdentity:not(:-moz-lwtheme):not(:hover) {
background-color: var(--verified-identity-box-backgroundcolor);
}