make new net/cert error pages work, remove pocket styling and let system add-on do...
authorRobert Kaiser <kairo@kairo.at>
Sun, 12 Jun 2016 20:05:01 +0000 (22:05 +0200)
committerRobert Kaiser <kairo@kairo.at>
Sun, 12 Jun 2016 20:05:01 +0000 (22:05 +0200)
LCARStrek/browser/aboutNetError.css
LCARStrek/browser/browser.css
LCARStrek/browser/customizableui/panelUIOverlay.css
LCARStrek/browser/error-pages.css [new file with mode: 0644]
LCARStrek/global/aboutReaderControls.css
LCARStrek/global/icons/info.svg [moved from LCARStrek/browser/aboutNetError_info.svg with 100% similarity]
LCARStrek/global/in-content/info-pages.css
LCARStrek/global/menu.css
LCARStrek/global/reader/pocket.svg [deleted file]

index 6f94c6587a4d330cfbd0a31c8519ede5b127c58a..f031acaffde800dc52328496a9e8490f7a8dd85b 100644 (file)
@@ -2,78 +2,28 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-@import url("chrome://global/skin/in-content/common.css");
+@import url("chrome://browser/skin/error-pages.css");
 
 body {
-  display: flex;
-  box-sizing: border-box;
-  min-height: 100vh;
-  padding: 0 48px;
-  align-items: center;
-  justify-content: center;
-}
-
-ul, ol {
-  margin: 0;
-  padding: 0;
-  -moz-margin-start: 1em;
-}
-
-ul > li, ol > li {
-  margin-bottom: .5em;
-}
-
-ul {
-  list-style: disc;
+  background-image: linear-gradient(-45deg, #A09090,     #A09090 33%,
+                                            #000000 33%, #000000 66%,
+                                            #A09090 66%, #A09090);
 }
 
-#errorPageContainer {
-  position: relative;
-  min-width: 320px;
-  max-width: 512px;
+body.certerror {
+  background-image: linear-gradient(-45deg, #FFCF00,     #FFCF00 33%,
+                                            #000000 33%, #000000 66%,
+                                            #FFCF00 66%, #FFCF00);
 }
 
-#errorTitle {
-  background: url("aboutNetError_info.svg") left 0 no-repeat;
-  background-size: 3em;
-  -moz-margin-start: -5em;
-  -moz-padding-start: 5em;
-}
-
-#errorTitleText {
-  border-bottom: 1px solid #A09090;
-  padding-bottom: 0.4em;
-}
-
-#errorTitleText:-moz-dir(rtl) {
-  background-position: right 0;
-}
-
-#errorTitle[sslv3=true],
-#errorTitle[weakCrypto=true] {
+body.certerror .title {
   background-image: url("cert-error.svg");
 }
 
-#errorTryAgain {
-  margin-top: 1.2em;
-  min-width: 150px
-}
-
 #errorContainer {
   display: none;
 }
 
-@media (max-width: 675px) {
-  #errorTitle,
-  #errorTitle[sslv3=true],
-  #errorTitle[weakCrypto=true] {
-    padding-top: 0;
-    background-image: none;
-    -moz-padding-start: 0;
-    -moz-margin-start: 0;
-  }
-}
-
 /* Pressing the retry button will cause the cursor to flicker from a pointer to
  * not-allowed. Override the disabled cursor behaviour since we will never show
  * the button disabled as the initial state. */
@@ -81,110 +31,75 @@ button:disabled {
   cursor: pointer;
 }
 
-#learnMoreContainer {
+#prefChangeContainer {
   display: none;
 }
 
-#buttonContainer {
+#learnMoreContainer {
   display: none;
-  flex-flow: row wrap;
 }
 
-#buttonSpacer {
-  flex: 1;
-}
-
-#returnButton {
-  background-color: var(--in-content-primary-button-background);
-  border: none;
-  color: var(--in-content-selected-text);
-  min-width: 250px;
-  margin-inline-start: 0;
+#certErrorButtonContainer {
+  display: none;
 }
 
-#returnButton:hover {
-  background-color: var(--in-content-primary-button-background-hover) !important;
+body.certerror #certErrorButtonContainer {
+  display: flex;
 }
 
-#returnButton:hover:active {
-  background-color: var(--in-content-primary-button-background-active) !important;
+body.certerror #netErrorButtonContainer {
+  display: none;
 }
 
