nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Backed out 4 changesets (bug 1857999) for causing dt failures on browser_theme_switching.js & Mn failures at test_element_state_chrome.py CLOSED TREE

Browse source 
Backed out changeset 75f5e6e3d917 (bug 1857999)
Backed out changeset 0d0c1d1e80e7 (bug 1857999)
Backed out changeset b8a03d31ecea (bug 1857999)
Backed out changeset dd5a10f9cfff (bug 1857999)
This commit is contained in:
Sandor Molnar 2023-10-16 14:12:22 +03:00
parent 8937518c8f
commit 9ac67f260f
77 changed files with 334 additions and 647 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

14
browser/base/content/aboutDialog.xhtml
View file

@ -4,6 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?>
<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
<window xmlns:html="http://www.w3.org/1999/xhtml" <window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="aboutDialog" id="aboutDialog"
@ -24,16 +28,6 @@
#endif #endif
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/content/aboutDialog.css"
/>
<html:link
rel="stylesheet"
href="chrome://branding/content/aboutDialog.css"
/>
<html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="browser/aboutDialog.ftl"/> <html:link rel="localization" href="browser/aboutDialog.ftl"/>
</linkset> </linkset>

58
browser/base/content/browser.xhtml
View file

@ -6,6 +6,32 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
<!-- The "global.css" stylesheet is imported first to allow other stylesheets to
override rules using selectors with the same specificity. This applies to
both "content" and "skin" packages, which bug 1385444 will unify later. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!-- While these stylesheets are defined in Toolkit, they are only used in the
main browser window, so we can load them here. Bug 1474241 is on file to
consider moving these widgets to the "browser" folder. -->
<?xml-stylesheet href="chrome://global/content/tabprompts.css" type="text/css"?>
<?xml-stylesheet href="chrome://global/skin/tabprompts.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/searchbar.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/translations/panel.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?>
<html id="main-window" <html id="main-window"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -33,38 +59,6 @@
persist="screenX screenY width height sizemode" persist="screenX screenY width height sizemode"
data-l10n-sync="true"> data-l10n-sync="true">
<head> <head>
<!-- The "global.css" stylesheet is imported first to allow other stylesheets to
override rules using selectors with the same specificity. This applies to
both "content" and "skin" packages, which bug 1385444 will unify later. -->
<link rel="stylesheet" href="chrome://global/skin/global.css" />
<link rel="stylesheet" href="chrome://global/content/tabprompts.css" />
<link rel="stylesheet" href="chrome://global/skin/tabprompts.css" />
<link rel="stylesheet" href="chrome://browser/content/browser.css" />
<link rel="stylesheet" href="chrome://browser/content/tabbrowser.css" />
<link
rel="stylesheet"
href="chrome://browser/content/downloads/downloads.css"
/>
<link rel="stylesheet" href="chrome://browser/content/places/places.css" />
<link
rel="stylesheet"
href="chrome://browser/content/usercontext/usercontext.css"
/>
<link rel="stylesheet" href="chrome://browser/skin/" />
<link rel="stylesheet" href="chrome://browser/skin/controlcenter/panel.css" />
<link
rel="stylesheet"
href="chrome://browser/skin/customizableui/panelUI.css"
/>
<link rel="stylesheet" href="chrome://browser/skin/downloads/downloads.css" />
<link rel="stylesheet" href="chrome://browser/skin/searchbar.css" />
<link rel="stylesheet" href="chrome://browser/skin/translations/panel.css" />
<link rel="stylesheet" href="chrome://browser/skin/places/tree-icons.css" />
<link rel="stylesheet" href="chrome://browser/skin/places/editBookmark.css" />
<link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="browser/allTabsMenu.ftl"/> <link rel="localization" href="browser/allTabsMenu.ftl"/>
<link rel="localization" href="browser/appmenu.ftl"/> <link rel="localization" href="browser/appmenu.ftl"/>

6
browser/base/content/hiddenWindowMac.xhtml
View file

@ -6,14 +6,12 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
#define HIDDEN_WINDOW #define HIDDEN_WINDOW
<?xml-stylesheet href="chrome://browser/skin/webRTC-menubar-indicator.css" type="text/css"?>
<window id="main-window" <window id="main-window"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
data-l10n-sync="true"> data-l10n-sync="true">
<html:link
rel="stylesheet"
href="chrome://browser/skin/webRTC-menubar-indicator.css"
/>
#include macWindow.inc.xhtml #include macWindow.inc.xhtml

9
browser/base/content/pageinfo/pageInfo.xhtml
View file

@ -3,6 +3,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
<?xml-stylesheet href="chrome://browser/content/pageinfo/pageInfo.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>
<window id="main-window" <window id="main-window"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
@ -16,12 +19,6 @@
persist="screenX screenY width height sizemode"> persist="screenX screenY width height sizemode">
<linkset> <linkset>
<html:link
rel="stylesheet"
href="chrome://browser/content/pageinfo/pageInfo.css"
/>
<html:link rel="stylesheet" href="chrome://browser/skin/pageInfo.css" />
<html:link rel="localization" href="browser/pageInfo.ftl"/> <html:link rel="localization" href="browser/pageInfo.ftl"/>
</linkset> </linkset>
#ifdef XP_MACOSX #ifdef XP_MACOSX

9
browser/base/content/safeMode.xhtml
View file

@ -4,6 +4,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://browser/content/safeMode.css"?>
<window <window
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -18,12 +21,6 @@
buttonidextra1="refresh-profile" buttonidextra1="refresh-profile"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/content/safeMode.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link rel="localization" href="browser/safeMode.ftl" /> <html:link rel="localization" href="browser/safeMode.ftl" />
</linkset> </linkset>

21
browser/base/content/sanitize.xhtml
View file

@ -5,6 +5,12 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
<?xml-stylesheet href="chrome://browser/skin/sanitizeDialog.css"?>
<?xml-stylesheet href="chrome://browser/content/sanitizeDialog.css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -22,21 +28,6 @@
</hbox> </hbox>
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/sanitizeDialog.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/content/sanitizeDialog.css"
/>
<html:link rel="localization" href="browser/sanitize.ftl" /> <html:link rel="localization" href="browser/sanitize.ftl" />
</linkset> </linkset>

11
browser/base/content/webext-panels.xhtml
View file

