Bug 1100114 - Update about:newaddon to the new in-content style. r=Mossop
authorRichard Marti <richard.marti@gmail.com>
Fri, 03 Apr 2015 17:00:56 +0200
changeset 238541 849d9c31cfcafbb2d713911f63f10f626adc76ba
parent 238540 9ff19304694acaa389d1dc5c049534193cc11d57
child 238542 7664c46f18f2ee2fb9d62d23eec57678e39fedf5
push id12320
push userryanvm@gmail.com
push dateFri, 10 Apr 2015 16:55:13 +0000
treeherderfx-team@849d9c31cfca [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMossop
bugs1100114
milestone40.0a1
Bug 1100114 - Update about:newaddon to the new in-content style. r=Mossop
toolkit/themes/linux/mozapps/extensions/newaddon.css
toolkit/themes/linux/mozapps/jar.mn
toolkit/themes/osx/mozapps/extensions/newaddon.css
toolkit/themes/shared/extensions/newaddon.inc.css
toolkit/themes/windows/mozapps/extensions/newaddon.css
toolkit/themes/windows/mozapps/jar.mn
--- a/toolkit/themes/linux/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/linux/mozapps/extensions/newaddon.css
@@ -1,110 +1,5 @@
 /* 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/inContentUI.css");
-
-#addon-page {
-  padding: 0;
-}
-
-#addon-scrollbox {
-  overflow: auto;
-  -moz-box-orient: vertical;
-  -moz-box-flex: 1;
-}
-
-#spacer-start {
-  -moz-box-flex: 1;
-}
-
-#spacer-end {
-  -moz-box-flex: 3;
-}
-
-#addon-container {
-  overflow: visible;
-  max-width: 600px;
-  margin: 20px;
-  padding: 30px 90px;
-}
-
-#addon-info {
-  -moz-box-align: start;
-  margin: 25px 10px;
-}
-
-#icon {
-  -moz-margin-end: 10px;
-  max-width: 64px;
-  max-height: 64px;
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-}
-
-.addon-info[type="theme"] #icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
-}
-
-.addon-info[type="locale"] #icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
-}
-
-.addon-info[type="plugin"] #icon {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
-}
-
-.addon-info[type="dictionary"] #icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
-}
-
-#name {
-  font-size: 130%;
-}
-
-#author {
-  color: GrayText;
-}
-
-#location {
-  color: GrayText;
-}
-
-#warning {
-  margin-bottom: 25px;
-  -moz-box-align: start;
-}
-
-#warning-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
-  width: 16px;
-  height: 15px;
-  -moz-margin-end: 5px;
-}
-
-#allow {
-  -moz-margin-start: 84px;
-  margin-bottom: 20px;
-}
-
-#continuePanel,
-#restartPanel {
-  margin-top: 25px;
-  -moz-box-pack: end;
-  -moz-box-align: end;
-}
-
-#continuePanel {
-  -moz-box-pack: end;
-}
-
-#restartMessage {
-  text-align: right;
-}
-
-#restartSpacer {
-  -moz-box-flex: 1;
-}
-
-#later {
-  color: GrayText;
-}
+%include ../../../shared/extensions/newaddon.inc.css
--- a/toolkit/themes/linux/mozapps/jar.mn
+++ b/toolkit/themes/linux/mozapps/jar.mn
@@ -15,17 +15,17 @@ toolkit.jar:
 + skin/classic/mozapps/extensions/category-available.png   (extensions/category-available.png)
 + skin/classic/mozapps/extensions/extensionGeneric.png     (extensions/extensionGeneric.png)
 + skin/classic/mozapps/extensions/extensionGeneric-16.png  (extensions/extensionGeneric-16.png)
 + skin/classic/mozapps/extensions/dictionaryGeneric.png    (extensions/dictionaryGeneric.png)
 + skin/classic/mozapps/extensions/dictionaryGeneric-16.png (extensions/dictionaryGeneric-16.png)
 + skin/classic/mozapps/extensions/themeGeneric.png         (extensions/themeGeneric.png)
 + skin/classic/mozapps/extensions/themeGeneric-16.png      (extensions/themeGeneric-16.png)
 + skin/classic/mozapps/extensions/localeGeneric.png        (extensions/localeGeneric.png)
-+ skin/classic/mozapps/extensions/newaddon.css             (extensions/newaddon.css)
+* skin/classic/mozapps/extensions/newaddon.css             (extensions/newaddon.css)
 + skin/classic/mozapps/extensions/selectAddons.css         (extensions/selectAddons.css)
 + skin/classic/mozapps/passwordmgr/key-16.png              (passwordmgr/key-16.png)
 + skin/classic/mozapps/passwordmgr/key-64.png              (passwordmgr/key-64.png)
 + skin/classic/mozapps/plugins/pluginGeneric.png           (plugins/pluginGeneric.png)
 + skin/classic/mozapps/plugins/pluginBlocked.png           (plugins/pluginBlocked.png)
 + skin/classic/mozapps/plugins/pluginGeneric-16.png        (plugins/pluginGeneric-16.png)
 + skin/classic/mozapps/profile/profileicon.png             (profile/profileicon.png)
 + skin/classic/mozapps/viewsource/viewsource.css           (viewsource/viewsource.css)
--- a/toolkit/themes/osx/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/osx/mozapps/extensions/newaddon.css
@@ -1,112 +1,5 @@
 /* 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/. */
 
-%include ../../global/shared.inc
-
-@import url("chrome://global/skin/inContentUI.css");
-
-#addon-page {
-  padding: 0;
-}
-
-#addon-scrollbox {
-  overflow: auto;
-  -moz-box-orient: vertical;
-  -moz-box-flex: 1;
-}
-
-#spacer-start {
-  -moz-box-flex: 1;
-}
-
-#spacer-end {
-  -moz-box-flex: 3;
-}
-
-#addon-container {
-  overflow: visible;
-  max-width: 600px;
-  margin: 20px;
-  padding: 30px 90px;
-}
-
-#addon-info {
-  -moz-box-align: start;
-  margin: 25px 10px;
-}
-
-#icon {
-  -moz-margin-end: 10px;
-  max-width: 64px;
-  max-height: 64px;
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-}
-
-.addon-info[type="theme"] #icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
-}
-
-.addon-info[type="locale"] #icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
-}
-
-.addon-info[type="plugin"] #icon {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
-}
-
-.addon-info[type="dictionary"] #icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
-}
-
-#name {
-  font-size: 130%;
-}
-
-#author {
-  color: GrayText;
-}
-
-#location {
-  color: GrayText;
-}
-
-#warning {
-  margin-bottom: 25px;
-  -moz-box-align: start;
-}
-
-#warning-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
-  width: 16px;
-  height: 15px;
-  -moz-margin-end: 5px;
-}
-
-#allow {
-  -moz-margin-start: 84px;
-  margin-bottom: 20px;
-}
-
-#continuePanel,
-#restartPanel {
-  margin-top: 25px;
-  -moz-box-align: center;
-  -moz-box-pack: end;
-}
-
-#continuePanel {
-  -moz-box-pack: end;
-}
-
-#restartMessage {
-  text-align: right;
-}
-
-#restartSpacer {
-  -moz-box-flex: 1;
-}
-
-#later {
-  color: GrayText;
-}
+%include ../../../shared/extensions/newaddon.inc.css
copy from toolkit/themes/windows/mozapps/extensions/newaddon.css
copy to toolkit/themes/shared/extensions/newaddon.inc.css
--- a/toolkit/themes/windows/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/shared/extensions/newaddon.inc.css
@@ -1,16 +1,17 @@
+%if 0
 /* 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/inContentUI.css");
+%endif
+@import url("chrome://global/skin/in-content/common.css");
 
 #addon-page {
-  padding: 0;
+  font-size: 1.1em;
 }
 
 #addon-scrollbox {
   overflow: auto;
   -moz-box-orient: vertical;
   -moz-box-flex: 1;
 }
 
@@ -19,27 +20,28 @@
 }
 
 #spacer-end {
   -moz-box-flex: 3;
 }
 
 #addon-container {
   overflow: visible;
-  max-width: 600px;
+  max-width: 800px;
   margin: 20px;
   padding: 30px 90px;
 }
 
 #addon-info {
   -moz-box-align: start;
   margin: 25px 10px;
 }
 
 #icon {
+  margin-top: 8px;
   -moz-margin-end: 10px;
   max-width: 64px;
   max-height: 64px;
   list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
 }
 
 .addon-info[type="theme"] #icon {
   list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
@@ -73,16 +75,17 @@
   margin-bottom: 25px;
   -moz-box-align: start;
 }
 
 #warning-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
   width: 16px;
   height: 15px;
+  margin-top: 5px;
   -moz-margin-end: 5px;
 }
 
 #allow {
   -moz-margin-start: 84px;
   margin-bottom: 20px;
 }
 
--- a/toolkit/themes/windows/mozapps/extensions/newaddon.css
+++ b/toolkit/themes/windows/mozapps/extensions/newaddon.css
@@ -1,110 +1,5 @@
 /* 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/inContentUI.css");
-
-#addon-page {
-  padding: 0;
-}
-
-#addon-scrollbox {
-  overflow: auto;
-  -moz-box-orient: vertical;
-  -moz-box-flex: 1;
-}
-
-#spacer-start {
-  -moz-box-flex: 1;
-}
-
-#spacer-end {
-  -moz-box-flex: 3;
-}
-
-#addon-container {
-  overflow: visible;
-  max-width: 600px;
-  margin: 20px;
-  padding: 30px 90px;
-}
-
-#addon-info {
-  -moz-box-align: start;
-  margin: 25px 10px;
-}
-
-#icon {
-  -moz-margin-end: 10px;
-  max-width: 64px;
-  max-height: 64px;
-  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
-}
-
-.addon-info[type="theme"] #icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
-}
-
-.addon-info[type="locale"] #icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
-}
-
-.addon-info[type="plugin"] #icon {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
-}
-
-.addon-info[type="dictionary"] #icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
-}
-
-#name {
-  font-size: 130%;
-}
-
-#author {
-  color: GrayText;
-}
-
-#location {
-  color: GrayText;
-}
-
-#warning {
-  margin-bottom: 25px;
-  -moz-box-align: start;
-}
-
-#warning-icon {
-  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
-  width: 16px;
-  height: 15px;
-  -moz-margin-end: 5px;
-}
-
-#allow {
-  -moz-margin-start: 84px;
-  margin-bottom: 20px;
-}
-
-#continuePanel,
-#restartPanel {
-  margin-top: 25px;
-  -moz-box-pack: end;
-  -moz-box-align: center;
-}
-
-#continuePanel {
-  -moz-box-pack: end;
-}
-
-#restartMessage {
-  text-align: right;
-}
-
-#restartSpacer {
-  -moz-box-flex: 1;
-}
-
-#later {
-  color: GrayText;
-}
+%include ../../../shared/extensions/newaddon.inc.css
--- a/toolkit/themes/windows/mozapps/jar.mn
+++ b/toolkit/themes/windows/mozapps/jar.mn
@@ -39,17 +39,17 @@ toolkit.jar:
         skin/classic/mozapps/extensions/stripes-error.png          (extensions/stripes-error.png)
         skin/classic/mozapps/extensions/stripes-info-positive.png  (extensions/stripes-info-positive.png)
         skin/classic/mozapps/extensions/stripes-info-negative.png  (extensions/stripes-info-negative.png)
         skin/classic/mozapps/extensions/alerticon-warning.png      (extensions/alerticon-warning.png)
         skin/classic/mozapps/extensions/alerticon-error.png        (extensions/alerticon-error.png)
         skin/classic/mozapps/extensions/alerticon-info-positive.png (extensions/alerticon-info-positive.png)
         skin/classic/mozapps/extensions/alerticon-info-negative.png (extensions/alerticon-info-negative.png)
         skin/classic/mozapps/extensions/eula.css                   (extensions/eula.css)
-        skin/classic/mozapps/extensions/newaddon.css               (extensions/newaddon.css)
+*       skin/classic/mozapps/extensions/newaddon.css               (extensions/newaddon.css)
         skin/classic/mozapps/handling/handling.css                 (handling/handling.css)
         skin/classic/mozapps/passwordmgr/key.png                   (passwordmgr/key.png)
         skin/classic/mozapps/passwordmgr/key-16.png                (passwordmgr/key-16.png)
         skin/classic/mozapps/passwordmgr/key-64.png                (passwordmgr/key-64.png)
 #ifdef MOZ_PLACES
         skin/classic/mozapps/places/defaultFavicon.png             (places/defaultFavicon.png)
 #endif
         skin/classic/mozapps/formautofill/requestAutocomplete.css  (../../shared/formautofill/requestAutocomplete.css)