-#advancedButton {
-  display: none;
+#errorTryAgain {
+  margin-top: 1.2em;
   min-width: 150px;
 }
 
-#certificateErrorReporting,
-#reportCertificateError,
-#reportSentMessage {
-  display: none;
+#returnButton {
+  min-width: 250px;
 }
 
-div#weakCryptoAdvanced,
-div#certificateErrorReporting {
+#advancedButton {
   display: none;
-  float: right;
-  /* Align with the "Try Again" button */
-  margin-top: 19px;
-  -moz-margin-end: 0;
 }
 
-div#certificateErrorReporting a,
-div#certificateErrorReportingPanel a {
-  background-color: #C09070;
-  color: #000000;
-  border-radius: 300px;
-  padding: 1px 6px;
+body.certerror #advancedButton {
+  display: block;
 }
 
-div#certificateErrorReporting a {
+#certificateErrorReporting {
+  display: none;
 }
 
-div#certificateErrorReporting a:hover {
-  text-decoration: none;
-  background-color: #FFCF00;
+.container {
+  position: relative;
 }
 
-span.downArrow {
-  display: inline-block;
-  vertical-align: middle;
-  font-size: 0.6em;
-  -moz-margin-start: 0.5em;
-  transform: scaleY(0.7);
+#advancedPanelContainer {
+  position: absolute;
+  padding: 24px 0;
 }
 
-div#weakCryptoAdvancedPanel,
-div#certificateErrorReportingPanel {
+.advanced-panel {
   /* Hidden until the link is clicked */
   display: none;
-  background-color: #000000;
-  border: 1px #A09090 solid;
+  background-color: var(--in-content-box-background);
+  border: 1px var(--in-content-box-border-color) solid;
   /* Don't use top padding because the default p style has top padding, and it
    * makes the overall div look uneven */
   padding: 0 12px 12px 12px;
   font-size: 0.9em;
-  position: absolute;
-  width: 75%;
-  margin-top: 10px;
-}
-
-div#certificateErrorReportingPanel:-moz-dir(ltr) {
-  left: 34%;
-}
-
-div#certificateErrorReportingPanel:-moz-dir(rtl) {
-  right: 0;
 }
 
-#overrideWeakCryptoPanel,
-#errorStatePanel {
-  display: flex;
+#overrideWeakCryptoPanel {
+  display: none;
   flex-direction: row;
   flex-wrap: wrap;
   justify-content: space-between;
   align-content: space-between;
   align-items: flex-start;
+  margin-top: 1em;
 }
 
 span#hostname {
@@ -195,18 +110,38 @@ span#hostname {
   cursor: pointer;
 }
 
-#errorCode {
+#errorCode:not([href]) {
   color: var(--in-content-page-color);
   cursor: text;
   text-decoration: none;
 }
 
-#reportSendingMessage {
-  /* adjust the line-height to match the link */
-  line-height: 22px;
+#errorCode[href] {
+  white-space: nowrap;
+}
+
+#badCertTechnicalInfo {
+  overflow: auto;
+  white-space: pre-wrap;
+}
+
+#certificateErrorReporting {
+  display: none;
+}
+
+#certificateErrorDebugInformation {
+  display: none;
+  background-color: var(--in-content-box-background) !important;
+  border-top: 1px solid var(--in-content-border-color);
+  position: absolute;
+  left: 0%;
+  top: 100%;
+  width: 65%;
+  padding: 1em 17.5%;
 }
 
-#reportSentMessage {
-  /* adjust the line-height to match the link */
-  line-height: 22px;
+#certificateErrorText {
+  font-family: monospace;
+  white-space: pre-wrap;
+  padding: 1em 0;
 }
index 634ee1cad49d814fc55d6e76adf0d9d03a520a2b..a987a6c3fda9cc6a470d19c942620b73bbaf14bb 100644 (file)
@@ -512,15 +512,10 @@ menuitem.bookmark-item {
           #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button,
-          #pocket-button),
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button),
 #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
   list-style-image: url("chrome://browser/skin/ToolbarFx.png");
 }
-toolbar[brighttext] #pocket-button,
-#pocket-button {
-  list-style-image: url("chrome://browser/skin/ToolbarFx.png") !important; /* override pocket.css */
-}
 
 #back-button {
   -moz-image-region: rect(0, 36px, 18px, 18px);