@ -5,6 +5,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
<window id="webextpanels-window" <window id="webextpanels-window"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@ -18,13 +22,6 @@
<script src="chrome://global/content/editMenuOverlay.js"/> <script src="chrome://global/content/editMenuOverlay.js"/>
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="stylesheet" href="chrome://browser/skin/" />
<html:link
rel="stylesheet"
href="chrome://browser/content/usercontext/usercontext.css"
/>
<html:link rel="localization" href="toolkit/branding/brandings.ftl"/> <html:link rel="localization" href="toolkit/branding/brandings.ftl"/>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/> <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="browser/browserContext.ftl"/> <html:link rel="localization" href="browser/browserContext.ftl"/>

6
browser/base/content/webrtcIndicator.xhtml
View file

@ -3,6 +3,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/webRTC-indicator.css" type="text/css"?>
<!DOCTYPE html> <!DOCTYPE html>
<html <html
@ -13,9 +16,6 @@
chromemargin="0,0,0,0" chromemargin="0,0,0,0"
> >
<head> <head>
<link rel="stylesheet" href="chrome://global/skin/global.css" />
<link rel="stylesheet" href="chrome://browser/skin/webRTC-indicator.css" />
<link rel="localization" href="branding/brand.ftl" /> <link rel="localization" href="branding/brand.ftl" />
<link rel="localization" href="browser/webrtcIndicator.ftl" /> <link rel="localization" href="browser/webrtcIndicator.ftl" />
<title data-l10n-id="webrtc-indicator-title"></title> <title data-l10n-id="webrtc-indicator-title"></title>

9
browser/base/content/webrtcLegacyIndicator.xhtml
View file

@ -4,6 +4,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/webRTC-legacy-indicator.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window xmlns:html="http://www.w3.org/1999/xhtml" <window xmlns:html="http://www.w3.org/1999/xhtml"
@ -20,12 +23,6 @@
orient="horizontal" orient="horizontal"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/webRTC-legacy-indicator.css"
/>
<html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="browser/webrtcIndicator.ftl"/> <html:link rel="localization" href="browser/webrtcIndicator.ftl"/>
</linkset> </linkset>

24
browser/components/downloads/content/contentAreaDownloadsView.xhtml
View file

@ -4,6 +4,12 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://browser/content/downloads/contentAreaDownloadsView.css"?>
<?xml-stylesheet href="chrome://browser/skin/downloads/contentAreaDownloadsView.css"?>
<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css"?>
<?xml-stylesheet href="chrome://browser/skin/downloads/allDownloadsView.css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window id="contentAreaDownloadsView" <window id="contentAreaDownloadsView"
@ -13,24 +19,6 @@
csp="default-src chrome:; img-src chrome: moz-icon:; object-src 'none'"> csp="default-src chrome:; img-src chrome: moz-icon:; object-src 'none'">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/content/downloads/contentAreaDownloadsView.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/downloads/contentAreaDownloadsView.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/content/downloads/downloads.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/downloads/allDownloadsView.css"
/>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/> <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="browser/downloads.ftl" /> <html:link rel="localization" href="browser/downloads.ftl" />
</linkset> </linkset>

4
browser/components/migration/content/migration.xhtml
View file

@ -3,6 +3,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<window id="migrationWizard" <window id="migrationWizard"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
@ -13,8 +15,6 @@
style="min-width: 40em;" style="min-width: 40em;"
buttons="accept,cancel"> buttons="accept,cancel">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="toolkit/global/wizard.ftl"/> <html:link rel="localization" href="toolkit/global/wizard.ftl"/>
<html:link rel="localization" href="browser/migration.ftl"/> <html:link rel="localization" href="browser/migration.ftl"/>

26
browser/components/places/content/bookmarkProperties.xhtml
View file

@ -4,6 +4,13 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://global/content/commonDialog.css" type="text/css"?>
<?xml-stylesheet href="chrome://global/skin/commonDialog.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -17,25 +24,6 @@
buttons="accept, cancel"> buttons="accept, cancel">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://global/content/commonDialog.css"
/>
<html:link rel="stylesheet" href="chrome://global/skin/commonDialog.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/places/editBookmark.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/places/tree-icons.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/content/places/places.css"
/>
<html:link rel="localization" href="browser/editBookmarkOverlay.ftl"/> <html:link rel="localization" href="browser/editBookmarkOverlay.ftl"/>
</linkset> </linkset>

24
browser/components/places/content/bookmarksSidebar.xhtml
View file

@ -3,6 +3,12 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css"?>
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
<?xml-stylesheet href="chrome://browser/skin/places/sidebar.css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window id="bookmarksPanel" <window id="bookmarksPanel"
@ -21,24 +27,6 @@
<script src="chrome://global/content/editMenuOverlay.js"/> <script src="chrome://global/content/editMenuOverlay.js"/>
<linkset> <linkset>
<html:link
rel="stylesheet"
href="chrome://browser/content/places/places.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/content/usercontext/usercontext.css"
/>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/places/tree-icons.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/places/sidebar.css"
/>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/> <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="browser/browser.ftl"/> <html:link rel="localization" href="browser/browser.ftl"/>
<html:link rel="localization" href="browser/places.ftl"/> <html:link rel="localization" href="browser/places.ftl"/>

24
browser/components/places/content/historySidebar.xhtml
View file

@ -3,6 +3,12 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css"?>
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
<?xml-stylesheet href="chrome://browser/skin/places/sidebar.css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window id="history-panel" <window id="history-panel"
@ -22,24 +28,6 @@
<script src="chrome://global/content/editMenuOverlay.js"/> <script src="chrome://global/content/editMenuOverlay.js"/>
<linkset> <linkset>
<html:link
rel="stylesheet"
href="chrome://browser/content/places/places.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/content/usercontext/usercontext.css"
/>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/places/tree-icons.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/places/sidebar.css"
/>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/> <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="browser/places.ftl"/> <html:link rel="localization" href="browser/places.ftl"/>
</linkset> </linkset>

48
browser/components/places/content/places.xhtml
View file

@ -4,6 +4,18 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css"?>
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
<?xml-stylesheet href="chrome://browser/skin/places/organizer-shared.css"?>
<?xml-stylesheet href="chrome://browser/skin/places/organizer.css"?>
<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css"?>
<?xml-stylesheet href="chrome://browser/skin/downloads/allDownloadsView.css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window id="places" <window id="places"
@ -19,42 +31,6 @@
persist="width height screenX screenY sizemode"> persist="width height screenX screenY sizemode">
<linkset> <linkset>
<html:link
rel="stylesheet"
href="chrome://browser/content/places/places.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/content/usercontext/usercontext.css"
/>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/places/tree-icons.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/places/editBookmark.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/places/organizer-shared.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/places/organizer.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/content/downloads/downloads.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/downloads/allDownloadsView.css"
/>
<html:link rel="localization" href="toolkit/global/textActions.ftl"/> <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
<html:link rel="localization" href="browser/browserSets.ftl"/> <html:link rel="localization" href="browser/browserSets.ftl"/>
<html:link rel="localization" href="browser/places.ftl"/> <html:link rel="localization" href="browser/places.ftl"/>

