summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--browser/themes/linux/aboutCertError.css5
-rw-r--r--browser/themes/osx/aboutCertError.css5
-rw-r--r--browser/themes/windows/aboutCertError.css5
-rw-r--r--layout/generic/TextOverflow.cpp6
-rw-r--r--modules/libpref/src/init/all.js10
-rw-r--r--toolkit/components/viewconfig/content/config.js7
-rw-r--r--toolkit/locales/en-US/chrome/global/config.dtd8
-rw-r--r--toolkit/themes/linux/global/netError.css5
-rw-r--r--toolkit/themes/osx/global/netError.css5
-rw-r--r--toolkit/themes/windows/global/netError.css5
10 files changed, 35 insertions, 26 deletions
diff --git a/browser/themes/linux/aboutCertError.css b/browser/themes/linux/aboutCertError.css
index c7caf531e..dbb353025 100644
--- a/browser/themes/linux/aboutCertError.css
+++ b/browser/themes/linux/aboutCertError.css
@@ -4,7 +4,7 @@
html {
- background: -moz-Dialog;
+ background: #833;
}
body {
@@ -29,8 +29,9 @@ h2 {
min-width: 13em;
max-width: 52em;
margin: 4em auto;
- border: 1px solid #FFBD09; /* pale yellow extracted from yellow passport icon */
+ border: 2px solid #DD0D09;
border-radius: 10px;
+ box-shadow: 0px 0px 8px red;
padding: 3em;
-moz-padding-start: 30px;
background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field;
diff --git a/browser/themes/osx/aboutCertError.css b/browser/themes/osx/aboutCertError.css
index c7caf531e..dbb353025 100644
--- a/browser/themes/osx/aboutCertError.css
+++ b/browser/themes/osx/aboutCertError.css
@@ -4,7 +4,7 @@
html {
- background: -moz-Dialog;
+ background: #833;
}
body {
@@ -29,8 +29,9 @@ h2 {
min-width: 13em;
max-width: 52em;
margin: 4em auto;
- border: 1px solid #FFBD09; /* pale yellow extracted from yellow passport icon */
+ border: 2px solid #DD0D09;
border-radius: 10px;
+ box-shadow: 0px 0px 8px red;
padding: 3em;
-moz-padding-start: 30px;
background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field;
diff --git a/browser/themes/windows/aboutCertError.css b/browser/themes/windows/aboutCertError.css
index c7caf531e..dbb353025 100644
--- a/browser/themes/windows/aboutCertError.css
+++ b/browser/themes/windows/aboutCertError.css
@@ -4,7 +4,7 @@
html {
- background: -moz-Dialog;
+ background: #833;
}
body {
@@ -29,8 +29,9 @@ h2 {
min-width: 13em;
max-width: 52em;
margin: 4em auto;
- border: 1px solid #FFBD09; /* pale yellow extracted from yellow passport icon */
+ border: 2px solid #DD0D09;
border-radius: 10px;
+ box-shadow: 0px 0px 8px red;
padding: 3em;
-moz-padding-start: 30px;
background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat -moz-Field;
diff --git a/layout/generic/TextOverflow.cpp b/layout/generic/TextOverflow.cpp
index 68ea7eda3..f0a609ec3 100644
--- a/layout/generic/TextOverflow.cpp
+++ b/layout/generic/TextOverflow.cpp
@@ -681,6 +681,12 @@ TextOverflow::CanHaveTextOverflow(nsDisplayListBuilder* aBuilder,
return false;
}
+ // Skip ComboboxControlFrame.
+ // Its anon block inherits 'text-overflow' and does what is expected.
+ if (aBlockFrame->GetType() == nsGkAtoms::comboboxControlFrame) {
+ return false;
+ }
+
// Inhibit the markers if a descendant content owns the caret.
nsRefPtr<nsCaret> caret = aBlockFrame->PresContext()->PresShell()->GetCaret();
bool visible = false;
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 8aa1745c2..3ae1cfdaa 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -1031,10 +1031,10 @@ pref("network.http.bypass-cachelock-threshold", 200000);
pref("network.http.bypass-cachelock-threshold", 250);
#endif
-// Try and use SPDY when using SSL
-pref("network.http.spdy.enabled", true);
-pref("network.http.spdy.enabled.v2", true);
-pref("network.http.spdy.enabled.v3", true);
+// SPDY is being deprecated, so don't use it by default.
+pref("network.http.spdy.enabled", false);
+pref("network.http.spdy.enabled.v2", false);
+pref("network.http.spdy.enabled.v3", false);
pref("network.http.spdy.chunk-size", 4096);
pref("network.http.spdy.timeout", 180);
pref("network.http.spdy.coalesce-hostnames", true);
@@ -3647,6 +3647,8 @@ pref("ui.panel.default_level_parent", true);
pref("mousewheel.system_scroll_override_on_root_content.enabled", false);
+pref("ui.key.menuAccessKeyFocuses", true);
+
# XP_UNIX
#endif
#endif
diff --git a/toolkit/components/viewconfig/content/config.js b/toolkit/components/viewconfig/content/config.js
index b9416cfbf..554c8496f 100644
--- a/toolkit/components/viewconfig/content/config.js
+++ b/toolkit/components/viewconfig/content/config.js
@@ -195,9 +195,6 @@ var gPrefListener =
if (topic != "nsPref:changed")
return;
- if (/^capability\./.test(prefName)) // avoid displaying "private" preferences
- return;
-
var arrayIndex = gPrefArray.length;
var viewIndex = arrayIndex;
var selectedIndex = view.selection.currentIndex;
@@ -350,10 +347,8 @@ function ShowPrefs()
{
var prefArray = gPrefBranch.getChildList("");
+ // Fill the array
prefArray.forEach(function (prefName) {
- if (/^capability\./.test(prefName)) // avoid displaying "private" preferences
- return;
-
fetchPref(prefName, gPrefArray.length);
});
diff --git a/toolkit/locales/en-US/chrome/global/config.dtd b/toolkit/locales/en-US/chrome/global/config.dtd
index eb2d6354f..7d45f536b 100644
--- a/toolkit/locales/en-US/chrome/global/config.dtd
+++ b/toolkit/locales/en-US/chrome/global/config.dtd
@@ -5,10 +5,10 @@
<!ENTITY window.title "about:config">
<!-- about:config warning page -->
-<!-- LOCALIZATION NOTE: aboutWarningTitle.label should be attention grabbing and playful -->
-<!ENTITY aboutWarningTitle.label "This might void your warranty!">
-<!ENTITY aboutWarningText.label "Changing these advanced settings can be harmful to the stability, security, and performance of this application. You should only continue if you are sure of what you are doing.">
-<!ENTITY aboutWarningButton.label "I'll be careful, I promise!">
+<!-- LOCALIZATION NOTE: aboutWarningTitle.label should be attention grabbing and playful, not a literal translation -->
+<!ENTITY aboutWarningTitle.label "There be dragons here!">
+<!ENTITY aboutWarningText.label "Changing these advanced settings can be (severely) harmful to the stability, security, and performance of this application. You should only continue if you know what you are doing.">
+<!ENTITY aboutWarningButton.label "I promise to be careful!">
<!ENTITY aboutWarningCheckbox.label "Show this warning next time">
<!ENTITY searchPrefs.label "Search:">
diff --git a/toolkit/themes/linux/global/netError.css b/toolkit/themes/linux/global/netError.css
index 77e3cea88..93d1d035e 100644
--- a/toolkit/themes/linux/global/netError.css
+++ b/toolkit/themes/linux/global/netError.css
@@ -11,7 +11,7 @@
*/
html {
- background: -moz-Dialog;
+ background: #368;
}
body {
@@ -46,8 +46,9 @@ ul {
min-width: 13em;
max-width: 52em;
margin: 4em auto;
- border: 1px solid ThreeDShadow;
+ border: 2px solid #9BD;
border-radius: 10px;
+ box-shadow: 0px 0px 8px #DEF;
padding: 3em;
-moz-padding-start: 30px;
background: url("moz-icon://stock/gtk-dialog-warning?size=dialog") left 0 no-repeat -moz-Field;
diff --git a/toolkit/themes/osx/global/netError.css b/toolkit/themes/osx/global/netError.css
index 206f52211..8eea2d543 100644
--- a/toolkit/themes/osx/global/netError.css
+++ b/toolkit/themes/osx/global/netError.css
@@ -12,7 +12,7 @@
*/
html {
- background: -moz-Dialog;
+ background: #368;
}
body {
@@ -47,8 +47,9 @@ ul {
min-width: 13em;
max-width: 52em;
margin: 4em auto;
- border: 1px solid ThreeDShadow;
+ border: 2px solid #9BD;
border-radius: 10px;
+ box-shadow: 0px 0px 8px #DEF;
padding: 3em;
-moz-padding-start: 30px;
background: url("chrome://global/skin/icons/warning-large.png") left 0 no-repeat -moz-Field;
diff --git a/toolkit/themes/windows/global/netError.css b/toolkit/themes/windows/global/netError.css
index 5504a0e02..c5862c6ea 100644
--- a/toolkit/themes/windows/global/netError.css
+++ b/toolkit/themes/windows/global/netError.css
@@ -12,7 +12,7 @@
*/
html {
- background: -moz-Dialog;
+ background: #368;
}
body {
@@ -47,8 +47,9 @@ ul {
min-width: 13em;
max-width: 52em;
margin: 4em auto;
- border: 1px solid ThreeDShadow;
+ border: 2px solid #9BD;
border-radius: 10px;
+ box-shadow: 0px 0px 8px #DEF;
padding: 3em;
-moz-padding-start: 30px;
background: url("chrome://global/skin/icons/warning-large.png") left 0 no-repeat -moz-Field;
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-10 06:45:17 +0000