Bug 601060 - Hovering links shows "moz-action:switchtab" text and hides "Switch to tab:" label in URL bar when it contains a switch-to-tab URL. r=dao

This commit is contained in:
Frank Yan 2011-01-22 12:21:35 +01:00
parent 3e1896eef3
commit 84af3e4f6a
6 changed files with 32 additions and 25 deletions

View File

@ -279,7 +279,7 @@ panel[noactions] > richlistbox > richlistitem[type~="action"] > .ac-url-box > .a
visibility: visible;
}
#urlbar:not([actiontype]) > #urlbar-display {
#urlbar:not([actiontype]) > #urlbar-display-box {
display: none;
}

View File

@ -571,7 +571,9 @@
</hbox>
</hbox>
</box>
<label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
<box id="urlbar-display-box" align="center">
<label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
</box>
<hbox id="urlbar-icons">
<image id="page-report-button"
class="urlbar-icon"

View File

@ -783,7 +783,8 @@
overLink.style.maxWidth = maxWidth + "px";
}
this._originLabel.value = this.value;
var action = this._parseActionUrl(this._value);
this._originLabel.value = action ? action.param : this._value;
]]></body>
</method>

View File

@ -943,17 +943,19 @@ toolbar[iconsize="small"] #feed-button {
-moz-margin-start: 0;
}
#urlbar-display {
margin-top: -2px;
margin-bottom: -2px;
padding-top: 3px;
padding-bottom: 2px;
-moz-padding-end: 3px;
color: GrayText;
#urlbar-display-box {
margin-top: -1px;
margin-bottom: -1px;
-moz-border-end: 1px solid #AAA;
-moz-margin-end: 3px;
}
#urlbar-display {
margin-top: 0;
margin-bottom: 0;
color: GrayText;
}
#PopupAutoComplete,
#PopupAutoCompleteRichResult {
direction: ltr !important;

View File

@ -886,17 +886,17 @@ toolbar[mode="icons"] #zoom-in-button {
max-width: 20em;
}
#urlbar-display {
margin-top: -3px;
margin-bottom: -2px;
padding-top: 3px;
padding-bottom: 2px;
-moz-padding-end: 3px;
color: GrayText;
#urlbar-display-box {
-moz-border-end: 1px solid #AAA;
-moz-margin-end: 3px;
}
#urlbar-display {
margin-top: 0;
margin-bottom: 0;
color: GrayText;
}
#PopupAutoCompleteRichResult {
direction: ltr !important;
margin-top: 2px;
@ -1421,12 +1421,12 @@ sidebarheader {
-moz-border-end: 1px solid #404040;
min-width: 1px;
width: 1px;
background-image: none !important;
}
background-image: none !important;
}
#sidebar-title {
color: #535f6d;
font-weight: bold;
font-weight: bold;
}
#sidebar-throbber[loading="true"] {

View File

@ -1128,17 +1128,19 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
-moz-box-align: stretch;
}
#urlbar-display {
#urlbar-display-box {
margin-top: -2px;
margin-bottom: -2px;
padding-top: 3px;
padding-bottom: 2px;
-moz-padding-end: 3px;
color: GrayText;
-moz-border-end: 1px solid #AAA;
-moz-margin-end: 3px;
}
#urlbar-display {
margin-top: 0;
margin-bottom: 0;
color: GrayText;
}
/* over-link in location bar */
.urlbar-origin-label {