зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1516091 - Stop using <sidebarheader> as an element. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D51384 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
253cc9eb1e
Коммит
282cc5ebd5
|
@ -1374,7 +1374,7 @@
|
||||||
<hbox flex="1" id="browser" renderroot="content">
|
<hbox flex="1" id="browser" renderroot="content">
|
||||||
<vbox id="browser-border-start" hidden="true" layer="true"/>
|
<vbox id="browser-border-start" hidden="true" layer="true"/>
|
||||||
<vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
|
<vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
|
||||||
<sidebarheader id="sidebar-header" align="center">
|
<box id="sidebar-header" align="center">
|
||||||
<toolbarbutton id="sidebar-switcher-target" flex="1" class="tabbable">
|
<toolbarbutton id="sidebar-switcher-target" flex="1" class="tabbable">
|
||||||
<image id="sidebar-icon" consumeanchor="sidebar-switcher-target"/>
|
<image id="sidebar-icon" consumeanchor="sidebar-switcher-target"/>
|
||||||
<label id="sidebar-title" crop="end" flex="1" control="sidebar"/>
|
<label id="sidebar-title" crop="end" flex="1" control="sidebar"/>
|
||||||
|
@ -1387,7 +1387,7 @@
|
||||||
# spacer should significantly out-flex the button.
|
# spacer should significantly out-flex the button.
|
||||||
<spacer flex="1000"/>
|
<spacer flex="1000"/>
|
||||||
<toolbarbutton id="sidebar-close" class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
|
<toolbarbutton id="sidebar-close" class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="SidebarUI.hide();"/>
|
||||||
</sidebarheader>
|
</box>
|
||||||
<browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" disablefullscreen="true"
|
<browser id="sidebar" flex="1" autoscroll="false" disablehistory="true" disablefullscreen="true"
|
||||||
style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
|
style="min-width: 14em; width: 18em; max-width: 36em;" tooltip="aHTMLTooltip"/>
|
||||||
</vbox>
|
</vbox>
|
||||||
|
|
|
@ -548,7 +548,7 @@ async function testContextMenu(
|
||||||
// `synthesizeMouseAtPoint` calls `nsIDOMWindowUtils.sendMouseEvent`,
|
// `synthesizeMouseAtPoint` calls `nsIDOMWindowUtils.sendMouseEvent`,
|
||||||
// which interprets the offsets relative to the containing *chrome* window.
|
// which interprets the offsets relative to the containing *chrome* window.
|
||||||
// This means we need to account for the width and height of any elements
|
// This means we need to account for the width and height of any elements
|
||||||
// outside the `browser` element, like `sidebarheader`.
|
// outside the `browser` element, like `#sidebar-header`.
|
||||||
let offsetX = contentRect.x + rect.x + rect.width / 2;
|
let offsetX = contentRect.x + rect.x + rect.width / 2;
|
||||||
let offsetY = contentRect.y + rect.y + rect.height / 4;
|
let offsetY = contentRect.y + rect.y + rect.height / 4;
|
||||||
|
|
||||||
|
|
|
@ -9,14 +9,13 @@
|
||||||
--sidebar-text-color: -moz-FieldText;
|
--sidebar-text-color: -moz-FieldText;
|
||||||
background-color: var(--sidebar-background-color);
|
background-color: var(--sidebar-background-color);
|
||||||
color: var(--sidebar-text-color);
|
color: var(--sidebar-text-color);
|
||||||
|
text-shadow: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
#sidebar-header {
|
#sidebar-header {
|
||||||
font-size: 1.333em;
|
font-size: 1.333em;
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
border-bottom: 1px solid var(--sidebar-border-color);
|
border-bottom: 1px solid var(--sidebar-border-color);
|
||||||
background-color: transparent;
|
|
||||||
color: inherit;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
%ifndef MOZ_WIDGET_GTK
|
%ifndef MOZ_WIDGET_GTK
|
||||||
|
|
|
@ -15,8 +15,6 @@
|
||||||
|
|
||||||
%include ../../shared/global.inc.css
|
%include ../../shared/global.inc.css
|
||||||
|
|
||||||
/* ::::: XBL bindings ::::: */
|
|
||||||
|
|
||||||
@media (-moz-menubar-drag) {
|
@media (-moz-menubar-drag) {
|
||||||
xul|toolbar[type="menubar"] {
|
xul|toolbar[type="menubar"] {
|
||||||
-moz-window-dragging: drag;
|
-moz-window-dragging: drag;
|
||||||
|
@ -81,17 +79,6 @@ xul|iframe {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXXBlake yeah, shoot me -- these don't belong here. I'll move them later. */
|
|
||||||
|
|
||||||
xul|sidebarheader {
|
|
||||||
min-height: 25px;
|
|
||||||
text-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
xul|sidebarheader > xul|label {
|
|
||||||
padding-inline-start: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
xul|toolbar[mode="text"] .toolbarbutton-text {
|
xul|toolbar[mode="text"] .toolbarbutton-text {
|
||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
margin: 3px 5px !important;
|
margin: 3px 5px !important;
|
||||||
|
|
|
@ -81,12 +81,6 @@ xul|iframe {
|
||||||
|
|
||||||
/* ::::: miscellaneous formatting ::::: */
|
/* ::::: miscellaneous formatting ::::: */
|
||||||
|
|
||||||
xul|sidebarheader {
|
|
||||||
background-color: -moz-Dialog;
|
|
||||||
color: -moz-dialogText;
|
|
||||||
text-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
:root:-moz-lwtheme {
|
:root:-moz-lwtheme {
|
||||||
-moz-appearance: none;
|
-moz-appearance: none;
|
||||||
}
|
}
|
||||||
|
|
|
@ -84,17 +84,6 @@ xul|iframe {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* XXXBlake yeah, shoot me -- these don't belong here. I'll move them later. */
|
|
||||||
|
|
||||||
xul|sidebarheader {
|
|
||||||
min-height: 25px;
|
|
||||||
text-shadow: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
xul|sidebarheader > xul|label {
|
|
||||||
padding-inline-start: 4px;
|
|
||||||
}
|
|
||||||
|
|
||||||
xul|toolbar[mode="text"] .toolbarbutton-text {
|
xul|toolbar[mode="text"] .toolbarbutton-text {
|
||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
margin: 3px 5px !important;
|
margin: 3px 5px !important;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче