Merge pull request #4 from opnarius/bring-upstream

merge 1.7 upstream changes

.gitignore

@@ -47,4 +47,4 @@ jspm_packages
 .yarn-integrity
 
 # Compiled Extensions
-*.xpi
+*.xpi

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 1.7.0
+- add initial Pale Moon 28 support
+- sync statusbar styling with default
+- sync devtools styling with PM27 default
+
 ### 1.6.0
 - sync about:support styling with default
 - sync about:permissions styling with default

src/install.rdf

@@ -9,7 +9,7 @@
 
   <Description about="urn:mozilla:install-manifest">
     <em:id>[email protected]</em:id>
-    <em:version>1.6.0</em:version>
+    <em:version>1.7.0</em:version>
     <em:name>Noia Moon</em:name>
     <em:description>Theme for Pale Moon based on Noia Iconpack by Carlitus (deviantART). Fork of "Noia Fox" by David.Vincent</em:description>
     <em:creator>Pale Moon Add-Ons Team</em:creator>
@@ -23,8 +23,8 @@
       <Description>
         <!-- Pale Moon -->
         <em:id>{8de7fcbb-c55c-4fbe-bfc5-fc555c87dbc4}</em:id>
-        <em:minVersion>27.0.0b3</em:minVersion>
-        <em:maxVersion>27.*</em:maxVersion>
+        <em:minVersion>27.5.0</em:minVersion>
+        <em:maxVersion>28.*</em:maxVersion>
       </Description>
     </em:targetApplication>
 

src/theme/chrome.manifest

@@ -9,3 +9,9 @@ skin   os_special	noiamoon	chrome/noia/os_special/mac/	os=Darwin
 skin   os_special	noiamoon	chrome/noia/os_special/linux/	os=Linux
 skin   os_special	noiamoon	chrome/noia/os_special/XP/		os=WINNT osversion<6
 skin   os_special	noiamoon	chrome/noia/os_special/aero/	os=WINNT osversion>=6
+
+skin   appver	noiamoon	chrome/noia/appver/27/ appversion<28.0.0a1
+skin   appver	noiamoon	chrome/noia/appver/28/ appversion>=28.0.0a1
+
+override chrome://browser/skin/autocomplete.css chrome://global/skin/autocomplete.css
+override chrome://browser/skin/permissions/aboutPermissions.css chrome://browser/skin/preferences/aboutPermissions.css

src/theme/chrome/noia/appver/27/aboutNetworking.css

@@ -0,0 +1,60 @@
+/* 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/. */
+
+body {
+  min-width: 330px;
+  max-width: 100%;
+  min-height: 330px;
+  max-height: 100%;
+}
+
+#menu {
+  position: absolute;
+  top: 5px;
+  color: gray;
+}
+
+.warningBackground {
+  display: none;
+  background: -moz-Dialog;
+  width:100%;
+  height:100%;
+  z-index:10;
+  top:0;
+  left:0;
+  position:fixed;
+}
+
+.warningMessage {
+  color: -moz-FieldText;
+  position: relative;
+  min-width: 330px;
+  max-width: 50em;
+  margin: 4em auto;
+  border: 1px solid ThreeDShadow;
+  border-radius: 10px;
+  padding: 3em;
+  -moz-padding-start: 30px;
+  background: -moz-Field;
+  margin-left: auto;
+  text-align: center;
+}
+
+.tab {
+  display: none;
+}
+
+.active {
+  display: block;
+}
+
+#menu .selected {
+ color: blue;
+}
+
+#refreshdiv {
+  top: 5px;
+  position: absolute;
+  right: 30px;
+}

src/theme/chrome/noia/appver/27/alert.css

