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

Bug 1588142 - about:preferences - migrate the root xul:window element to an html:html element r=Gijs,bgrins

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D51712

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Kirk Steuber 2019-11-14 00:17:01 +00:00
parent 785a88d297
commit 2ad7a54783
6 changed files with 54 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
browser/components/preferences/in-content/preferences.xul
View File

@ -16,45 +16,44 @@
<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/containers.css"?>
<?xml-stylesheet href="chrome://browser/skin/preferences/in-content/privacy.css"?>
<!DOCTYPE window>
<!DOCTYPE html>
<!-- @CSP: The 'oncommand' handler for 'focusSearch1' can not easily be rewritten (see Bug 371900)
hence we are allowing the inline handler in the script-src directive using the hash
sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ==
Additionally we should remove 'unsafe-inline' from style-src, see Bug 1579160 -->
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:html="http://www.w3.org/1999/xhtml"
csp="default-src chrome:; script-src chrome: 'sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ=='; img-src chrome: moz-icon: https: data:; style-src chrome: data: 'unsafe-inline'; object-src 'none'"
role="document"
data-l10n-id="pref-page"
data-l10n-attrs="title">
<linkset>
<html:link rel="localization" href="branding/brand.ftl"/>
<html:link rel="localization" href="browser/branding/brandings.ftl"/>
<html:link rel="localization" href="browser/branding/sync-brand.ftl"/>
<html:link rel="localization" href="browser/preferences/preferences.ftl"/>
<!-- Used by fontbuilder.js -->
<html:link rel="localization" href="browser/preferences/fonts.ftl"/>
<head>
<!-- @CSP: The 'oncommand' handler for 'focusSearch1' can not easily be rewritten (see Bug 371900)
hence we are allowing the inline handler in the script-src directive using the hash
sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ==
Additionally we should remove 'unsafe-inline' from style-src, see Bug 1579160 -->
<meta http-equiv="Content-Security-Policy" content="default-src chrome:; script-src chrome: 'sha512-X8+p/CqXeMdssOoFOf5RV+RpkvnN9pukQ20acGc7LqMgfYLW+lR0WAYT66OtSTpFHE/Qgx/ZCBs2RMc4QrA8FQ=='; img-src chrome: moz-icon: https: data:; style-src chrome: data: 'unsafe-inline'; object-src 'none'" />
<!-- Links below are only used for search-l10n-ids into subdialogs -->
<html:link rel="localization" href="browser/preferences/blocklists.ftl"/>
<html:link rel="localization" href="browser/preferences/clearSiteData.ftl"/>
<html:link rel="localization" href="browser/preferences/colors.ftl"/>
<html:link rel="localization" href="browser/preferences/connection.ftl"/>
<html:link rel="localization" href="browser/preferences/languages.ftl"/>
<html:link rel="localization" href="browser/preferences/permissions.ftl"/>
<html:link rel="localization" href="browser/preferences/selectBookmark.ftl"/>
<html:link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
<html:link rel="localization" href="browser/aboutDialog.ftl"/>
<html:link rel="localization" href="browser/sanitize.ftl"/>
<html:link rel="localization" href="toolkit/updates/history.ftl"/>
<html:link rel="localization" href="security/certificates/deviceManager.ftl"/>
<html:link rel="localization" href="security/certificates/certManager.ftl"/>
</linkset>
<link rel="localization" href="branding/brand.ftl"/>
<link rel="localization" href="browser/branding/brandings.ftl"/>
<link rel="localization" href="browser/branding/sync-brand.ftl"/>
<link rel="localization" href="browser/preferences/preferences.ftl"/>
<!-- Used by fontbuilder.js -->
<link rel="localization" href="browser/preferences/fonts.ftl"/>
<html:link rel="shortcut icon"
href="chrome://browser/skin/settings.svg"/>
<!-- Links below are only used for search-l10n-ids into subdialogs -->
<link rel="localization" href="browser/preferences/blocklists.ftl"/>
<link rel="localization" href="browser/preferences/clearSiteData.ftl"/>
<link rel="localization" href="browser/preferences/colors.ftl"/>
<link rel="localization" href="browser/preferences/connection.ftl"/>
<link rel="localization" href="browser/preferences/languages.ftl"/>
<link rel="localization" href="browser/preferences/permissions.ftl"/>
<link rel="localization" href="browser/preferences/selectBookmark.ftl"/>
<link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
<link rel="localization" href="browser/aboutDialog.ftl"/>
<link rel="localization" href="browser/sanitize.ftl"/>
<link rel="localization" href="toolkit/updates/history.ftl"/>
<link rel="localization" href="security/certificates/deviceManager.ftl"/>
<link rel="localization" href="security/certificates/certManager.ftl"/>
<link rel="shortcut icon" href="chrome://browser/skin/settings.svg"/>
<script src="chrome://browser/content/utilityOverlay.js"/>
<script src="chrome://global/content/preferencesBindings.js"/>
@ -62,6 +61,9 @@
<script src="chrome://browser/content/preferences/in-content/extensionControlled.js"/>
<script src="chrome://browser/content/preferences/in-content/findInPage.js"/>
<script src="chrome://browser/content/preferences/in-content/subdialogs.js"/>
</head>
<html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<stringbundle id="pkiBundle"
src="chrome://pippki/locale/pippki.properties"/>
@ -217,4 +219,5 @@
</vbox>
</vbox>
</stack>
</window>
</html:body>
</html>

2
browser/themes/linux/preferences/in-content/preferences.css
View File

@ -4,7 +4,7 @@
%include ../../../shared/incontentprefs/preferences.inc.css
:root > * {
body {
font-size: 1.11em;
}

2
browser/themes/osx/preferences/in-content/preferences.css
View File

@ -4,7 +4,7 @@
%include ../../../shared/incontentprefs/preferences.inc.css
:root > * {
body {
font-size: 1.36em;
}

2
browser/themes/osx/preferences/preferences.css
View File

@ -7,7 +7,7 @@
%include ../../../../toolkit/themes/osx/global/shared.inc
window {
:root {
font: -moz-dialog;
}

15
browser/themes/shared/incontentprefs/preferences.inc.css
View File

@ -7,6 +7,7 @@
:root {
--in-content-warning-container: var(--grey-20);
text-rendering: optimizeLegibility;
}
@supports -moz-bool-pref("browser.in-content.dark-mode") {
@ -17,6 +18,20 @@
}
}
:root,
body {
margin: 0;
padding: 0;
height: 100%;
width: 100%;
overflow: hidden;
}
body {
display: -moz-box;
-moz-box-orient: vertical;
}
* {
-moz-user-select: text;
}

2
browser/themes/windows/preferences/in-content/preferences.css
View File

@ -4,7 +4,7 @@
%include ../../../shared/incontentprefs/preferences.inc.css
:root > * {
body {
font-size: 1.25em;
}