# HG changeset patch # Parent 4232bace58e4c63c5e47066eb901953c2780f863 diff --git a/mobile/app/mobile.js b/mobile/app/mobile.js --- a/mobile/app/mobile.js +++ b/mobile/app/mobile.js @@ -71,7 +71,7 @@ pref("toolkit.zoomManager.zoomValues", ".2,.3,.5,.67,.8,.9,1,1.1,1.2,1.33,1.5,1.7,2,2.4,3,4"); // Device pixel to CSS px ratio, in percent. Set to -1 to calculate based on display density. -pref("browser.viewport.scaleRatio", -1); +pref("browser.viewport.scaleRatio", 150); /* allow scrollbars to float above chrome ui */ pref("ui.scrollbarsCanOverlapContent", 1); diff --git a/mobile/chrome/content/aboutCertError.css b/mobile/chrome/content/aboutCertError.css deleted file mode 100644 --- a/mobile/chrome/content/aboutCertError.css +++ /dev/null @@ -1,59 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Mozilla Corporation. - * Portions created by the Initial Developer are Copyright (C) 2008 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * William Price - * Steven Garrity - * Henrik Skupin - * Johnathan Nightingale - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - -/* Logical CSS rules belong here, but presentation & theming rules - should live in the CSS of the appropriate theme */ - -#technicalContentText { - overflow: auto; - white-space: pre-wrap; -} - -#technicalContent > h2, #expertContent > h2 { - cursor: pointer; - padding-left: 20px; - position: relative; - left: -20px; -} - -div[collapsed] > p, -div[collapsed] > div { - display: none; -} diff --git a/mobile/chrome/content/aboutCertError.xhtml b/mobile/chrome/content/aboutCertError.xhtml --- a/mobile/chrome/content/aboutCertError.xhtml +++ b/mobile/chrome/content/aboutCertError.xhtml @@ -57,8 +57,8 @@ &certerror.pagetitle; - - + + +
+

&certerror.longpagetitle;

+
- - -
-

&certerror.longpagetitle;

-
- +

&certerror.introPara1;

-

&certerror.introPara2;

diff --git a/mobile/chrome/content/blockedSite.xhtml b/mobile/chrome/content/blockedSite.xhtml --- a/mobile/chrome/content/blockedSite.xhtml +++ b/mobile/chrome/content/blockedSite.xhtml @@ -54,6 +54,7 @@ + @@ -186,26 +187,27 @@ - + + + +
+

&safeb.blocked.phishingPage.title2;

+

&safeb.blocked.malwarePage.title;

+
+
- - -
-

&safeb.blocked.phishingPage.title;

-

&safeb.blocked.malwarePage.title;

-
- +
-

&safeb.blocked.phishingPage.shortDesc;

+

&safeb.blocked.phishingPage.shortDesc2;

&safeb.blocked.malwarePage.shortDesc;

-

&safeb.blocked.phishingPage.longDesc;

+

&safeb.blocked.phishingPage.longDesc2;

&safeb.blocked.malwarePage.longDesc;

@@ -216,9 +218,6 @@
-
- -
+ + + + + &loadError.label; + + + + + + + + + + +
+
+

&generic.title;

+

&dnsNotFound.title;

+

&fileNotFound.title;

+

&malformedURI.title;

+

&protocolNotFound.title;

+

&connectionFailure.title;

+

&netTimeout.title;

+

&redirectLoop.title;

+

&unknownSocketType.title;

+

&netReset.title;

+

&netOffline.title;

+

&netInterrupt.title;

+

&deniedPortAccess.title;

+

&proxyResolveFailure.title;

+

&proxyConnectFailure.title;

+

&contentEncodingError.title;

+

&unsafeContentType.title;

+

&nssFailure2.title;

+

&nssBadCert.title;

+

&cspFrameAncestorBlocked.title;

+

&remoteXUL.title;

+

&corruptedContentError.title;

