Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 14:22:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 417844: SSL appearance for site identity button and location bar should be consistent across platforms, patch by Dão Gottwald <dao@mozilla.com>, r=me, ui-r=beltzner, a=beltzner

Browse Source
This commit is contained in:
gavin@gavinsharp.com 2008-04-24 17:04:46 -07:00
parent 00a12826fa
commit c782059a37
8 changed files with 94 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/browser.xul
View File

@ -337,6 +337,7 @@
We only add the identity-box button to the tab order when the location bar
has focus, otherwise pressing F6 focuses it instead of the location bar -->
<box id="identity-box" role="button"
chromedir="&locale.dir;"
onclick="getIdentityHandler().handleIdentityButtonEvent(event);"
onkeypress="getIdentityHandler().handleIdentityButtonEvent(event);">
<hbox align="center">

17
browser/themes/gnomestripe/browser/browser.css
View File

@ -881,8 +881,14 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
display: none;
}
#identity-box.verifiedDomain > hbox {
background-color: rgba(30, 80, 170, 0.7);
color: white;
}
#identity-box.verifiedIdentity > hbox {
background-color: rgba(0, 255, 0, 0.25);
background-color: rgba(50, 150, 50, 0.8);
color: white;
}
/* Identity popup icons */
@ -955,15 +961,6 @@ toolbar[iconsize="small"] #paste-button[disabled="true"] {
padding: 10px;
}
/* Secure site coloring */
#urlbar[level="high"][pageproxystate="valid"] > .autocomplete-textbox-container,
#urlbar[level="low"][pageproxystate="valid"] > .autocomplete-textbox-container,
#urlbar[level="high"][pageproxystate="valid"] #autocomplete-security-wrapper,
#urlbar[level="low"][pageproxystate="valid"] #autocomplete-security-wrapper {
background-color: #F5F6BE; /* #F7F898; */
color: #000000;
}
#urlbar > .autocomplete-textbox-container {
-moz-binding: url(chrome://browser/skin/browser.xml#autocomplete-security-wrapper);
}

19
browser/themes/winstripe/browser/browser-aero.css
View File

@ -18,17 +18,32 @@
-moz-margin-start: 6px;
}
#urlbar[chromedir="ltr"] > #identity-box {
#identity-box[chromedir="ltr"] {
-moz-margin-start: -6px;
}
#urlbar[chromedir="ltr"] > #identity-box > hbox {
#identity-box[chromedir="ltr"] > hbox {
margin: -4px 0;
padding: 3px 2px 3px 4px;
background-position: 0 3px;
-moz-border-radius-topleft: 14px;
-moz-border-radius-bottomleft: 14px;
}
#identity-box:hover[chromedir="ltr"] > hbox {
background-position: 0 -57px;
}
#identity-box.verifiedDomain[chromedir="ltr"] > hbox {
background-position: 0 -117px;
}
#identity-box.verifiedDomain:hover[chromedir="ltr"] > hbox {
background-position: 0 -177px;
}
#identity-box.verifiedIdentity[chromedir="ltr"] > hbox {
background-position: 0 -237px;
}
#identity-box.verifiedIdentity:hover[chromedir="ltr"] > hbox {
background-position: 0 -297px;
}
/* Bug 413060, comment 14: Match #identity-box's -moz-margin-start, less 1px */
#identity-popup[chromedir="ltr"] {

89
browser/themes/winstripe/browser/browser.css
View File