@@ -956,15 +951,6 @@ toolbar[brighttext] #pocket-button,
   -moz-image-region: rect(18px, 738px, 36px, 720px);
 }
 
-#pocket-button[cui-areatype="toolbar"] {
-  -moz-image-region: rect(0, 774px, 18px, 756px);
-}
-
-#pocket-button[cui-areatype="toolbar"]:hover,
-#pocket-button[cui-areatype="toolbar"][open] {
-  -moz-image-region: rect(18px, 774px, 36px, 756px);
-}
-
 /* === END toolbarbuttons.inc.css === */
 
 /* === BEGIN menupanel.inc.css === */
@@ -984,16 +970,14 @@ toolbaritem[sdkstylewidget="true"] > toolbarbutton,
           #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button,
-          #pocket-button)[cui-areatype="menu-panel"],
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button)[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button,
           #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button,
           #social-share-button, #open-file-button, #find-button, #developer-button,
           #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button,
           #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button,
           #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button,
-          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button,
-                                                #pocket-button) {
+          #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #loop-button) {
   list-style-image: var(--menupanel-list-style-image);
 }
 
@@ -1290,15 +1274,6 @@ toolbarpaletteitem[place="palette"] > #webide-button:hover {
   -moz-image-region: rect(32px, 960px, 64px, 928px);
 }
 
-#pocket-button[cui-areatype="menu-panel"],
-toolbarpaletteitem[place="palette"] > #pocket-button {
-  -moz-image-region: rect(0px, 992px, 32px, 960px);
-}
-
-#pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] {
-  -moz-image-region: rect(32px, 992px, 64px, 960px);
-}
-
 toolbaritem[sdkstylewidget="true"] > toolbarbutton {
   -moz-image-region: rect(0, 832px, 32px, 800px);
 }
@@ -3852,12 +3827,6 @@ notification[value="loop-sharing-notification"] .messageImage {
   -moz-image-region: auto;
 }
 
-#panelMenu_pocket,
-#menu_pocket,
-#BMB_pocket {
-  list-style-image: url("chrome://browser/content/pocket/panels/img/pocketmenuitem16.png");
-}
-
 /* ::::: Keyboard UI Panel ::::: */
 
 .KUI-panel {
index da83607c154b463c3aa6873952196fc8ac8cf627..265adf8473a4718473fce1a4d0b35158b0b2921e 100644 (file)
@@ -234,11 +234,6 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan
   max-width: 30em;
 }
 
-/* Bug 1164419 - increase Pocket panel size to accomidate wider Russian text. */
-panelmultiview[mainViewId=PanelUI-pocketView] > .panel-viewcontainer > .panel-viewstack > .panel-mainview:not([panelid="PanelUI-popup"]) {
-  max-width: 33em; /* standaloneSubviewWidth + 3 */
-}
-
 panelview:not([mainview]) .toolbarbutton-text,
 .cui-widget-panel toolbarbutton > .toolbarbutton-text {
   text-align: start;
@@ -249,11 +244,6 @@ panelview:not([mainview]) .toolbarbutton-text,
   padding: 0;
 }
 
-.cui-widget-panel[viewId="PanelUI-pocketView"] > .panel-arrowcontainer > .panel-arrowcontent {
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
 .cui-widget-panel.cui-widget-panelWithFooter > .panel-arrowcontainer > .panel-arrowcontent {
   padding-bottom: 0;
 }
@@ -1272,9 +1262,7 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
 #customizationui-widget-multiview > .panel-viewcontainer,
 #customizationui-widget-multiview > .panel-viewcontainer > .panel-viewstack,
 #PanelUI-panicView > .panel-subview-body,
-#PanelUI-panicView,
-#PanelUI-pocketView > .panel-subview-body,
-#PanelUI-pocketView {
+#PanelUI-panicView {
   overflow: visible;
   color: #FF9F00;
 }
@@ -1478,6 +1466,12 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
   margin-bottom: 2px;*/
 }
 