14
browser/components/preferences/dialogs/addEngine.xhtml
View file

@ -3,6 +3,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/addEngine.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
<window <window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
@ -17,16 +21,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/content/preferences/dialogs/addEngine.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link rel="localization" href="browser/preferences/addEngine.ftl" /> <html:link rel="localization" href="browser/preferences/addEngine.ftl" />
</linkset> </linkset>

9
browser/components/preferences/dialogs/applicationManager.xhtml
View file

@ -3,6 +3,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/applications.css"?>
<window <window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
@ -12,12 +15,6 @@
> >
<dialog id="appManager" buttons="accept,cancel"> <dialog id="appManager" buttons="accept,cancel">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/applications.css"
/>
<html:link <html:link
rel="localization" rel="localization"
href="browser/preferences/applicationManager.ftl" href="browser/preferences/applicationManager.ftl"

9
browser/components/preferences/dialogs/blocklists.xhtml
View file

@ -4,6 +4,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
<window <window
id="BlocklistsDialog" id="BlocklistsDialog"
data-l10n-id="blocklist-window2" data-l10n-id="blocklist-window2"
@ -20,12 +23,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link rel="localization" href="browser/preferences/blocklists.ftl" /> <html:link rel="localization" href="browser/preferences/blocklists.ftl" />
</linkset> </linkset>

9
browser/components/preferences/dialogs/browserLanguages.xhtml
View file

@ -4,6 +4,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
<window <window
type="child" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -18,12 +21,6 @@
helpTopic="change-language" helpTopic="change-language"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link rel="localization" href="browser/preferences/languages.ftl" /> <html:link rel="localization" href="browser/preferences/languages.ftl" />
</linkset> </linkset>

14
browser/components/preferences/dialogs/clearSiteData.xhtml
View file

@ -4,6 +4,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/clearSiteData.css" type="text/css"?>
<window <window
id="ClearSiteDataDialog" id="ClearSiteDataDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -18,16 +22,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/content/preferences/dialogs/clearSiteData.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link <html:link
rel="localization" rel="localization"

9
browser/components/preferences/dialogs/colors.xhtml
View file

@ -5,6 +5,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
<window <window
type="child" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -19,12 +22,6 @@
helpTopic="prefs-fonts-and-colors" helpTopic="prefs-fonts-and-colors"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link rel="localization" href="browser/preferences/colors.ftl" /> <html:link rel="localization" href="browser/preferences/colors.ftl" />
</linkset> </linkset>

9
browser/components/preferences/dialogs/connection.xhtml
View file

@ -4,6 +4,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
<window <window
type="child" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -20,12 +23,6 @@
> >
<!-- Used for extension-controlled lockdown message --> <!-- Used for extension-controlled lockdown message -->
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link rel="localization" href="browser/preferences/connection.ftl" /> <html:link rel="localization" href="browser/preferences/connection.ftl" />
<html:link <html:link
rel="localization" rel="localization"

9
browser/components/preferences/dialogs/containers.xhtml
View file

@ -4,6 +4,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/containers-dialog.css" type="text/css"?>
<window <window
id="ContainersDialog" id="ContainersDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -20,12 +23,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/containers-dialog.css"
/>
<html:link rel="localization" href="browser/preferences/containers.ftl" /> <html:link rel="localization" href="browser/preferences/containers.ftl" />
</linkset> </linkset>

14
browser/components/preferences/dialogs/dohExceptions.xhtml
View file

@ -4,6 +4,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/sitePermissions.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
<window <window
id="DoHExceptionsDialog" id="DoHExceptionsDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -19,16 +23,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/content/preferences/dialogs/sitePermissions.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link <html:link
rel="localization" rel="localization"

9
browser/components/preferences/dialogs/fonts.xhtml
View file

@ -5,6 +5,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
<window <window
type="child" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -19,12 +22,6 @@
helpTopic="prefs-fonts-and-colors" helpTopic="prefs-fonts-and-colors"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link rel="localization" href="browser/preferences/fonts.ftl" /> <html:link rel="localization" href="browser/preferences/fonts.ftl" />
</linkset> </linkset>

9
browser/components/preferences/dialogs/languages.xhtml
View file

@ -4,6 +4,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
<window <window
type="child" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -19,12 +22,6 @@
helpTopic="prefs-languages" helpTopic="prefs-languages"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link rel="localization" href="browser/preferences/languages.ftl" /> <html:link rel="localization" href="browser/preferences/languages.ftl" />
</linkset> </linkset>

14
browser/components/preferences/dialogs/permissions.xhtml
View file

@ -4,6 +4,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/sitePermissions.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
<window <window
id="PermissionsDialog" id="PermissionsDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -21,16 +25,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/content/preferences/dialogs/sitePermissions.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link <html:link
rel="localization" rel="localization"

9
browser/components/preferences/dialogs/sanitize.xhtml
View file

@ -5,6 +5,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -19,12 +22,6 @@
> >
<dialog buttons="accept,cancel,help" helpTopic="prefs-clear-private-data"> <dialog buttons="accept,cancel,help" helpTopic="prefs-clear-private-data">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link rel="localization" href="browser/sanitize.ftl" /> <html:link rel="localization" href="browser/sanitize.ftl" />
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
</linkset> </linkset>

16
browser/components/preferences/dialogs/selectBookmark.xhtml
View file

@ -3,6 +3,11 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
<window <window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
@ -13,17 +18,6 @@
> >
<dialog id="selectBookmarkDialog"> <dialog id="selectBookmarkDialog">
<linkset> <linkset>
<html:link
rel="stylesheet"
href="chrome://browser/content/places/places.css"
/>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/places/tree-icons.css"
/>
<html:link <html:link
rel="localization" rel="localization"
href="browser/preferences/selectBookmark.ftl" href="browser/preferences/selectBookmark.ftl"

9
browser/components/preferences/dialogs/siteDataRemoveSelected.xhtml
View file

@ -4,6 +4,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/siteDataSettings.css" type="text/css"?>
<window id="SiteDataRemoveSelectedDialog" <window id="SiteDataRemoveSelectedDialog"
width="500" width="500"
data-l10n-id="site-data-removing-dialog" data-l10n-id="site-data-removing-dialog"
@ -15,12 +18,6 @@
data-l10n-attrs="buttonlabelaccept"> data-l10n-attrs="buttonlabelaccept">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/siteDataSettings.css"
/>
<html:link rel="localization" href="browser/preferences/siteDataSettings.ftl"/> <html:link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
</linkset> </linkset>