@ -1651,15 +1651,6 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
-moz-margin-end: 4px;
}
/* Secure site coloring */
#urlbar[level="high"][pageproxystate="valid"] > .autocomplete-textbox-container ,
#urlbar[level="high"][pageproxystate="valid"] > .autocomplete-history-dropmarker ,
#urlbar[level="low"][pageproxystate="valid"] > .autocomplete-textbox-container ,
#urlbar[level="low"][pageproxystate="valid"] > .autocomplete-history-dropmarker {
background-color: #F5F6BE;
color: #000000;
}
/* Location bar dropmarker */
#urlbar > .autocomplete-history-dropmarker {
-moz-appearance: none;
@ -1671,7 +1662,7 @@ toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
#urlbar > .autocomplete-history-dropmarker:hover ,
#urlbar > .autocomplete-history-dropmarker[open="true"] {
background: ButtonFace url(chrome://browser/skin/tabbrowser/tab-active-bkgnd.png) repeat-x !important;
background: -moz-dialog url(navbar-textbox-buttons.png) repeat-x 0 -60px !important;
}
#urlbar > .autocomplete-history-dropmarker > .dropmarker-icon {
@ -1784,40 +1775,75 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
overflow: -moz-hidden-unscrollable;
}
#urlbar[chromedir="ltr"] > #identity-box {
#identity-box[chromedir="ltr"] {
-moz-margin-start: -4px;
border-right: 1px solid ThreeDShadow;
}
#identity-box.verifiedDomain[chromedir="ltr"] ,
#identity-box.verifiedIdentity[chromedir="ltr"] {
border-right: 1px solid ThreeDDarkShadow;
}
#identity-box > hbox {
background: ButtonFace url(chrome://browser/skin/tabbrowser/tab-active-bkgnd.png) repeat-x;
color: -moz-dialogtext;
}
#urlbar[chromedir="rtl"] > #identity-box > hbox {
border-right: 1px solid ButtonShadow;
border-left: 1px solid ButtonShadow;
background: -moz-dialog url(navbar-textbox-buttons.png) repeat-x;
color: -moz-dialogText;
border-left: 2px solid;
border-right: 2px solid;
-moz-border-left-colors: ThreeDShadow rgba(255, 255, 255, 0.2);
-moz-border-right-colors: ThreeDShadow rgba(255, 255, 255, 0.2);
padding: 0 3px;
}
#urlbar[chromedir="ltr"] > #identity-box > hbox {
border: 1px solid ButtonShadow;
border-right-style: none;
#identity-box[chromedir="ltr"] > hbox {
margin: -11px -10px -11px 0;
padding: 10px 12px 10px 4px;
background-position: 0 10px;
border-top: 1px solid ThreeDDarkShadow;
border-bottom: 1px solid ThreeDDarkShadow;
border-right-style: none;
-moz-border-radius-topleft: 21px;
-moz-border-radius-bottomleft: 21px;
-moz-border-left-colors: ThreeDDarkShadow rgba(255, 255, 255, 0.4);
background-position: 0 10px;
}
#urlbar[chromedir="ltr"] > .autocomplete-textbox-container > .textbox-input-box {
border-left: 1px solid ButtonShadow;
margin-left: 0;
padding-left: 3px;
#identity-box:hover > hbox {
background-position: 0 -60px;
-moz-border-left-colors: ThreeDShadow rgba(255, 255, 255, 0.4);
-moz-border-right-colors: ThreeDShadow rgba(255, 255, 255, 0.4);
}
#identity-box:hover[chromedir="ltr"] > hbox {
background-position: 0 -50px;
-moz-border-left-colors: ThreeDDarkShadow rgba(255, 255, 255, 0.6);
}
#identity-box.verifiedDomain > hbox {
background-position: 0 -120px;
color: white;
}
#identity-box.verifiedDomain[chromedir="ltr"] > hbox {
background-position: 0 -110px;
}
#identity-box.verifiedDomain:hover > hbox {
background-position: 0 -180px;
}
#identity-box.verifiedDomain:hover[chromedir="ltr"] > hbox {
background-position: 0 -170px;
}
#identity-box.verifiedIdentity > hbox {
background-color: #7c8;
color: #000;
background-position: 0 -240px;
color: white;
}
#identity-box.verifiedIdentity[chromedir="ltr"] > hbox {
background-position: 0 -230px;
}
#identity-box.verifiedIdentity:hover > hbox {
background-position: 0 -300px;
}
#identity-box.verifiedIdentity:hover[chromedir="ltr"] > hbox {
background-position: 0 -290px;
}
#identity-box:focus {
@ -1825,6 +1851,11 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
outline-offset: -3px;
}
#identity-box.verifiedDomain:focus ,
#identity-box.verifiedIdentity:focus {
outline: 1px dotted white;
}
#identity-icon-label {
padding: 0 2px;
margin: 0;