+.subviewbutton:-moz-any([image], .bookmark-item) > .toolbarbutton-icon {
+  /* This catches bookmarks, history items, and sync tabs items */
+  width: 16px;
+  height: 16px;
+}
+
 /* Disabled empty item looks too small otherwise, because it has no icon. */
 menuitem.subviewbutton[disabled]:not(.menuitem-iconic),
 /* Same for checkbox menu items, whose icons lose size due to -moz-appearance: none: */
@@ -1513,11 +1507,11 @@ menu.subviewbutton > .menu-right:-moz-locale-dir(rtl) {
 }
 
 .subviewbutton > .toolbarbutton-text {
-  -moz-padding-start: 16px;
+  padding-inline-start: 18px; /* 16px for icons plus the 2px spacing from the rule below */
 }
 
 .subviewbutton:-moz-any([image],[targetURI],.cui-withicon, .restoreallitem, .bookmark-item) > .toolbarbutton-text {
-  -moz-padding-start: 0;
+  padding-inline-start: 2px;
 }
 
 /* subviewbutton entries for social sidebars have images that come from external
diff --git a/LCARStrek/browser/error-pages.css b/LCARStrek/browser/error-pages.css
new file mode 100644 (file)
index 0000000..4df4ed9
--- /dev/null
@@ -0,0 +1,76 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+@import url("chrome://global/skin/in-content/info-pages.css");
+
+body {
+  background-size: 64px 32px;
+  background-repeat: repeat-x;
+  /* Top padding for when the window height is small.
+     Bottom padding to keep everything centered. */
+  padding: 75px 0;
+}
+
+.button-container {
+  display: flex;
+  flex-flow: row wrap;
+}
+
+.button-spacer {
+  flex: 1;
+}
+
+@media only screen and (max-width: 959px) {
+  body {
+    padding: 75px 48px;
+  }
+
+  .title {
+    background-image: none !important;
+    padding-inline-start: 0;
+    margin-inline-start: 0;
+  }
+
+  .title-text {
+    padding-top: 0;
+  }
+}
+
+@media only screen and (max-width: 640px) {
+  body {
+    justify-content: unset;
+    /* Now that everything is top-aligned, we don't need the
+     * bottom padding for centering - though it's added back
+     * when the viewport height is < 480px (see below). */
+    padding: 75px 20px 0;
+  }
+
+  .title-text {
+    padding-bottom: 0;
+    border-bottom: none;
+  }
+}
+
+@media only screen and (max-width: 480px) {
+  .button-container button {
+    /* Force buttons to display: block here to try and enforce collapsing margins */
+    display: block;
+    width: 100%;
+    margin: 0.66em 0 0;
+  }
+}
+
+/* For small window height, shift the stripes up by 10px.
+ * We could just change the background size, but that changes
+ * the angle of the stripes so just shifting up is easier. */
+@media only screen and (max-height: 480px) {
+  body {
+    background-position: 10px -10px;
+    padding-top: 38px;
+    /* We get rid of bottom padding for width < 640px, but
+     * for height < 480px a bit of space between the content
+     * and the viewport edge is nice. */
+    padding-bottom: 38px;
+  }
+}
index 005a3b9b42f18ac616b29fcfeed220433639a618..6a181143911db7265641069773755588b0627c1e 100644 (file)
   background-image: url("chrome://global/skin/reader/RM-Plus-24x24.svg");
 }
 
