summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/content/aboutRights.xhtml3
-rw-r--r--toolkit/content/aboutTelemetry.js4
-rw-r--r--toolkit/content/jar.mn4
-rw-r--r--toolkit/locales/en-US/chrome/global/aboutRights.dtd2
-rw-r--r--toolkit/locales/en-US/chrome/global/preferences.dtd2
-rw-r--r--toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd2
-rw-r--r--toolkit/profile/content/createProfileWizard.js14
-rw-r--r--toolkit/themes/linux/global/global.css6
-rw-r--r--toolkit/themes/linux/global/jar.mn2
-rw-r--r--toolkit/themes/windows/global/global.css15
-rw-r--r--toolkit/themes/windows/global/icons/close-inverted.svg19
-rw-r--r--toolkit/themes/windows/global/icons/close.svg19
-rw-r--r--toolkit/themes/windows/global/jar.mn2
13 files changed, 81 insertions, 13 deletions
diff --git a/toolkit/content/aboutRights.xhtml b/toolkit/content/aboutRights.xhtml
index c0c73d761..0d42e6fad 100644
--- a/toolkit/content/aboutRights.xhtml
+++ b/toolkit/content/aboutRights.xhtml
@@ -47,6 +47,7 @@
<div id="disabling-webservices-container" style="margin-left:40px;">
<a name="disabling-webservices"/>
+#ifdef MOZ_SAFE_BROWSING
<p><strong>&rights.safebrowsing-a;</strong>&rights.safebrowsing-b;</p>
<ul>
<li>&rights.safebrowsing-term1;</li>
@@ -54,7 +55,7 @@
<li>&rights2.safebrowsing-term3;</li>
<li>&rights.safebrowsing-term4;</li>
</ul>
-
+#endif
<p><strong>&rights.locationawarebrowsing-a;</strong>&rights.locationawarebrowsing-b;</p>
<ul>
<li>&rights.locationawarebrowsing-term1a;<code>&rights.locationawarebrowsing-term1b;</code></li>
diff --git a/toolkit/content/aboutTelemetry.js b/toolkit/content/aboutTelemetry.js
index 2cf5e8909..c73a979c6 100644
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -75,6 +75,10 @@ function isFlatArray(obj) {
* This is a helper function for explodeObject.
*/
function flattenObject(obj, map, path, array) {
+ if (!obj) {
+ return;
+ }
+
for (let k of Object.keys(obj)) {
let newPath = [...path, array ? "[" + k + "]" : k];
let v = obj[k];
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index acec1bdf1..ca1a602a9 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -13,9 +13,9 @@ toolkit.jar:
content/global/aboutAbout.js
content/global/aboutAbout.xhtml
#ifdef MC_OFFICIAL
- content/global/aboutRights.xhtml
+* content/global/aboutRights.xhtml
#else
- content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml)
+* content/global/aboutRights.xhtml (aboutRights-unbranded.xhtml)
#endif
content/global/aboutNetworking.js
content/global/aboutNetworking.xhtml
diff --git a/toolkit/locales/en-US/chrome/global/aboutRights.dtd b/toolkit/locales/en-US/chrome/global/aboutRights.dtd
index 28b24e1d8..dfd5a1668 100644
--- a/toolkit/locales/en-US/chrome/global/aboutRights.dtd
+++ b/toolkit/locales/en-US/chrome/global/aboutRights.dtd
@@ -65,7 +65,7 @@
<!ENTITY rights.safebrowsing-b "Disabling the Safe Browsing feature is not recommended as it may result in you going to unsafe sites. If you wish to disable the feature completely, follow these steps:">
<!ENTITY rights.safebrowsing-term1 "Open the application preferences">
<!ENTITY rights.safebrowsing-term2 "Select the Security selection">
-<!ENTITY rights2.safebrowsing-term3 "Uncheck the option to &quot;&enableSafeBrowsing.label;&quot;">
+<!ENTITY rights2.safebrowsing-term3 "Uncheck the option to enable Safe Browsing">
<!ENTITY rights.safebrowsing-term4 "Safe Browsing is now disabled">
<!-- location aware browsing points for branded builds -->
diff --git a/toolkit/locales/en-US/chrome/global/preferences.dtd b/toolkit/locales/en-US/chrome/global/preferences.dtd
index 539dbbd5e..4824e5c06 100644
--- a/toolkit/locales/en-US/chrome/global/preferences.dtd
+++ b/toolkit/locales/en-US/chrome/global/preferences.dtd
@@ -4,6 +4,6 @@
<!ENTITY windowClose.key "w">
<!ENTITY preferencesDefaultTitleMac.title "Preferences">
-<!ENTITY preferencesDefaultTitleWin.title "Options">
+<!ENTITY preferencesDefaultTitleWin.title "Preferences">
<!ENTITY preferencesCloseButton.label "Close">
<!ENTITY preferencesCloseButton.accesskey "C">
diff --git a/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd b/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd
index c2d49d683..841655127 100644
--- a/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd
+++ b/toolkit/locales/en-US/chrome/pluginproblem/pluginproblem.dtd
@@ -7,7 +7,7 @@
<!ENTITY unsupportedPlatform.pre "We're very sorry, but &brandShortName; can't play Flash on this device. ">
<!-- LOCALIZATION NOTE (unsupportedPlatform.learnMore): Mobile only. This text is used to link to a SUMO page explaining why Flash is not
supported on this device. Use the unicode ellipsis char, \u2026, or use "..." if \u2026 doesn't suit traditions in your locale. -->
-<!ENTITY unsupportedPlatform.learnMore "Learn More…">
+<!ENTITY unsupportedPlatform.learnMore "Learn More…">
<!-- LOCALIZATION NOTE (unsupportedPlatform.post): Mobile only. Include text here if needed for your locale. -->
<!ENTITY unsupportedPlatform.post "">
diff --git a/toolkit/profile/content/createProfileWizard.js b/toolkit/profile/content/createProfileWizard.js
index 1963f66bc..14d006b31 100644
--- a/toolkit/profile/content/createProfileWizard.js
+++ b/toolkit/profile/content/createProfileWizard.js
@@ -96,13 +96,15 @@ function chooseProfileFolder()
dirChooser.show();
newProfileRoot = dirChooser.file;
- // Disable the "Default Folder..." button when the default profile folder
- // was selected manually in the File Picker.
- document.getElementById("useDefault").disabled =
- (newProfileRoot.parent.equals(gDefaultProfileParent));
+ if (newProfileRoot) {
+ // Disable the "Default Folder..." button when the default profile folder
+ // was selected manually in the File Picker.
+ document.getElementById("useDefault").disabled =
+ (newProfileRoot.parent.equals(gDefaultProfileParent));
- gProfileRoot = newProfileRoot;
- updateProfileDisplay();
+ gProfileRoot = newProfileRoot;
+ updateProfileDisplay();
+ }
}
// Checks the current user input for validity and triggers an error message accordingly.
diff --git a/toolkit/themes/linux/global/global.css b/toolkit/themes/linux/global/global.css
index 1f9e7e458..9553725d6 100644
--- a/toolkit/themes/linux/global/global.css
+++ b/toolkit/themes/linux/global/global.css
@@ -316,6 +316,7 @@ popupnotificationcontent {
/* :::::: Close button icons ::::: */
+%ifdef MC_BASILISK
.close-icon {
-moz-appearance: none;
height: 16px;
@@ -332,3 +333,8 @@ popupnotificationcontent {
.close-icon:hover:active {
background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 48, 16, 32);
}
+%else
+.close-icon {
+ list-style-image: url("moz-icon://stock/gtk-close?size=menu");
+}
+%endif
diff --git a/toolkit/themes/linux/global/jar.mn b/toolkit/themes/linux/global/jar.mn
index 6a053dec6..b161f8cae 100644
--- a/toolkit/themes/linux/global/jar.mn
+++ b/toolkit/themes/linux/global/jar.mn
@@ -14,7 +14,7 @@ toolkit.jar:
skin/classic/global/filepicker.css
skin/classic/global/Filepicker.png (filepicker/Filepicker.png)
skin/classic/global/findBar.css
- skin/classic/global/global.css
+* skin/classic/global/global.css
skin/classic/global/groupbox.css
skin/classic/global/inContentUI.css
skin/classic/global/listbox.css
diff --git a/toolkit/themes/windows/global/global.css b/toolkit/themes/windows/global/global.css
index aaddef882..416321041 100644
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -331,6 +331,7 @@ popupnotificationcontent {
/* :::::: Close button icons ::::: */
+%ifdef MC_BASILISK
.close-icon {
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 20px, 20px, 0);
@@ -398,3 +399,17 @@ popupnotificationcontent {
}
}
}
+%else
+.close-icon {
+ list-style-image: url("chrome://global/skin/icons/close.svg");
+ -moz-image-region: rect(0, 16px, 16px, 0);
+}
+
+.close-icon:hover {
+ -moz-image-region: rect(0, 32px, 16px, 16px);
+}
+
+.close-icon:hover:active {
+ -moz-image-region: rect(0, 48px, 16px, 32px);
+}
+%endif
diff --git a/toolkit/themes/windows/global/icons/close-inverted.svg b/toolkit/themes/windows/global/icons/close-inverted.svg
new file mode 100644
index 000000000..ac2bd887d
--- /dev/null
+++ b/toolkit/themes/windows/global/icons/close-inverted.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64" height="16" version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+ <linearGradient id="d" x1="5.5" x2="5.5" y1="1" y2="7" gradientTransform="translate(17,1)" gradientUnits="userSpaceOnUse">
+ <stop stop-color="#e35d5d" offset="0"/>
+ <stop stop-color="#e35d5d" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <rect x="17" y="1" width="14" height="14" rx="2.5" ry="2.5" fill="#b00021" fill-rule="evenodd"/>
+ <rect id="a" x="18" y="2" width="12" height="12" rx="1.5" ry="1.5" color="#000000" color-rendering="auto" fill="url(#d)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ <path id="c" d="m26.8 5.2-5.6 5.6m0-5.6 5.6 5.6" fill="none" stroke="#fff" stroke-linecap="square" stroke-width="1.4"/>
+ <path id="b" d="m10.8 5.2-5.6 5.6m0-5.6 5.6 5.6" fill="none" stroke="#d0d0d0" stroke-linecap="square" stroke-width="1.4"/>
+ <rect x="33" y="1" width="14" height="14" rx="2" ry="2" fill="#800018" fill-rule="evenodd"/>
+ <use transform="translate(48)" width="100%" height="100%" opacity=".5" xlink:href="#b"/>
+ <use transform="translate(16)" width="100%" height="100%" opacity=".6" xlink:href="#a"/>
+ <use transform="translate(16)" width="100%" height="100%" opacity=".6" xlink:href="#c"/>
+ </g>
+</svg>
diff --git a/toolkit/themes/windows/global/icons/close.svg b/toolkit/themes/windows/global/icons/close.svg
new file mode 100644
index 000000000..4093c880d
--- /dev/null
+++ b/toolkit/themes/windows/global/icons/close.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="64" height="16" version="1.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+ <linearGradient id="d" x1="5.5" x2="5.5" y1="1" y2="7" gradientTransform="translate(17,1)" gradientUnits="userSpaceOnUse">
+ <stop stop-color="#e35d5d" offset="0"/>
+ <stop stop-color="#e35d5d" stop-opacity="0" offset="1"/>
+ </linearGradient>
+ </defs>
+ <g>
+ <rect x="17" y="1" width="14" height="14" rx="2.5" ry="2.5" fill="#b00021" fill-rule="evenodd"/>
+ <rect id="a" x="18" y="2" width="12" height="12" rx="1.5" ry="1.5" color="#000000" color-rendering="auto" fill="url(#d)" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="isolation:auto;mix-blend-mode:normal"/>
+ <path id="c" d="m26.8 5.2-5.6 5.6m0-5.6 5.6 5.6" fill="none" stroke="#fff" stroke-linecap="square" stroke-width="1.4"/>
+ <path id="b" d="m10.8 5.2-5.6 5.6m0-5.6 5.6 5.6" fill="none" stroke="#303030" stroke-linecap="square" stroke-width="1.4"/>
+ <rect x="33" y="1" width="14" height="14" rx="2" ry="2" fill="#800018" fill-rule="evenodd"/>
+ <use transform="translate(48)" width="100%" height="100%" opacity=".5" xlink:href="#b"/>
+ <use transform="translate(16)" width="100%" height="100%" opacity=".6" xlink:href="#a"/>
+ <use transform="translate(16)" width="100%" height="100%" opacity=".6" xlink:href="#c"/>
+ </g>
+</svg>
diff --git a/toolkit/themes/windows/global/jar.mn b/toolkit/themes/windows/global/jar.mn
index 75f4cc650..a2cc9e2ea 100644
--- a/toolkit/themes/windows/global/jar.mn
+++ b/toolkit/themes/windows/global/jar.mn
@@ -45,6 +45,8 @@ toolkit.jar:
skin/classic/global/icons/autocomplete-search.svg (icons/autocomplete-search.svg)
skin/classic/global/icons/blacklist_favicon.png (icons/blacklist_favicon.png)
skin/classic/global/icons/blacklist_large.png (icons/blacklist_large.png)
+ skin/classic/global/icons/close.svg (icons/close.svg)
+ skin/classic/global/icons/close-inverted.svg (icons/close-inverted.svg)
skin/classic/global/icons/close-win7.png (icons/close-win7.png)
skin/classic/global/icons/close-win7@2x.png (icons/close-win7@2x.png)
skin/classic/global/icons/close-inverted-win7.png (icons/close-inverted-win7.png)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 06:25:47 +0000