diff --git a/b2g/chrome/content/images/errorpage-larry-black.png b/b2g/chrome/content/images/errorpage-larry-black.png new file mode 100644 index 00000000000..9f2e4a6e736 Binary files /dev/null and b/b2g/chrome/content/images/errorpage-larry-black.png differ diff --git a/b2g/chrome/content/images/errorpage-larry-white.png b/b2g/chrome/content/images/errorpage-larry-white.png new file mode 100644 index 00000000000..fc153c7314e Binary files /dev/null and b/b2g/chrome/content/images/errorpage-larry-white.png differ diff --git a/b2g/chrome/content/images/errorpage-warning.png b/b2g/chrome/content/images/errorpage-warning.png new file mode 100644 index 00000000000..8bf9d8e7dec Binary files /dev/null and b/b2g/chrome/content/images/errorpage-warning.png differ diff --git a/b2g/chrome/content/netError.css b/b2g/chrome/content/netError.css new file mode 100644 index 00000000000..16cacad69c4 --- /dev/null +++ b/b2g/chrome/content/netError.css @@ -0,0 +1,127 @@ +/* + * This defines the look-and-feel styling of the error pages. + * (see: netError.xhtml) + * + * Original styling by William Price + * Updated for mobile by: Wes Johnston + */ + +body { + margin: 0; + padding: 0 8px 8px; + font-family: "Nokia Sans", Tahoma, sans-serif !important; +} + +h1 { + font-size: 22px; +} + +h2 { + font-size: 16px; +} + +ul { + margin: 0px; + padding: 0px 0px 0px 1em; +} + +li { + margin: 0px; + padding: 8px 0px; +} + +#errorPage { + background-color: #CEE6F4; +} + +#errorPage.certerror { + background-color: #EFD400; +} + +#errorPage.blockedsite { + background-color: #BF0000; +} + +#errorTitle { + background: url("chrome://browser/content/images/errorpage-warning.png") left center no-repeat; + /* Scaled by .666 of their actual size */ + background-size: 40px 40px; + background-origin: content-box; + min-height: 60px; + margin-left: auto; + margin-right: auto; + max-width: 500px; + margin-left: auto; + margin-right: auto; +} + +#errorPage.certerror #errorTitle { + background-image: url("chrome://browser/content/images/errorpage-larry-black.png"); +} + +#errorPage.blockedsite #errorTitle { + background-image: url("chrome://browser/content/images/errorpage-larry-white.png"); + color: white; +} + +.errorTitleText { + padding: 0px 0px 0px 50px; + display: inline-block; + vertical-align: middle +} + +#errorPageContainer { + background-color: white; + border: 1px solid #999999; + border-radius: 6px; + padding: 6px 20px 20px; + font-size: 14px; + max-width: 500px; + margin-left: auto; + margin-right: auto; +} + +#errorShortDesc > p:empty { + display: none; +} + +#errorShortDesc > p { + overflow: auto; + border-bottom: 1px solid #999999; + padding-bottom: 1em; +} + +#errorPage.blockedsite #errorShortDesc > p { + font-weight: bold; + border-bottom: none; + padding-bottom: 0px; +} + +#securityOverrideDiv { + padding-top: 10px; +} + +div[collapsed] { + padding-left: 15px; + background-image: url("chrome://browser/skin/images/arrowright-16.png"); + background-size: 11px 11px; + background-repeat: no-repeat; + background-position: left 0.3em; +} + +div[collapsed="true"] { + background-image: url("chrome://browser/skin/images/arrowright-16.png"); +} + +div[collapsed="false"] { + background-image: url("chrome://browser/skin/images/arrowdown-16.png"); +} + +div[collapsed="true"] > p, +div[collapsed="true"] > div { + display: none; +} + +button { + padding: 0.3em !important; +} diff --git a/b2g/chrome/content/netError.xhtml b/b2g/chrome/content/netError.xhtml index 9a601ef4730..71c66bbd3a1 100644 --- a/b2g/chrome/content/netError.xhtml +++ b/b2g/chrome/content/netError.xhtml @@ -304,7 +304,6 @@ -
@@ -318,6 +317,7 @@

&redirectLoop.title;

&unknownSocketType.title;

&netReset.title;

+

¬Cached.title;

&netOffline.title;

&netInterrupt.title;

&deniedPortAccess.title;

@@ -342,6 +342,7 @@
&redirectLoop.longDesc;
&unknownSocketType.longDesc;
&netReset.longDesc;
+
¬Cached.longDesc;
&netOffline.longDesc2;
&netInterrupt.longDesc;
&deniedPortAccess.longDesc;
diff --git a/b2g/chrome/jar.mn b/b2g/chrome/jar.mn index ba92d5ae081..7cf9619e022 100644 --- a/b2g/chrome/jar.mn +++ b/b2g/chrome/jar.mn @@ -15,4 +15,9 @@ chrome.jar: content/content.css (content/content.css) % override chrome://global/content/netError.xhtml chrome://browser/content/netError.xhtml +% override chrome://global/skin/netError.css chrome://browser/content/netError.css content/netError.xhtml (content/netError.xhtml) + content/netError.css (content/netError.css) + content/images/errorpage-larry-black.png (content/images/errorpage-larry-black.png) + content/images/errorpage-larry-white.png (content/images/errorpage-larry-white.png) + content/images/errorpage-warning.png (content/images/errorpage-warning.png) \ No newline at end of file