-#pocket-button {
-  background-image: url("chrome://global/skin/reader/pocket.svg#pocket-mark");
-}
-
-#pocket-button:hover:active {
-  background-image: url("chrome://global/skin/reader/pocket.svg#pocket-mark-added");
-}
-
 @media print {
   .toolbar {
     display: none !important;
index 902b1f87f5460e9b17aba0d0c56b77f20db7bf3f..ae8ae7fa35a26958ebb02f238dd6598627bd9c63 100644 (file)
@@ -11,8 +11,8 @@ body {
   min-height: 100vh;
   padding-top: 0;
   padding-bottom: 0;
-  -moz-padding-start: calc(48px + 4.6em);
-  -moz-padding-end: 48px;
+  padding-inline-start: calc(48px + 4.6em);
+  padding-inline-end: 48px;
   align-items: center;
   justify-content: center;
 }
@@ -31,16 +31,16 @@ body {
 
 /* Typography */
 .title {
-  background-image: url("chrome://browser/skin/aboutNetError_info.svg");
+  background-image: url("chrome://global/skin/icons/info.svg");
   background-position: left 0;
   background-repeat: no-repeat;
   background-size: 1.6em;
-  -moz-margin-start: -2.3em;
-  -moz-padding-start: 2.3em;
+  margin-inline-start: -2.3em;
+  padding-inline-start: 2.3em;
   font-size: 2.5em;
 }
 
-.title:-moz-dir(rtl) {
+.title:dir(rtl) {
   background-position: right 0;
 }
 
@@ -57,8 +57,8 @@ body {
 
   .title {
     background-image: none !important;
-    -moz-padding-start: 0;
-    -moz-margin-start: 0;
+    padding-inline-start: 0;
+    margin-inline-start: 0;
   }
 
   .title-text {
@@ -69,7 +69,7 @@ body {
 ul, ol {
   margin: 0;
   padding: 0;
-  -moz-margin-start: 1em;
+  margin-inline-start: 1em;
 }
 
 ul > li, ol > li {
@@ -90,7 +90,7 @@ ul {
 }
 
 .button-container > button:first-child {
-  -moz-margin-start: 0;
+  margin-inline-start: 0;
 }
 
 /* Trees */
index 269d8d6001e1e2579ba7f8c8e6ca40961655e1bd..698ee02cd8f75ba7c6aecdc1951304db942618a6 100644 (file)
@@ -136,10 +136,8 @@ menucaption > .menu-iconic-text {
 }
 
 .menu-iconic-icon {
-/*
   width: 16px;
   height: 16px;
-*/
 }
 
 .menu-iconic-left {
@@ -209,6 +207,11 @@ menuitem[checked="true"][disabled="true"] {
   list-style-image: url("chrome://global/skin/menu/menu-check-disabled.gif");
 }
 
+menuitem[checked="true"] .menu-iconic-icon {
+  width: auto;
+  height: auto;
+}
+
 /* ::::: radio menuitem ::::: */
 
 menuitem[checked="true"][type="radio"] {
diff --git a/LCARStrek/global/reader/pocket.svg b/LCARStrek/global/reader/pocket.svg
deleted file mode 100644 (file)
index d93fd6a..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<!-- This Source Code Form is subject to the terms of the Mozilla Public\r
-   - License, v. 2.0. If a copy of the MPL was not distributed with this\r
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->\r
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24">\r
-  <style>\r
-    use:not(:target) {\r
-      display: none;\r
-    }\r
-    use {\r
-      fill: #808080;\r
-    }\r
-    use[id$="-added"] {\r
-      fill: #ee4056;\r
-    }\r
-  </style>\r
-  <defs>\r
-    <path id="pocket-mark-shape" d="M21.901,4.204C21.642,3.484,20.956,3,20.196,3h-0.01h-1.721H3.814C3.067,3,2.385,3.474,2.119,4.179 C2.04,4.388,2,4.606,2,4.828v6.082l0.069,1.21c0.29,2.751,1.707,5.155,3.899,6.832c0.039,0.03,0.079,0.06,0.119,0.089l0.025,0.018 c1.175,0.866,2.491,1.452,3.91,1.741C10.677,20.932,11.347,21,12.013,21c0.615,0,1.232-0.057,1.839-0.171 c0.073-0.014,0.145-0.028,0.219-0.044c0.02-0.004,0.042-0.012,0.064-0.023c1.359-0.299,2.621-0.87,3.753-1.704l0.025-0.018 c0.04-0.029,0.08-0.059,0.119-0.089c2.192-1.677,3.609-4.08,3.898-6.832L22,10.91V4.828C22,4.618,21.975,4.409,21.901,4.204z M17.667,10.539l-4.704,4.547c-0.266,0.256-0.608,0.385-0.949,0.385c-0.342,0-0.684-0.129-0.949-0.385l-4.705-4.547 c-0.547-0.528-0.565-1.403-0.04-1.954c0.524-0.551,1.392-0.569,1.939-0.041l3.756,3.63l3.755-3.63 c0.547-0.528,1.415-0.51,1.939,0.04C18.231,9.136,18.213,10.011,17.667,10.539z"/>\r
-  </defs>\r
-  <use id="pocket-mark" xlink:href="#pocket-mark-shape"/>\r
-  <use id="pocket-mark-added" xlink:href="#pocket-mark-shape"/>\r
-</svg>\r