14
browser/components/preferences/dialogs/siteDataSettings.xhtml
View file

@ -4,6 +4,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/siteDataSettings.css" type="text/css"?>
<window <window
id="SiteDataSettingsDialog" id="SiteDataSettingsDialog"
data-l10n-id="site-data-settings-window" data-l10n-id="site-data-settings-window"
@ -21,16 +25,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/siteDataSettings.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link <html:link
rel="localization" rel="localization"

14
browser/components/preferences/dialogs/sitePermissions.xhtml
View file

@ -4,6 +4,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/sitePermissions.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
<window <window
id="SitePermissionsDialog" id="SitePermissionsDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -20,16 +24,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/content/preferences/dialogs/sitePermissions.css"
/>
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link <html:link
rel="localization" rel="localization"
href="browser/preferences/preferences.ftl" href="browser/preferences/preferences.ftl"

4
browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
View file

@ -5,6 +5,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<window <window
type="child" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -20,8 +22,6 @@
data-l10n-attrs="buttonlabelaccept, buttonlabelextra2" data-l10n-attrs="buttonlabelaccept, buttonlabelextra2"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link <html:link
rel="localization" rel="localization"
href="browser/preferences/preferences.ftl" href="browser/preferences/preferences.ftl"

9
browser/components/preferences/dialogs/translationExceptions.xhtml
View file

@ -6,6 +6,9 @@
<!-- TODO (Bug 1817084) Remove this file when we disable the extension --> <!-- TODO (Bug 1817084) Remove this file when we disable the extension -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
<window <window
id="TranslationDialog" id="TranslationDialog"
data-l10n-id="translation-window2" data-l10n-id="translation-window2"
@ -22,12 +25,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link <html:link
rel="localization" rel="localization"
href="browser/preferences/translation.ftl" href="browser/preferences/translation.ftl"

9
browser/components/preferences/dialogs/translations.xhtml
View file

@ -4,6 +4,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
<window <window
id="TranslationsDialog" id="TranslationsDialog"
data-l10n-id="translations-settings-title" data-l10n-id="translations-settings-title"
@ -20,12 +23,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<html:link rel="localization" href="browser/translations.ftl" /> <html:link rel="localization" href="browser/translations.ftl" />
</linkset> </linkset>

9
browser/components/preferences/fxaPairDevice.xhtml
View file

@ -5,6 +5,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/fxaPairDevice.css" type="text/css"?>
<window <window
id="fxaPairDeviceDialog" id="fxaPairDeviceDialog"
type="child" type="child"
@ -17,12 +20,6 @@
> >
<dialog id="fxaPairDeviceDialog1" buttons="accept"> <dialog id="fxaPairDeviceDialog1" buttons="accept">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/preferences/fxaPairDevice.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link <html:link
rel="localization" rel="localization"

32
browser/components/preferences/preferences.xhtml
View file

@ -3,6 +3,16 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this file, - License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. --> - You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/handlers.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/applications.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/search.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/containers.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/privacy.css"?>
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" <html xmlns="http://www.w3.org/1999/xhtml"
@ -17,28 +27,6 @@
<title data-l10n-id="settings-page-title"></title> <title data-l10n-id="settings-page-title"></title>
<meta name="color-scheme" content="light dark" /> <meta name="color-scheme" content="light dark" />
<link rel="stylesheet" href="chrome://global/skin/global.css" />
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css" />
<link
rel="stylesheet"
href="chrome://browser/skin/preferences/preferences.css"
/>
<link
rel="stylesheet"
href="chrome://browser/content/preferences/dialogs/handlers.css"
/>
<link
rel="stylesheet"
href="chrome://browser/skin/preferences/applications.css"
/>
<link rel="stylesheet" href="chrome://browser/skin/preferences/search.css" />
<link
rel="stylesheet"
href="chrome://browser/skin/preferences/containers.css"
/>
<link rel="stylesheet" href="chrome://browser/skin/preferences/privacy.css" />
<link rel="localization" href="branding/brand.ftl"/> <link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="browser/browser.ftl"/> <link rel="localization" href="browser/browser.ftl"/>
<!-- Used by fontbuilder.js --> <!-- Used by fontbuilder.js -->

9
browser/components/shell/content/setDesktopBackground.xhtml
View file

@ -4,6 +4,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://browser/skin/setDesktopBackground.css" type="text/css"?>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
windowtype="Shell:SetDesktopBackground" windowtype="Shell:SetDesktopBackground"
@ -12,12 +15,6 @@
style="min-width: 30em;"> style="min-width: 30em;">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://browser/skin/setDesktopBackground.css"
/>
<html:link rel="localization" href="browser/setDesktopBackground.ftl"/> <html:link rel="localization" href="browser/setDesktopBackground.ftl"/>
</linkset> </linkset>

27
devtools/client/framework/test/browser_toolbox_window_reload_target.js
View file

@ -89,8 +89,6 @@ async function testOneTool(toolbox, toolID) {
info(`Select tool ${toolID}`); info(`Select tool ${toolID}`);
await toolbox.selectTool(toolID); await toolbox.selectTool(toolID);
assertThemeStyleSheet(toolbox, toolID);
await testReload("toolbox.reload.key", toolbox); await testReload("toolbox.reload.key", toolbox);
await testReload("toolbox.reload2.key", toolbox); await testReload("toolbox.reload2.key", toolbox);
await testReload("toolbox.forceReload.key", toolbox); await testReload("toolbox.forceReload.key", toolbox);
@ -103,28 +101,3 @@ async function testReload(shortcut, toolbox) {
await sendToolboxReloadShortcut(L10N.getStr(shortcut), toolbox); await sendToolboxReloadShortcut(L10N.getStr(shortcut), toolbox);
reloadsSent++; reloadsSent++;
} }
/**
* As opening all panels is an expensive operation, reuse this test in order
* to add a few assertions around panel's stylesheets.
* Ensure the proper ordering of the theme stylesheet. `global.css` should come
* first if it exists, then the theme.
*/
function assertThemeStyleSheet(toolbox, toolID) {
const iframe = toolbox.doc.getElementById("toolbox-panel-iframe-" + toolID);
const styleSheets = iframe.contentDocument.querySelectorAll(
`link[rel="stylesheet"]`
);
ok(
!!styleSheets.length,
`The panel ${toolID} should have at least have one stylesheet`
);
// In the web console, we have a special case where global.css is registered very first
if (styleSheets[0].href === "chrome://global/skin/global.css") {
is(styleSheets[1].href, "chrome://devtools/skin/light-theme.css");
} else {
// Otherwise, in all other panels, the theme file is registered very first
is(styleSheets[0].href, "chrome://devtools/skin/light-theme.css");
}
}