6
browser/themes/winstripe/browser/jar.mn
View File

@ -17,7 +17,6 @@ classic.jar:
skin/classic/browser/Secure.png (Secure.png)
skin/classic/browser/Secure24.png (Secure24.png)
skin/classic/browser/Security-broken.png (Security-broken.png)
skin/classic/browser/siteButtons.png (siteButtons.png)
skin/classic/browser/Throbber.gif
skin/classic/browser/Throbber.png
skin/classic/browser/Throbber-small.png
@ -29,12 +28,12 @@ classic.jar:
skin/classic/browser/Search-glass.png (Search-glass.png)
skin/classic/browser/Search-glass-rtl.png (Search-glass-rtl.png)
skin/classic/browser/Search-addengines.png
skin/classic/browser/searchButtons.png (searchButtons.png)
skin/classic/browser/setDesktopBackground.css
skin/classic/browser/menu-back.png (menu-back.png)
skin/classic/browser/menu-forward.png (menu-forward.png)
skin/classic/browser/monitor.png
skin/classic/browser/monitor_16-10.png
skin/classic/browser/navbar-textbox-buttons.png (navbar-textbox-buttons.png)
skin/classic/browser/wrench.png
skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png)
skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png)
@ -105,7 +104,6 @@ classic.jar:
skin/classic/aero/browser/Secure.png (Secure-aero.png)
skin/classic/aero/browser/Secure24.png (Secure24-aero.png)
skin/classic/aero/browser/Security-broken.png (Security-broken-aero.png)
skin/classic/aero/browser/siteButtons.png (siteButtons-aero.png)
skin/classic/aero/browser/Throbber.gif
skin/classic/aero/browser/Throbber.png
skin/classic/aero/browser/Throbber-small.png
@ -117,12 +115,12 @@ classic.jar:
skin/classic/aero/browser/Search-glass.png (Search-glass-aero.png)
skin/classic/aero/browser/Search-glass-rtl.png (Search-glass-rtl-aero.png)
skin/classic/aero/browser/Search-addengines.png
skin/classic/aero/browser/searchButtons.png (searchButtons-aero.png)
skin/classic/aero/browser/setDesktopBackground.css
skin/classic/aero/browser/menu-back.png (menu-back-aero.png)
skin/classic/aero/browser/menu-forward.png (menu-forward-aero.png)
skin/classic/aero/browser/monitor.png
skin/classic/aero/browser/monitor_16-10.png
skin/classic/aero/browser/navbar-textbox-buttons.png (navbar-textbox-buttons-aero.png)
skin/classic/aero/browser/wrench.png
skin/classic/aero/browser/feeds/feedIcon.png (feeds/feedIcon-aero.png)
skin/classic/aero/browser/feeds/feedIcon16.png (feeds/feedIcon16-aero.png)

BIN
browser/themes/winstripe/browser/navbar-textbox-buttons-aero.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 550 B

BIN
browser/themes/winstripe/browser/navbar-textbox-buttons.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 619 B

10
browser/themes/winstripe/browser/searchbar.css
View File

@ -33,16 +33,20 @@
height: 1.23em;
min-height: 20px;
-moz-box-align: center;
background: ButtonFace url(chrome://browser/skin/tabbrowser/tab-active-bkgnd.png) repeat-x;
background: -moz-dialog url(navbar-textbox-buttons.png) repeat-x;
border: 0 solid;
border-right-width: 1px;
-moz-border-right-colors: ButtonShadow;
-moz-border-right-colors: ThreeDShadow;
}
.searchbar-engine-button:hover {
background-position: 0 -60px;
}
.searchbar-engine-button[chromedir="rtl"] {
border-right-width: 0;
border-left-width: 1px;
-moz-border-left-colors: ButtonShadow;
-moz-border-left-colors: ThreeDShadow;
}
.searchbar-engine-button > .button-box {