@@ -0,0 +1,94 @@
+/* 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/. */
+
+/* ===== alert.css =====================================================
+  == Styles specific to the alerts dialog.
+  ======================================================================= */
+
+@import url("chrome://global/skin/");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.alertBox {
+  border : 1px solid #808080;
+  border-radius: 3px;
+  background: linear-gradient(145deg, #CED2E0, #EFF2FA 40%, #CED2E0 70%);
+}
+
+.alertImageBox {
+  padding: 8px 0;
+  width: 64px;
+  -moz-border-end: 1px solid rgba(0,0,0,.1);
+}
+
+.alertTextBox {
+  padding: 8px;
+  -moz-padding-start: 16px;
+  width: 255px;
+}
+
+.alertTextBox,
+.alertCloseBox {
+  background-image: linear-gradient(rgba(255,255,255,0.2), rgba(255,255,255,0.1));
+}
+
+.alertTitle {
+  font-weight: bold;
+  font-size: 110%;
+}
+
+#alertImage {
+  max-width: 48px;
+  max-height: 48px;
+  list-style-image: url(chrome://global/skin/alerts/notification-48.png);
+}
+
+#alertNotification[clickable="true"] {
+  cursor: pointer;
+}
+
+label {
+  cursor: inherit;
+}
+
+.alertText[clickable="true"] {
+  color: #0066CC;
+  text-decoration: underline;
+}
+
+.alertText[clickable="true"]:hover:active {
+  color: #424F63;
+}
+
+#alertBox .tabs-closebutton > .toolbarbutton-icon {
+  width: 14px !important;
+  height: 14px !important;
+  margin: 0px !important;
+  padding: 0px !important;
+}
+
+@keyframes alert-animation {
+  from {
+    opacity: 0;
+  }
+  6.25% {
+    opacity: 1;
+  }
+  93.75% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+.alertCloseButton {
+  -moz-appearance: none;
+  padding: 4px 2px;
+  border: none !important;
+}
+
+.alertCloseButton > .toolbarbutton-text {
+  display: none;
+}

src/theme/chrome/noia/appver/27/config.css

@@ -0,0 +1,61 @@
+@import url(chrome://global/skin/);
+@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
+
+#config {
+  background: url(chrome://browser/skin/icons/Toolbar-Background.png) top left repeat-x #adaebb;
+}
+
+#warningScreen {
+  background: url(chrome://browser/skin/icons/box-background.png) repeat-x bottom fixed #cdced3;
+}
+
+#warningBox {
+  margin: 0 1em;
+  padding: 3em;
+  border: 1px solid #808080;
+  border-radius: 10px;
+  background: #fff;
+  box-shadow: 5px 5px 5px #404040;
+}
+
+#exclam {
+  margin-right: 3em;
+  list-style-image: url(chrome://global/skin/icons/warning-large.png);
+}
+
+#warningInnerBox {
+ max-width: 50em;
+}
+
+#warningTitle {
+  margin: 0 0 .6em 0;
+  font-size: 160%;
+  border-bottom: 1px solid #d4d0c8
+}
+
+#warningText {
+  font-size: 110%;
+  margin-left: 0;
+}
+
+#warningButton,
+#showWarningNextTime {
+  margin-top: 0.6em;
+}
+
+#textbox {
+ -moz-box-flex: 1;
+}
+
+#configTree {
+  margin: 0;
+  border: 0;
+}
+
+#configTreeBody::-moz-tree-cell-text(user) {
+  font-weight: bold;
+}
+
+#configTreeBody::-moz-tree-cell-text(locked) {
+  font-style: italic;
+}

src/theme/chrome/noia/appver/28/aboutNetworking.css

@@ -0,0 +1,123 @@
+/* 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/common.css");
+
+html {
+  height: 100%;
+}
+
+body {
+  display: flex;
+  align-items: stretch;
+  height: 100%;
+}
+
+#sectionTitle {
+  float: left;
+}
+
+#refreshDiv {
+  justify-content: flex-end;
+  margin-bottom: 0.5em;
+}
+
+#refreshButton {
+  margin-top: 0;
+}
+
+/** Categories **/
+
+.category {
+  cursor: pointer;
+  /* Center category names */
+  display: flex;
+  align-items: center;
+}
+
+.category .category-name {
+  pointer-events: none;
+}
+
+#categories hr {
+  border-top-color: rgba(255,255,255,0.15);
+}
+
+/** Warning container **/
+
+/* XXX: a lot of this is duplicated from info-pages.css since that stylesheet
+   is incompatible with this type of layout */
+.warningBackground:not([hidden]) {
+  display: flex;
+}
+
+.warningBackground {
+  flex-direction: column;
+  box-sizing: border-box;
+  min-height: 100vh;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
+  z-index: 10;
+  top: 0;
+  left: 0;
+  position: fixed;
+  background: var(--in-content-page-background);
+}
+
+.title {
+  position: relative;
+  border-bottom: 1px solid var(--in-content-box-border-color);
+  margin-bottom: 1em;
+  padding-bottom: 0.5em;
+}
+
+.title::before {
+  content: "";
+  left: -2.3em;
+  top: 0;
+  position: absolute;
+  display: block;
+  width: 1.6em;
+  height: 1.6em;
+  background: url("chrome://global/skin/icons/warning.svg") no-repeat left center;
+  background-size: 1.6em;
+}
+
+.warningBackground button {
+  margin-top: 1em;
+  margin-left: 0;
+  min-width: 100px;
+}
+
+/** Content area **/
+
+.main-content {
+  flex: 1;
+}
+
+.tab {
+  padding: 0.5em 0;
+}
+
+.tab table {
+  width: 100%;
+}
+
+th, td, table {
+  border-collapse: collapse;
+  border: none;
+  text-align: start;
+}
+
+th {
+  padding-bottom: 0.5em;
+  font-size: larger;
+}
+
+td {
+  padding-bottom: 0.25em;
+  border-bottom: 1px solid var(--in-content-box-border-color);
+}