5
devtools/client/framework/toolbox-window.xhtml
View file

@ -3,10 +3,11 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!-- minwidth=50 is sum width of chevron and meatball menu button. --> <!-- minwidth=50 is sum width of chevron and meatball menu button. -->
<window <window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
id="devtools-toolbox-window" id="devtools-toolbox-window"
macanimationtype="document" macanimationtype="document"
windowtype="devtools:toolbox" windowtype="devtools:toolbox"
@ -14,8 +15,6 @@
height="320" height="320"
persist="screenX screenY width height sizemode" persist="screenX screenY width height sizemode"
> >
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<tooltip id="aHTMLTooltip" page="true" /> <tooltip id="aHTMLTooltip" page="true" />
<script src="resource://devtools/client/framework/toolbox-window.js" /> <script src="resource://devtools/client/framework/toolbox-window.js" />
</window> </window>

20
devtools/client/framework/toolbox.xhtml
View file

@ -2,6 +2,11 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public <!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/skin/toolbox.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/content/shared/components/NotificationBox.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/content/framework/components/DebugTargetErrorPage.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/content/framework/components/ChromeDebugToolbar.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -11,21 +16,6 @@
role="application" role="application"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="stylesheet" href="chrome://devtools/skin/toolbox.css" />
<html:link
rel="stylesheet"
href="chrome://devtools/content/shared/components/NotificationBox.css"
/>
<html:link
rel="stylesheet"
href="chrome://devtools/content/framework/components/DebugTargetErrorPage.css"
/>
<html:link
rel="stylesheet"
href="chrome://devtools/content/framework/components/ChromeDebugToolbar.css"
/>
<html:link rel="localization" href="devtools/client/tooltips.ftl" /> <html:link rel="localization" href="devtools/client/tooltips.ftl" />
</linkset> </linkset>

62
devtools/client/shared/stylesheet-utils.js
View file