+
+
+
&generic.longDesc;
+
&dnsNotFound.longDesc2;
+
&fileNotFound.longDesc;
+
&malformedURI.longDesc;
+
&protocolNotFound.longDesc;
+
&connectionFailure.longDesc;
+
&netTimeout.longDesc;
+
&redirectLoop.longDesc;
+
&unknownSocketType.longDesc;
+
&netReset.longDesc;
+
&netOffline.longDesc2;
+
&netInterrupt.longDesc;
+
&deniedPortAccess.longDesc;
+
&proxyResolveFailure.longDesc2;
+
&proxyConnectFailure.longDesc;
+
&contentEncodingError.longDesc;
+
&unsafeContentType.longDesc;
+
&nssFailure2.longDesc;
+
&nssBadCert.longDesc2;
+
&cspFrameAncestorBlocked.longDesc;
+
&remoteXUL.longDesc;
+
&corruptedContentError.longDesc;
+
+
+ + +
+

+

+ + +
+ + +
+ + +
+

+

+ + +
+ + +
+ &securityOverride.linkText; + +
+
+ + + + +
+ + + + + + diff --git a/mobile/chrome/jar.mn b/mobile/chrome/jar.mn --- a/mobile/chrome/jar.mn +++ b/mobile/chrome/jar.mn @@ -7,7 +7,6 @@ content/config.xul (content/config.xul) content/config.js (content/config.js) content/aboutCertError.xhtml (content/aboutCertError.xhtml) - content/aboutCertError.css (content/aboutCertError.css) content/aboutHome.xhtml (content/aboutHome.xhtml) content/localePicker.xul (content/localePicker.xul) content/localePicker.js (content/localePicker.js) @@ -72,5 +71,7 @@ content/LoginManagerChild.js (content/LoginManagerChild.js) content/fullscreen-video.js (content/fullscreen-video.js) content/fullscreen-video.xhtml (content/fullscreen-video.xhtml) + content/netError.xhtml (content/netError.xhtml) % override chrome://global/content/config.xul chrome://browser/content/config.xul +% override chrome://global/content/netError.xhtml chrome://browser/content/netError.xhtml diff --git a/mobile/locales/en-US/chrome/aboutCertError.dtd b/mobile/locales/en-US/chrome/aboutCertError.dtd --- a/mobile/locales/en-US/chrome/aboutCertError.dtd +++ b/mobile/locales/en-US/chrome/aboutCertError.dtd @@ -14,9 +14,6 @@ was trying to connect. --> #1, but we can't confirm that your connection is secure."> - - + -
  • Check the address for typing errors such as ww.example.com instead of www.example.com
    • -
  • If you are unable to load any pages, check your computer's network - connection.
    • -
  • If your computer or network is protected by a firewall or proxy, make sure - that &brandShortName; is permitted to access the Web.
    • +
  • If you are unable to load any pages, check your device's data or wifi connection.
    • "> @@ -50,7 +47,7 @@ "> - + - + - + -
  • Check the proxy settings to make sure that they are correct.
    • -
  • Check to make sure your computer has a working network connection.
    • -
  • If your computer or network is protected by a firewall or proxy, make sure - that &brandShortName; is permitted to access the Web.
    • +
  • Check to make sure your device has a working data or WiFi connection.
    • "> @@ -140,29 +135,13 @@ "> - -
  • The site could be temporarily unavailable or too busy. Try again in a few - moments.
    • -
  • If you are unable to load any pages, check your computer's network - connection.
    • -
  • If your computer or network is protected by a firewall or proxy, make sure - that &brandShortName; is permitted to access the Web.
    • +
  • The site could be temporarily unavailable or too busy. Try again in a few moments.
    • +
  • If you are unable to load any pages, check your mobile device's data or wifi connection.
    • "> - -Attack sites try to install programs that steal private information, use your computer to attack others, or damage your system.

    -

    Web site owners who believe their site has been reported as an attack site in error may request a review.

    -"> - - -Entering any personal information on this page may result in identity theft or other fraud.

    -

    These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.

    -"> - &brandShortName; prevented this page from loading in this way because the page has a content security policy that disallows it.

    "> diff --git a/mobile/locales/en-US/chrome/phishing.dtd b/mobile/locales/en-US/chrome/phishing.dtd --- a/mobile/locales/en-US/chrome/phishing.dtd +++ b/mobile/locales/en-US/chrome/phishing.dtd @@ -20,7 +20,7 @@ has been reported as an attack page and has been blocked based on your security preferences."> Attack pages try to install programs that steal private information, use your computer to attack others, or damage your system.

    Some attack pages intentionally distribute harmful software, but many are compromised without the knowledge or permission of their owners.

    "> - + - has been reported as a web forgery and has been blocked based on your security preferences."> -Web forgeries are designed to trick you into revealing personal or financial information by imitating sources you may trust.

    Entering any information on this web page may result in identity theft or other fraud.

    "> + +These types of web forgeries are used in scams known as phishing attacks, in which fraudulent web pages and emails are used to imitate sources you may trust.

    "> diff --git a/mobile/themes/core/aboutCertError.css b/mobile/themes/core/aboutCertError.css deleted file mode 100644 --- a/mobile/themes/core/aboutCertError.css +++ /dev/null @@ -1,96 +0,0 @@ -/* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 - * - * The contents of this file are subject to the Mozilla Public License Version - * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License - * for the specific language governing rights and limitations under the - * License. - * - * The Original Code is mozilla.org code. - * - * The Initial Developer of the Original Code is - * Mozilla Corporation. - * Portions created by the Initial Developer are Copyright (C) 2008 - * the Initial Developer. All Rights Reserved. - * - * Contributor(s): - * William Price - * Steven Garrity - * Henrik Skupin - * Johnathan Nightingale - * - * Alternatively, the contents of this file may be used under the terms of - * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only - * under the terms of either the GPL or the LGPL, and not to allow others to - * use your version of this file under the terms of the MPL, indicate your - * decision by deleting the provisions above and replace them with the notice - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - -html { - background: #f0f0f0; -} - -body { - margin: 0; - padding: 0 1em; - color: black; - font-family: "Nokia Sans", Tahoma, sans-serif !important; - font-size: 100% !important; -} - -h1 { - margin: 0 0 .6em 0; - border-bottom: 1px solid lightgray; - font-size: 160%; -} - -h2 { - font-size: 130%; -} - -#errorPageContainer { - position: relative; - min-width: 13em; - max-width: 52em; - margin: 1em auto; - border: 1px solid #FFBD09; /* pale yellow extracted from yellow passport icon */ - -moz-border-radius: 10px; - padding: 3em; - -moz-padding-start: 30px; - background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat white; - -moz-background-origin: content; -} - -body[dir="rtl"] #errorPageContainer { - background-position: right 0; -} - -#errorTitle { - -moz-margin-start: 80px; -} - -#errorLongContent { - -moz-margin-start: 80px; -} - -#technicalContent > h2, #expertContent > h2 { - background : url("chrome://browser/skin/images/section-expanded-16.png") left 0 no-repeat; -} - -#technicalContent[collapsed] > h2, -#expertContent[collapsed] > h2 { - background-image: url("chrome://browser/skin/images/section-collapsed-16.png"); -} diff --git a/mobile/themes/core/gingerbread/images/errorpage-larry-black.png b/mobile/themes/core/gingerbread/images/errorpage-larry-black.png new file mode 100644 index 0000000000000000000000000000000000000000..9f2e4a6e7366abd9123ad34ed8d369c387111fee GIT binary patch literal 850 zc$@)J1FigtP)3|YQ z2c&|K4x9?2tH33Y4t%MAbl`M=J0Kl!=tj;k8cFP~Ry<;MM&myQ^l6`3Dee0{xhYY= zGeVc@lgtCm_@8rTU?s;}0~W(**8q(DP&1622%RqloL;q?rs??Miykg1^zY{|9*NL$ z7;g*~lR|)h{_Fr&@<&g~WtJWEgC05QcZJ9!26)P(mDy&l_drc*Et$w?(qs7^#_KTN zEx@4~u00F7h=#|*G`~;{*IS6v=Mi)WaJ8khbO;3IOi5_qdt%`bBDu~0S9x0`f+1E^ zGDqolP7U9!AZvUDJo^{>z#4!*W_@-ACY|W$k2U2prSMpThLybN0tYJUzfW@ot!A{R z?HHkRpr#vab;h+l>@_&IR2s@w=~bb%^cYwoG%R(yW>ak}TgRi&W(o;f$rgdlN=t3% z9|F4>zNSIJ{LXiyQBmkh@Z!wxo}Si`Ny8<;YAB;NzLOc>`B56CiD#QE2Dpv@YVO*u z^}Q{^tGQ=Wz``&;GhIL<*!qz_E%Ft-1wJbEiVWBPHc$CP!b>{*uner`n z-`O{h91p z5ZH3ALIzV>$_O>DL@rQpA%i^-4=Mi77PFMd1rnhyM!5ly5gKi-oGp z`zeubVp|}VLMHT%M+GpkBcU2AiG@sb;A;?RiTz>;SRlcf8o6%q2tCoxQGG#yo7fwW z7}u6CCyH`nQ^0+Xt6%z_mh@~2V%*eQ4e(*23HPgjPfQ1Dn*c87@LLz~_}bD^2LqX< zoTQ{l;W>FoA&vMgNdwjJU2<(}ToJjU&G&%`Mt6d`}yqTR0j*axR`&O&ZY8Zy( zC*fv>HVa_`u|-YzUD(@P9$w89(y6e6ur(DAtcQI=X)i28bnq`6YJ3p-_|G zFT$!Tx?0+l7eZ?Dt0VmTQooIb@DAzaP9u-2Ae<=kJKF*TOZY)pEj3J~EIcH`pjO^NVWqIWrmYtKhkmzOX}K=f#u5Gl-gr;037S#Jh4mJ%Rt#Rfh}{~z zcNegmkythja)u0lQrbx2v(ClCveiT$E*zo;gGOm*t+X@dflU4mwzEEjn}G)hVX4$k z3ZJRyVIU?6r=aB=o-^fTu9j$AT8m7 zXucf>=g361)(osme$W!Ob#kxh#$=?rSNhg(juauB1njnS=v`unWL7DFfcxZTcU(GIS*$8Pi2&O>inqDZHsLC z^Y=FsYtuWZt0@=wzPlQa%6fa7d>yEhu9i5mZi9GdNnFS{*V3WI|3MR$mFEDZ1QMGJ zY28-nJt8E}h`p)~4(_OrRK54KPO#^+W7Mr~fGW~8bikgIEyQX>UMP@-47r9)Q`gb4 z=5--lGw2qrVUyNIUB4+IxJ&%+e0*@~mLjB0OG4N0R+dFU%~13NdsvrnFi?w&0t$?8 zd3yM)RC8#iX3=r#hv9n7~fYKDFA|1X0?a($R0lru|otYRWefxV?7Tg7%h zd=dOO!gGamnS9;cp@fr$=eoAEW;jJ$LV6**5MBr`gcrishQ9&~07cZf+~wI#>Hq)$ M07*qoM6N<$f|_oW82|tP diff --git a/mobile/themes/core/gingerbread/images/errorpage-warning.png b/mobile/themes/core/gingerbread/images/errorpage-warning.png new file mode 100644 index 0000000000000000000000000000000000000000..8bf9d8e7decc3642be80e0d6dc615c2f50f64a79 GIT binary patch literal 631 zc$@)u0*L*IP)i=d0kH83w zzzA$mHYgj=PQVDX6L^GlgN(okG)P8DBRkml;n>NY^h%KkwjZ5+zB?u5vMj|j*-Pa^k~4<4cJZnBLQm<;MoMU?15Vk*iBRJz_$X`!WqEs1v~`8t~%xltN^f^ zx*UNu0(dsZAsgTZ0ZWpB#RNW>L}G8t*5cdXBQLyEvBkA-U>uzMy=UT&xmyR4l@fSZ1?J1w)&;!V zq~PHXq~{KSUPfhLSl}9ZZ6L0_?w(uvScIpHq1Td4>KvIkaMK58MrDPKc-Izftus>s(ASH~ke zy9NA}G1sT-LFpu71+roe*q9+0Ty5Z7GMDu;8^x2zyNbwkV-1) R8RGx|002ovPDHLkV1nb47!m*g diff --git a/mobile/themes/core/honeycomb/images/errorpage-larry-black.png b/mobile/themes/core/honeycomb/images/errorpage-larry-black.png new file mode 100644 index 0000000000000000000000000000000000000000..9f2e4a6e7366abd9123ad34ed8d369c387111fee GIT binary patch literal 850 zc$@)J1FigtP)3|YQ z2c&|K4x9?2tH33Y4t%MAbl`M=J0Kl!=tj;k8cFP~Ry<;MM&myQ^l6`3Dee0{xhYY= zGeVc@lgtCm_@8rTU?s;}0~W(**8q(DP&1622%RqloL;q?rs??Miykg1^zY{|9*NL$ z7;g*~lR|)h{_Fr&@<&g~WtJWEgC05QcZJ9!26)P(mDy&l_drc*Et$w?(qs7^#_KTN zEx@4~u00F7h=#|*G`~;{*IS6v=Mi)WaJ8khbO;3IOi5_qdt%`bBDu~0S9x0`f+1E^ zGDqolP7U9!AZvUDJo^{>z#4!*W_@-ACY|W$k2U2prSMpThLybN0tYJUzfW@ot!A{R z?HHkRpr#vab;h+l>@_&IR2s@w=~bb%^cYwoG%R(yW>ak}TgRi&W(o;f$rgdlN=t3% z9|F4>zNSIJ{LXiyQBmkh@Z!wxo}Si`Ny8<;YAB;NzLOc>`B56CiD#QE2Dpv@YVO*u z^}Q{^tGQ=Wz``&;GhIL<*!qz_E%Ft-1wJbEiVWBPHc$CP!b>{*uner`n z-`O{h91p z5ZH3ALIzV>$_O>DL@rQpA%i^-4=Mi77PFMd1rnhyM!5ly5gKi-oGp z`zeubVp|}VLMHT%M+GpkBcU2AiG@sb;A;?RiTz>;SRlcf8o6%q2tCoxQGG#yo7fwW z7}u6CCyH`nQ^0+Xt6%z_mh@~2V%*eQ4e(*23HPgjPfQ1Dn*c87@LLz~_}bD^2LqX< zoTQ{l;W>FoA&vMgNdwjJU2<(}ToJjU&G&%`Mt6d`}yqTR0j*axR`&O&ZY8Zy( zC*fv>HVa_`u|-YzUD(@P9$w89(y6e6ur(DAtcQI=X)i28bnq`6YJ3p-_|G zFT$!Tx?0+l7eZ?Dt0VmTQooIb@DAzaP9u-2Ae<=kJKF*TOZY)pEj3J~EIcH`pjO^NVWqIWrmYtKhkmzOX}K=f#u5Gl-gr;037S#Jh4mJ%Rt#Rfh}{~z zcNegmkythja)u0lQrbx2v(ClCveiT$E*zo;gGOm*t+X@dflU4mwzEEjn}G)hVX4$k z3ZJRyVIU?6r=aB=o-^fTu9j$AT8m7 zXucf>=g361)(osme$W!Ob#kxh#$=?rSNhg(juauB1njnS=v`unWL7DFfcxZTcU(GIS*$8Pi2&O>inqDZHsLC z^Y=FsYtuWZt0@=wzPlQa%6fa7d>yEhu9i5mZi9GdNnFS{*V3WI|3MR$mFEDZ1QMGJ zY28-nJt8E}h`p)~4(_OrRK54KPO#^+W7Mr~fGW~8bikgIEyQX>UMP@-47r9)Q`gb4 z=5--lGw2qrVUyNIUB4+IxJ&%+e0*@~mLjB0OG4N0R+dFU%~13NdsvrnFi?w&0t$?8 zd3yM)RC8#iX3=r#hv9n7~fYKDFA|1X0?a($R0lru|otYRWefxV?7Tg7%h zd=dOO!gGamnS9;cp@fr$=eoAEW;jJ$LV6**5MBr`gcrishQ9&~07cZf+~wI#>Hq)$ M07*qoM6N<$f|_oW82|tP diff --git a/mobile/themes/core/honeycomb/images/errorpage-warning.png b/mobile/themes/core/honeycomb/images/errorpage-warning.png new file mode 100644 index 0000000000000000000000000000000000000000..8bf9d8e7decc3642be80e0d6dc615c2f50f64a79 GIT binary patch literal 631 zc$@)u0*L*IP)i=d0kH83w zzzA$mHYgj=PQVDX6L^GlgN(okG)P8DBRkml;n>NY^h%KkwjZ5+zB?u5vMj|j*-Pa^k~4<4cJZnBLQm<;MoMU?15Vk*iBRJz_$X`!WqEs1v~`8t~%xltN^f^ zx*UNu0(dsZAsgTZ0ZWpB#RNW>L}G8t*5cdXBQLyEvBkA-U>uzMy=UT&xmyR4l@fSZ1?J1w)&;!V zq~PHXq~{KSUPfhLSl}9ZZ6L0_?w(uvScIpHq1Td4>KvIkaMK58MrDPKc-Izftus>s(ASH~ke zy9NA}G1sT-LFpu71+roe*q9+0Ty5Z7GMDu;8^x2zyNbwkV-1) R8RGx|002ovPDHLkV1nb47!m*g diff --git a/mobile/themes/core/images/errorpage-larry-black.png b/mobile/themes/core/images/errorpage-larry-black.png new file mode 100644 index 0000000000000000000000000000000000000000..9f2e4a6e7366abd9123ad34ed8d369c387111fee GIT binary patch literal 850 zc$@)J1FigtP)3|YQ z2c&|K4x9?2tH33Y4t%MAbl`M=J0Kl!=tj;k8cFP~Ry<;MM&myQ^l6`3Dee0{xhYY= zGeVc@lgtCm_@8rTU?s;}0~W(**8q(DP&1622%RqloL;q?rs??Miykg1^zY{|9*NL$ z7;g*~lR|)h{_Fr&@<&g~WtJWEgC05QcZJ9!26)P(mDy&l_drc*Et$w?(qs7^#_KTN zEx@4~u00F7h=#|*G`~;{*IS6v=Mi)WaJ8khbO;3IOi5_qdt%`bBDu~0S9x0`f+1E^ zGDqolP7U9!AZvUDJo^{>z#4!*W_@-ACY|W$k2U2prSMpThLybN0tYJUzfW@ot!A{R z?HHkRpr#vab;h+l>@_&IR2s@w=~bb%^cYwoG%R(yW>ak}TgRi&W(o;f$rgdlN=t3% z9|F4>zNSIJ{LXiyQBmkh@Z!wxo}Si`Ny8<;YAB;NzLOc>`B56CiD#QE2Dpv@YVO*u z^}Q{^tGQ=Wz``&;GhIL<*!qz_E%Ft-1wJbEiVWBPHc$CP!b>{*uner`n z-`O{h91p z5ZH3ALIzV>$_O>DL@rQpA%i^-4=Mi77PFMd1rnhyM!5ly5gKi-oGp z`zeubVp|}VLMHT%M+GpkBcU2AiG@sb;A;?RiTz>;SRlcf8o6%q2tCoxQGG#yo7fwW z7}u6CCyH`nQ^0+Xt6%z_mh@~2V%*eQ4e(*23HPgjPfQ1Dn*c87@LLz~_}bD^2LqX< zoTQ{l;W>FoA&vMgNdwjJU2<(}ToJjU&G&%`Mt6d`}yqTR0j*axR`&O&ZY8Zy( zC*fv>HVa_`u|-YzUD(@P9$w89(y6e6ur(DAtcQI=X)i28bnq`6YJ3p-_|G zFT$!Tx?0+l7eZ?Dt0VmTQooIb@DAzaP9u-2Ae<=kJKF*TOZY)pEj3J~EIcH`pjO^NVWqIWrmYtKhkmzOX}K=f#u5Gl-gr;037S#Jh4mJ%Rt#Rfh}{~z zcNegmkythja)u0lQrbx2v(ClCveiT$E*zo;gGOm*t+X@dflU4mwzEEjn}G)hVX4$k z3ZJRyVIU?6r=aB=o-^fTu9j$AT8m7 zXucf>=g361)(osme$W!Ob#kxh#$=?rSNhg(juauB1njnS=v`unWL7DFfcxZTcU(GIS*$8Pi2&O>inqDZHsLC z^Y=FsYtuWZt0@=wzPlQa%6fa7d>yEhu9i5mZi9GdNnFS{*V3WI|3MR$mFEDZ1QMGJ zY28-nJt8E}h`p)~4(_OrRK54KPO#^+W7Mr~fGW~8bikgIEyQX>UMP@-47r9)Q`gb4 z=5--lGw2qrVUyNIUB4+IxJ&%+e0*@~mLjB0OG4N0R+dFU%~13NdsvrnFi?w&0t$?8 zd3yM)RC8#iX3=r#hv9n7~fYKDFA|1X0?a($R0lru|otYRWefxV?7Tg7%h zd=dOO!gGamnS9;cp@fr$=eoAEW;jJ$LV6**5MBr`gcrishQ9&~07cZf+~wI#>Hq)$ M07*qoM6N<$f|_oW82|tP diff --git a/mobile/themes/core/images/errorpage-warning.png b/mobile/themes/core/images/errorpage-warning.png new file mode 100644 index 0000000000000000000000000000000000000000..8bf9d8e7decc3642be80e0d6dc615c2f50f64a79 GIT binary patch literal 631 zc$@)u0*L*IP)i=d0kH83w zzzA$mHYgj=PQVDX6L^GlgN(okG)P8DBRkml;n>NY^h%KkwjZ5+zB?u5vMj|j*-Pa^k~4<4cJZnBLQm<;MoMU?15Vk*iBRJz_$X`!WqEs1v~`8t~%xltN^f^ zx*UNu0(dsZAsgTZ0ZWpB#RNW>L}G8t*5cdXBQLyEvBkA-U>uzMy=UT&xmyR4l@fSZ1?J1w)&;!V zq~PHXq~{KSUPfhLSl}9ZZ6L0_?w(uvScIpHq1Td4>KvIkaMK58MrDPKc-Izftus>s(ASH~ke zy9NA}G1sT-LFpu71+roe*q9+0Ty5Z7GMDu;8^x2zyNbwkV-1) R8RGx|002ovPDHLkV1nb47!m*g diff --git a/mobile/themes/core/jar.mn b/mobile/themes/core/jar.mn --- a/mobile/themes/core/jar.mn +++ b/mobile/themes/core/jar.mn @@ -6,7 +6,6 @@ % skin browser froyo/1.0 %skin/ # NOTE: If you add a new file here, you'll need to add it to the gingerbread # and honeycomb sections at the bottom of this file - skin/aboutCertError.css (aboutCertError.css) skin/aboutPage.css (aboutPage.css) skin/about.css (about.css) skin/aboutHome.css (aboutHome.css) @@ -19,8 +18,10 @@ * skin/platform.css (platform.css) skin/touchcontrols.css (touchcontrols.css) * skin/localePicker.css (localePicker.css) + skin/netError.css (netError.css) % override chrome://global/skin/about.css chrome://browser/skin/about.css % override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css +% override chrome://global/skin/netError.css chrome://browser/skin/netError.css skin/images/appmenu-addons-hdpi.png (images/appmenu-addons-hdpi.png) skin/images/appmenu-active-hdpi.png (images/appmenu-active-hdpi.png) @@ -53,6 +54,10 @@ skin/images/dropmarker-hdpi.png (images/dropmarker-hdpi.png) skin/images/ratings-18.png (images/ratings-18.png) skin/images/favicon-default-32.png (images/favicon-default-32.png) + skin/images/errorpage-warning.png (images/errorpage-warning.png) + skin/images/errorpage-warning.png (images/errorpage-warning.png) + skin/images/errorpage-larry-white.png (images/errorpage-larry-white.png) + skin/images/errorpage-larry-black.png (images/errorpage-larry-black.png) skin/images/endcap-default-bg.png (images/endcap-default-bg.png) skin/images/endcap-active-bg.png (images/endcap-active-bg.png) skin/images/endcap-ev-default-bg.png (images/endcap-ev-default-bg.png) @@ -128,7 +133,6 @@ chrome.jar: % skin browser classic/1.0 %skin/gingerbread/ os=Android osversion=2.3 osversion=2.3.3 osversion=2.3.4 % skin browser gingerbread/1.0 %skin/gingerbread/ - skin/gingerbread/aboutCertError.css (aboutCertError.css) skin/gingerbread/aboutPage.css (aboutPage.css) skin/gingerbread/about.css (about.css) skin/gingerbread/aboutHome.css (aboutHome.css) @@ -141,8 +145,10 @@ * skin/gingerbread/platform.css (gingerbread/platform.css) skin/gingerbread/touchcontrols.css (touchcontrols.css) * skin/gingerbread/localePicker.css (gingerbread/localePicker.css) + skin/gingerbread/netError.css (netError.css) % override chrome://global/skin/about.css chrome://browser/skin/about.css % override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css +% override chrome://global/skin/netError.css chrome://browser/skin/netError.css skin/gingerbread/images/appmenu-addons-hdpi.png (gingerbread/images/appmenu-addons-hdpi.png) skin/gingerbread/images/appmenu-active-hdpi.png (gingerbread/images/appmenu-active-hdpi.png) @@ -244,11 +250,13 @@ skin/gingerbread/images/scrubber-hdpi.png (gingerbread/images/scrubber-hdpi.png) skin/gingerbread/images/handle-start.png (gingerbread/images/handle-start.png) skin/gingerbread/images/handle-end.png (gingerbread/images/handle-end.png) + skin/gingerbread/images/errorpage-warning.png (images/errorpage-warning.png) + skin/gingerbread/images/errorpage-larry-white.png (images/errorpage-larry-white.png) + skin/gingerbread/images/errorpage-larry-black.png (images/errorpage-larry-black.png) chrome.jar: % skin browser classic/1.0 %skin/honeycomb/ os=Android osversion>=3.0 % skin browser honeycomb/1.0 %skin/honeycomb/ - skin/honeycomb/aboutCertError.css (aboutCertError.css) skin/honeycomb/aboutPage.css (aboutPage.css) skin/honeycomb/about.css (about.css) skin/honeycomb/aboutHome.css (aboutHome.css) @@ -261,8 +269,10 @@ * skin/honeycomb/platform.css (platform.css) skin/honeycomb/touchcontrols.css (touchcontrols.css) * skin/honeycomb/localePicker.css (localePicker.css) + skin/honeycomb/netError.css (netError.css) % override chrome://global/skin/about.css chrome://browser/skin/about.css % override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css +% override chrome://global/skin/netError.css chrome://browser/skin/netError.css skin/honeycomb/images/appmenu-addons-hdpi.png (honeycomb/images/appmenu-addons-hdpi.png) skin/honeycomb/images/appmenu-active-hdpi.png (honeycomb/images/appmenu-active-hdpi.png) @@ -366,3 +376,6 @@ skin/honeycomb/images/scrubber-hdpi.png (honeycomb/images/scrubber-hdpi.png) skin/honeycomb/images/handle-start.png (images/handle-start.png) skin/honeycomb/images/handle-end.png (images/handle-end.png) + skin/honeycomb/images/errorpage-warning.png (images/errorpage-warning.png) + skin/honeycomb/images/errorpage-larry-white.png (images/errorpage-larry-white.png) + skin/honeycomb/images/errorpage-larry-black.png (images/errorpage-larry-black.png) diff --git a/mobile/themes/core/netError.css b/mobile/themes/core/netError.css new file mode 100644 --- /dev/null +++ b/mobile/themes/core/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/skin/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/skin/images/errorpage-larry-black.png"); +} + +#errorPage.blockedsite #errorTitle { + background-image: url("chrome://browser/skin/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; +}