@ -25,45 +25,35 @@ function stylesheetLoadPromise(styleSheet, url) {
* or fails to load. * or fails to load.
*/ */
function appendStyleSheet(doc, url) { function appendStyleSheet(doc, url) {
const styleSheet = doc.createElementNS(
"http://www.w3.org/1999/xhtml",
"link"
);
styleSheet.setAttribute("rel", "stylesheet");
styleSheet.setAttribute("href", url);
const loadPromise = stylesheetLoadPromise(styleSheet);
// In order to make overriding styles sane, we want the order of loaded
// sheets to be something like this:
// global.css
// *-theme.css (the file loaded here)
// document-specific-sheet.css
// See Bug 1582786 / https://phabricator.services.mozilla.com/D46530#inline-284756.
// If there is a global sheet then insert after it.
const globalSheet = doc.querySelector(
"link[href='chrome://global/skin/global.css']"
);
if (globalSheet) {
globalSheet.after(styleSheet);
return { styleSheet, loadPromise };
}
// Otherwise insert before any existing link.
const links = doc.querySelectorAll("link");
if (links.length) {
links[0].before(styleSheet);
return { styleSheet, loadPromise };
}
// Fall back to putting at the start of the head or in a non-HTML doc the
// start of the document.
if (doc.head) { if (doc.head) {
doc.head.prepend(styleSheet); const styleSheet = doc.createElement("link");
} else { styleSheet.setAttribute("rel", "stylesheet");
doc.documentElement.prepend(styleSheet); styleSheet.setAttribute("href", url);
const loadPromise = stylesheetLoadPromise(styleSheet);
// In order to make overriding styles sane, we want the order of loaded
// sheets to be something like this:
// global.css
// *-theme.css (the file loaded here)
// document-specific-sheet.css
// See Bug 1582786 / https://phabricator.services.mozilla.com/D46530#inline-284756.
const globalSheet = doc.head.querySelector(
"link[href='chrome://global/skin/global.css']"
);
if (globalSheet) {
globalSheet.after(styleSheet);
} else {
doc.head.prepend(styleSheet);
}
return { styleSheet, loadPromise };
} }
const styleSheet = doc.createProcessingInstruction(
"xml-stylesheet",
`href="${url}" type="text/css"`
);
const loadPromise = stylesheetLoadPromise(styleSheet);
doc.insertBefore(styleSheet, doc.documentElement);
return { styleSheet, loadPromise }; return { styleSheet, loadPromise };
} }

21
devtools/client/storage/index.xhtml
View file

@ -2,6 +2,11 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public <!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/skin/storage.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/content/shared/components/SidebarToggle.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
@ -9,23 +14,11 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
> >
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://devtools/content/shared/widgets/widgets.css"
/>
<html:link rel="stylesheet" href="chrome://devtools/skin/widgets.css" />
<html:link rel="stylesheet" href="chrome://devtools/skin/storage.css" />
<html:link
rel="stylesheet"
href="chrome://devtools/content/shared/components/SidebarToggle.css"
/>
<html:link rel="localization" href="devtools/client/storage.ftl" />
<script src="chrome://devtools/content/shared/theme-switching.js" /> <script src="chrome://devtools/content/shared/theme-switching.js" />
<script src="chrome://global/content/globalOverlay.js" /> <script src="chrome://global/content/globalOverlay.js" />
<html:link rel="localization" href="devtools/client/storage.ftl" />
<popupset id="storagePopupSet"> <popupset id="storagePopupSet">
<menupopup id="storage-tree-popup"> <menupopup id="storage-tree-popup">
<menuitem <menuitem

22
devtools/client/styleeditor/index.xhtml
View file

@ -4,26 +4,20 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE window> <!DOCTYPE window>
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/content/shared/toolbarbutton.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/skin/chart.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/skin/splitview.css" type="text/css"?>
<?xml-stylesheet href="chrome://devtools/skin/styleeditor.css" type="text/css"?>
<window <window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
id="style-editor-chrome-window" id="style-editor-chrome-window"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://devtools/content/shared/widgets/widgets.css"
/>
<html:link
rel="stylesheet"
href="chrome://devtools/content/shared/toolbarbutton.css"
/>
<html:link rel="stylesheet" href="chrome://devtools/skin/chart.css" />
<html:link rel="stylesheet" href="chrome://devtools/skin/widgets.css" />
<html:link rel="stylesheet" href="chrome://devtools/skin/splitview.css" />
<html:link rel="stylesheet" href="chrome://devtools/skin/styleeditor.css" />
<html:link rel="localization" href="toolkit/global/textActions.ftl" /> <html:link rel="localization" href="toolkit/global/textActions.ftl" />
<html:link rel="localization" href="devtools/client/styleeditor.ftl" /> <html:link rel="localization" href="devtools/client/styleeditor.ftl" />
</linkset> </linkset>

4
layout/tools/layout-debug/ui/content/layoutdebug.xhtml
View file

@ -8,6 +8,8 @@
<!DOCTYPE window> <!DOCTYPE window>
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css" ?>
<!-- <!--
NOTE: Because this window is used for layout regression tests, the NOTE: Because this window is used for layout regression tests, the
@ -33,8 +35,6 @@
screenY="4" screenY="4"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="localization" href="layoutdebug/layoutdebug.ftl" /> <html:link rel="localization" href="layoutdebug/layoutdebug.ftl" />
</linkset> </linkset>

29
remote/marionette/chrome/test.xhtml
View file

@ -3,21 +3,36 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE window [ ]> <!DOCTYPE window [ ]>
<window <window
id="winTest" id="winTest"
title="Title Test" title="Title Test"
windowtype="Test Type" windowtype="Test Type"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
> >
<html:link rel="stylesheet" href="chrome://global/skin/global.css" /> <dialog
id="dia"
<dialog id="dia"> xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
>
<vbox id="things"> <vbox id="things">
<html:input id="textInput" size="6" value="test" label="input" /> <input
<html:input id="textInput2" size="6" value="test" label="input" /> xmlns="http://www.w3.org/1999/xhtml"
<html:input id="textInput"
size="6"
value="test"
label="input"
/>
<input
xmlns="http://www.w3.org/1999/xhtml"
id="textInput2"
size="6"
value="test"
label="input"
/>
<input
xmlns="http://www.w3.org/1999/xhtml"
id="textInput3" id="textInput3"
class="asdf" class="asdf"
size="6" size="6"

11
remote/marionette/chrome/test_dialog.xhtml
View file

@ -6,13 +6,12 @@
<!DOCTYPE testdialog [ <!ENTITY % dialogDTD SYSTEM "chrome://remote/content/marionette/test_dialog.dtd"> <!DOCTYPE testdialog [ <!ENTITY % dialogDTD SYSTEM "chrome://remote/content/marionette/test_dialog.dtd">
%dialogDTD; ]> %dialogDTD; ]>
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<window <window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
title="&testDialog.title;" title="&testDialog.title;"
> >
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<dialog id="testDialog" buttons="accept,cancel"> <dialog id="testDialog" buttons="accept,cancel">
<vbox flex="1" style="min-width: 300px; min-height: 500px"> <vbox flex="1" style="min-width: 300px; min-height: 500px">
<label>&settings.label;</label> <label>&settings.label;</label>
@ -27,7 +26,11 @@
<checkbox id="check-box" label="Test Mode 2" /> <checkbox id="check-box" label="Test Mode 2" />
<hbox align="center"> <hbox align="center">
<label id="text-box-label" control="text-box">Name:</label> <label id="text-box-label" control="text-box">Name:</label>
<html:input id="text-box" style="-moz-box-flex: 1" /> <input
xmlns="http://www.w3.org/1999/xhtml"
id="text-box"
style="-moz-box-flex: 1"
/>
</hbox> </hbox>
</vbox> </vbox>
</dialog> </dialog>

5
remote/marionette/chrome/test_menupopup.xhtml
View file

@ -3,14 +3,13 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE window [ ]> <!DOCTYPE window [ ]>
<window <window
id="test-window" id="test-window"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
> >
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<popupset id="options-popupset"> <popupset id="options-popupset">
<menupopup id="options-menupopup" position="before_end"> <menupopup id="options-menupopup" position="before_end">
<menuitem id="option-enabled" type="checkbox" label="enabled" /> <menuitem id="option-enabled" type="checkbox" label="enabled" />

4
remote/marionette/chrome/test_no_xul.xhtml
View file

@ -5,14 +5,14 @@
<!-- Test file for a non XUL window by using a XHTML document instead. --> <!-- Test file for a non XUL window by using a XHTML document instead. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<html <html
id="winTest" id="winTest"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns="http://www.w3.org/1999/xhtml" xmlns="http://www.w3.org/1999/xhtml"
> >
<link rel="stylesheet" href="chrome://global/skin/global.css" />
<head> <head>
<title>Title Test</title> <title>Title Test</title>
</head> </head>

9
security/manager/pki/resources/content/certManager.xhtml
View file

@ -3,6 +3,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://pippki/content/certManager.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -15,12 +18,6 @@
> >
<dialog id="certmanager" buttons="accept"> <dialog id="certmanager" buttons="accept">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://pippki/content/certManager.css"
/>
<html:link <html:link
rel="localization" rel="localization"
href="security/certificates/certManager.ftl" href="security/certificates/certManager.ftl"

4
security/manager/pki/resources/content/changepassword.xhtml
View file

@ -3,6 +3,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -13,8 +15,6 @@
> >
<dialog id="set_password" buttons="accept,cancel"> <dialog id="set_password" buttons="accept,cancel">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="localization" href="security/pippki/pippki.ftl" /> <html:link rel="localization" href="security/pippki/pippki.ftl" />
</linkset> </linkset>

9
security/manager/pki/resources/content/clientauthask.xhtml
View file

@ -3,6 +3,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://pippki/content/clientauthask.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -17,12 +20,6 @@
buttonidcancel="client-auth-send-no-certificate" buttonidcancel="client-auth-send-no-certificate"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://pippki/content/clientauthask.css"
/>
<html:link rel="localization" href="security/pippki/pippki.ftl" /> <html:link rel="localization" href="security/pippki/pippki.ftl" />
</linkset> </linkset>

9
security/manager/pki/resources/content/deletecert.xhtml
View file

@ -3,6 +3,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://pippki/content/deletecert.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -14,12 +17,6 @@
> >
<dialog id="deleteCertificate" buttons="accept,cancel"> <dialog id="deleteCertificate" buttons="accept,cancel">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://pippki/content/deletecert.css"
/>
<html:link <html:link
rel="localization" rel="localization"
href="security/certificates/certManager.ftl" href="security/certificates/certManager.ftl"

4
security/manager/pki/resources/content/device_manager.xhtml
View file

@ -3,6 +3,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE dialog> <!DOCTYPE dialog>
<window <window
@ -16,8 +18,6 @@
> >
<dialog id="devicemanager" buttons="accept"> <dialog id="devicemanager" buttons="accept">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link <html:link
rel="localization" rel="localization"
href="security/certificates/deviceManager.ftl" href="security/certificates/deviceManager.ftl"

4
security/manager/pki/resources/content/downloadcert.xhtml
View file

@ -3,6 +3,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -14,8 +16,6 @@
> >
<dialog id="download_cert" buttons="accept,cancel"> <dialog id="download_cert" buttons="accept,cancel">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="localization" href="security/pippki/pippki.ftl" /> <html:link rel="localization" href="security/pippki/pippki.ftl" />
</linkset> </linkset>

4
security/manager/pki/resources/content/editcacert.xhtml
View file

@ -3,6 +3,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -13,8 +15,6 @@
> >
<dialog id="editCaCert" buttons="accept,cancel"> <dialog id="editCaCert" buttons="accept,cancel">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link <html:link
rel="localization" rel="localization"
href="security/certificates/certManager.ftl" href="security/certificates/certManager.ftl"

9
security/manager/pki/resources/content/exceptionDialog.xhtml
View file

@ -3,6 +3,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://pippki/content/exceptionDialog.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window windowtype="mozilla:exceptiondialog" <window windowtype="mozilla:exceptiondialog"
@ -16,12 +19,6 @@
defaultButton="extra2"> defaultButton="extra2">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://pippki/content/exceptionDialog.css"
/>
<html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="security/certificates/certManager.ftl"/> <html:link rel="localization" href="security/certificates/certManager.ftl"/>
</linkset> </linkset>

4
security/manager/pki/resources/content/load_device.xhtml
View file

@ -3,6 +3,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -12,8 +14,6 @@
> >
<dialog id="loaddevice" buttons="accept,cancel"> <dialog id="loaddevice" buttons="accept,cancel">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link <html:link
rel="localization" rel="localization"
href="security/certificates/deviceManager.ftl" href="security/certificates/deviceManager.ftl"

4
security/manager/pki/resources/content/resetpassword.xhtml
View file

@ -3,6 +3,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -18,8 +20,6 @@
defaultButton="cancel" defaultButton="cancel"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="localization" href="security/pippki/pippki.ftl" /> <html:link rel="localization" href="security/pippki/pippki.ftl" />
</linkset> </linkset>

4
security/manager/pki/resources/content/setp12password.xhtml
View file

@ -3,6 +3,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -14,8 +16,6 @@
> >
<dialog id="setp12password" buttons="accept,cancel"> <dialog id="setp12password" buttons="accept,cancel">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="localization" href="security/pippki/pippki.ftl" /> <html:link rel="localization" href="security/pippki/pippki.ftl" />
</linkset> </linkset>

9
toolkit/components/alerts/alert.xhtml
View file

@ -5,6 +5,9 @@
<!DOCTYPE window> <!DOCTYPE window>
<?xml-stylesheet href="chrome://global/content/alerts/alert.css" type="text/css"?>
<?xml-stylesheet href="chrome://global/skin/alert.css" type="text/css"?>
<window <window
id="alertNotification" id="alertNotification"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -17,12 +20,6 @@
onbeforeunload="onAlertBeforeUnload();" onbeforeunload="onAlertBeforeUnload();"
> >
<linkset> <linkset>
<xhtml:link
rel="stylesheet"
href="chrome://global/content/alerts/alert.css"
/>
<xhtml:link rel="stylesheet" href="chrome://global/skin/alert.css" />
<xhtml:link rel="localization" href="toolkit/global/alert.ftl" /> <xhtml:link rel="localization" href="toolkit/global/alert.ftl" />
</linkset> </linkset>

6
toolkit/components/apppicker/content/appPicker.xhtml
View file

@ -4,6 +4,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://global/skin/appPicker.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -21,9 +24,6 @@
defaultButton="accept" defaultButton="accept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="stylesheet" href="chrome://global/skin/appPicker.css" />
<html:link rel="localization" href="toolkit/global/appPicker.ftl" /> <html:link rel="localization" href="toolkit/global/appPicker.ftl" />
</linkset> </linkset>
<script src="chrome://global/content/appPicker.js" /> <script src="chrome://global/content/appPicker.js" />

14
toolkit/components/printing/content/printPageSetup.xhtml
View file

@ -5,6 +5,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
<?xml-stylesheet href="chrome://global/skin/printPageSetup.css" type="text/css"?>
<window <window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
@ -18,16 +22,6 @@
> >
<dialog id="printPageSetupDialog"> <dialog id="printPageSetupDialog">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://global/skin/in-content/common.css"
/>
<html:link
rel="stylesheet"
href="chrome://global/skin/printPageSetup.css"
/>
<html:link rel="localization" href="toolkit/printing/printDialogs.ftl" /> <html:link rel="localization" href="toolkit/printing/printDialogs.ftl" />
</linkset> </linkset>

14
toolkit/components/prompts/content/commonDialog.xhtml
View file

@ -3,6 +3,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://global/content/commonDialog.css" type="text/css"?>
<?xml-stylesheet href="chrome://global/skin/commonDialog.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -16,16 +20,6 @@
> >
<dialog id="commonDialog" buttonpack="end"> <dialog id="commonDialog" buttonpack="end">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://global/content/commonDialog.css"
/>
<html:link
rel="stylesheet"
href="chrome://global/skin/commonDialog.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link rel="localization" href="toolkit/global/commonDialog.ftl" /> <html:link rel="localization" href="toolkit/global/commonDialog.ftl" />
</linkset> </linkset>

8
toolkit/components/prompts/content/selectDialog.xhtml
View file

@ -4,14 +4,10 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml"
>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<dialog> <dialog>
<script src="chrome://global/content/selectDialog.js" /> <script src="chrome://global/content/selectDialog.js" />
<keyset id="dialogKeys" /> <keyset id="dialogKeys" />

19
toolkit/content/resetProfile.xhtml
View file

@ -4,6 +4,11 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://global/content/commonDialog.css"?>
<?xml-stylesheet href="chrome://global/skin/commonDialog.css"?>
<?xml-stylesheet href="chrome://global/content/resetProfile.css"?>
<window <window
id="resetProfileDialogWindow" id="resetProfileDialogWindow"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -20,20 +25,6 @@
<!-- The empty onload event handler is a hack to get the accept button text applied by Fluent. --> <!-- The empty onload event handler is a hack to get the accept button text applied by Fluent. -->
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://global/content/commonDialog.css"
/>
<html:link
rel="stylesheet"
href="chrome://global/skin/commonDialog.css"
/>
<html:link
rel="stylesheet"
href="chrome://global/content/resetProfile.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link rel="localization" href="toolkit/global/resetProfile.ftl" /> <html:link rel="localization" href="toolkit/global/resetProfile.ftl" />
</linkset> </linkset>

9
toolkit/content/resetProfileProgress.xhtml
View file

@ -6,6 +6,9 @@
<!DOCTYPE window> <!DOCTYPE window>
<?xml-stylesheet href="chrome://global/content/resetProfile.css"?>
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<window <window
id="resetProfileProgressDialog" id="resetProfileProgressDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -15,12 +18,6 @@
> >
<vbox> <vbox>
<linkset> <linkset>
<html:link
rel="stylesheet"
href="chrome://global/content/resetProfile.css"
/>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link rel="localization" href="toolkit/global/resetProfile.ftl" /> <html:link rel="localization" href="toolkit/global/resetProfile.ftl" />
</linkset> </linkset>

9
toolkit/mozapps/downloads/content/unknownContentType.xhtml
View file

@ -4,6 +4,9 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://mozapps/skin/downloads/unknownContentType.css" type="text/css"?>
<window id="unknownContentTypeWindow" <window id="unknownContentTypeWindow"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
@ -17,12 +20,6 @@
persist="screenX screenY" persist="screenX screenY"
aria-describedby="intro location whichIs type from source unknownPrompt"> aria-describedby="intro location whichIs type from source unknownPrompt">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://mozapps/skin/downloads/unknownContentType.css"
/>
<html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="toolkit/global/unknownContentType.ftl"/> <html:link rel="localization" href="toolkit/global/unknownContentType.ftl"/>
</linkset> </linkset>

13
toolkit/mozapps/handling/content/appChooser.xhtml
View file

@ -1,4 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://mozapps/content/handling/handler.css"?>
<?xml-stylesheet href="chrome://mozapps/skin/handling/handling.css"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public <!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
@ -21,16 +24,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://mozapps/content/handling/handler.css"
/>
<html:link
rel="stylesheet"
href="chrome://mozapps/skin/handling/handling.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link rel="localization" href="toolkit/global/handlerDialog.ftl" /> <html:link rel="localization" href="toolkit/global/handlerDialog.ftl" />
</linkset> </linkset>

8
toolkit/mozapps/handling/content/permissionDialog.xhtml
View file

@ -1,4 +1,6 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://mozapps/content/handling/handler.css"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public <!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
@ -16,12 +18,6 @@
data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept" data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://mozapps/content/handling/handler.css"
/>
<html:link rel="localization" href="toolkit/global/handlerDialog.ftl" /> <html:link rel="localization" href="toolkit/global/handlerDialog.ftl" />
</linkset> </linkset>

4
toolkit/mozapps/preferences/changemp.xhtml
View file

@ -4,6 +4,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<window <window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
@ -15,8 +17,6 @@
<script src="chrome://mozapps/content/preferences/changemp.js" /> <script src="chrome://mozapps/content/preferences/changemp.js" />
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link <html:link
rel="localization" rel="localization"

4
toolkit/mozapps/preferences/removemp.xhtml
View file

@ -3,6 +3,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<window <window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3.org/1999/xhtml" xmlns:html="http://www.w3.org/1999/xhtml"
@ -14,8 +16,6 @@
<script src="chrome://mozapps/content/preferences/removemp.js" /> <script src="chrome://mozapps/content/preferences/removemp.js" />
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link <html:link
rel="localization" rel="localization"

9
toolkit/mozapps/update/content/history.xhtml
View file

@ -6,6 +6,9 @@
<!DOCTYPE window> <!DOCTYPE window>
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://mozapps/skin/update/updates.css"?>
<window <window
windowtype="Update:History" windowtype="Update:History"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -23,12 +26,6 @@
data-l10n-attrs="buttonlabelcancel" data-l10n-attrs="buttonlabelcancel"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://mozapps/skin/update/updates.css"
/>
<html:link rel="localization" href="toolkit/updates/history.ftl" /> <html:link rel="localization" href="toolkit/updates/history.ftl" />
</linkset> </linkset>

6
toolkit/mozapps/update/content/updateElevation.xhtml
View file

@ -6,6 +6,9 @@
<!-- This is temporary until bug 1521632 is fixed --> <!-- This is temporary until bug 1521632 is fixed -->
<?xml-stylesheet href="chrome://global/skin/global.css"?>
<?xml-stylesheet href="chrome://mozapps/skin/update/updates.css"?>
<window windowtype="Update:Elevation" <window windowtype="Update:Elevation"
type="child" type="child"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -23,9 +26,6 @@
<script src="chrome://mozapps/content/update/updateElevation.js"/> <script src="chrome://mozapps/content/update/updateElevation.js"/>
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="stylesheet" href="chrome://mozapps/skin/update/updates.css" />
<html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="toolkit/updates/elevation.ftl"/> <html:link rel="localization" href="toolkit/updates/elevation.ftl"/>
</linkset> </linkset>

4
toolkit/profile/content/createProfileWizard.xhtml
View file

@ -3,6 +3,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<!DOCTYPE wizard> <!DOCTYPE wizard>
<window <window
@ -15,8 +17,6 @@
data-l10n-attrs="style" data-l10n-attrs="style"
> >
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link <html:link
rel="localization" rel="localization"

9
toolkit/profile/content/profileDowngrade.xhtml
View file

@ -3,6 +3,9 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
<?xml-stylesheet href="chrome://mozapps/skin/profileDowngrade.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -12,12 +15,6 @@
data-l10n-attrs="title,style" data-l10n-attrs="title,style"
onload="init()"> onload="init()">
<linkset> <linkset>
<html:link rel="stylesheet" href="chrome://global/skin/global.css" />
<html:link
rel="stylesheet"
href="chrome://mozapps/skin/profileDowngrade.css"
/>
<html:link rel="localization" href="branding/brand.ftl"/> <html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="toolkit/global/profileDowngrade.ftl"/> <html:link rel="localization" href="toolkit/global/profileDowngrade.ftl"/>
</linkset> </linkset>

7
toolkit/profile/content/profileSelection.xhtml
View file

@ -6,6 +6,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this - License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://mozapps/skin/profileSelection.css" type="text/css"?>
<!DOCTYPE window> <!DOCTYPE window>
<window <window
@ -25,11 +27,6 @@
buttonidcancel="profile-selection-button-cancel" buttonidcancel="profile-selection-button-cancel"
> >
<linkset> <linkset>
<html:link
rel="stylesheet"
href="chrome://mozapps/skin/profileSelection.css"
/>
<html:link rel="localization" href="branding/brand.ftl" /> <html:link rel="localization" href="branding/brand.ftl" />
<html:link <html:link
rel="localization" rel="localization"