update to current trunk

diff --git a/EarlyBlue/global/autocomplete.css b/EarlyBlue/global/autocomplete.css
index 8a1e4bfd283edd4d624525de6f2f3520b7396bb5..abc327a19e21f68c81804b37259daf68d09f1de2 100644 (file)
--- a/EarlyBlue/global/autocomplete.css
+++ b/EarlyBlue/global/autocomplete.css
@@ -77,10 +77,6 @@ textbox.padded {
   background-color: #9999CC;
 }
 
   background-color: #9999CC;
 }
 

-.autocomplete-history-dropmarker[enablehistory="true"] {
-  -moz-binding: url("chrome://global/skin/globalBindings.xml#history-dropmarker")
-}
-

 .autocomplete-history-dropmarker[open="true"] {
   border: 1px inset #CCD0DD;
   padding: 2px 0px 0px 2px;
 .autocomplete-history-dropmarker[open="true"] {
   border: 1px inset #CCD0DD;
   padding: 2px 0px 0px 2px;

diff --git a/EarlyBlue/global/globalBindings.xml b/EarlyBlue/global/globalBindings.xml
index 63d2aede0368cc387aaf02cb8bcd0edd46656f48..1c8166c81ed75876e1c84d71e1b6017098f5f980 100644 (file)
--- a/EarlyBlue/global/globalBindings.xml
+++ b/EarlyBlue/global/globalBindings.xml
@@ -13,7 +13,7 @@
           <xul:image class="radio-check" xbl:inherits="selected,checked,disabled"/>
         </xul:hbox>
       </xul:hbox>
           <xul:image class="radio-check" xbl:inherits="selected,checked,disabled"/>
         </xul:hbox>
       </xul:hbox>

-      <xul:hbox class="radio-label-box" flex="1">
+      <xul:hbox class="radio-label-box" align="center" flex="1">

         <xul:image class="radio-icon" xbl:inherits="src"/>
         <xul:label class="radio-label" xbl:inherits="xbl:text=label,accesskey,crop" flex="1"/>
       </xul:hbox>
         <xul:image class="radio-icon" xbl:inherits="src"/>
         <xul:label class="radio-label" xbl:inherits="xbl:text=label,accesskey,crop" flex="1"/>
       </xul:hbox>

diff --git a/EarlyBlue/mozapps/downloads/buttons.png b/EarlyBlue/mozapps/downloads/buttons.png
index 0527d4c9e9e2a6f8e6a205d5d92c5bfc80081f5e..b513a86c389e580db5ffabeb4668df43a6d5b07c 100644 (file)
Binary files a/EarlyBlue/mozapps/downloads/buttons.png and b/EarlyBlue/mozapps/downloads/buttons.png differ

diff --git a/EarlyBlue/mozapps/downloads/downloads.css b/EarlyBlue/mozapps/downloads/downloads.css
index feab5f42c2c8ab932ea7a5a68b81589a4a9d8eab..8da29166c26603996481510d43cf72f315346730 100644 (file)
--- a/EarlyBlue/mozapps/downloads/downloads.css
+++ b/EarlyBlue/mozapps/downloads/downloads.css
@@ -46,13 +46,16 @@ richlistitem[type="download"] .dateTime {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 .pause {
   -moz-image-region: rect(0px, 32px, 16px, 16px);
 }
 .pause {

-  -moz-image-region: rect(32px, 32px, 48px, 16px);
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+.pause[disabled="true"] {
+  -moz-image-region: rect(16px, 48px, 16px, 32px);

 }
 .resume {
 }
 .resume {

-  -moz-image-region: rect(16px, 48px, 32px, 32px);
+  -moz-image-region: rect(0px, 16px, 16px, 0px);

 }
 .retry {
 }
 .retry {

-  -moz-image-region: rect(0px, 48px, 16px, 32px);
+  -moz-image-region: rect(0px, 64px, 16px, 48px);

 }
 
 .blockedIcon {
 }
 
 .blockedIcon {

diff --git a/EarlyBlue/mozapps/extensions/eula.css b/EarlyBlue/mozapps/extensions/eula.css
new file mode 100644 (file)
index 0000000..f81f45d
--- /dev/null
+++ b/EarlyBlue/mozapps/extensions/eula.css
@@ -0,0 +1,16 @@
+#heading {
+  font-size: 120%;
+}
+
+#scrollbox {
+  overflow-y: auto;
+  background-color: #CCD0DD;
+  border: 1px solid #9999CC;
+  margin: 1em 0 1em 0;
+  padding: 5px;
+}
+
+#eula {
+  font-family: monospace;
+  white-space: -moz-pre-wrap;
+}

diff --git a/EarlyBlue/mozapps/extensions/extensionIcons.png b/EarlyBlue/mozapps/extensions/extensionIcons.png
new file mode 100644 (file)
index 0000000..9ab11db
Binary files /dev/null and b/EarlyBlue/mozapps/extensions/extensionIcons.png differ

diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css
index 7084e2480b32f8d0588af29c086a02251b053be6..0a3a85a53e3a829f94e2a1a4dcdd6d0f033e766b 100644 (file)
--- a/EarlyBlue/mozapps/extensions/extensions.css
+++ b/EarlyBlue/mozapps/extensions/extensions.css
@@ -259,6 +259,139 @@ richlistitem[opType="needs-uninstall"] .notifyBadge {
   display: none;
 }
 
   display: none;
 }
 

+.addon-search-details {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 0;
+}
+
+.addonThumbnailContainer {
+  background-color: #CCD0DD;
+  padding: 5px;
+  border: 1px solid #9999CC;
+  width: 135px;
+  min-height: 104px;
+  -moz-margin-end: 5px;
+}
+
+.addonMissingThumbnail {
+  color: GrayText;
+}
+
+.addonFailure {
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://mozapps/skin/extensions/notifyBadges.png");
+}
+
+.addonRating {
+  display: none;
+}
+
+.addonLearnMore {
+  margin-top: 4px;
+  margin-bottom: 4px;
+}
+
+.addonRating[rating] {
+  display: -moz-box;
+  width: 68px;
+  height: 12px;
+  list-style-image: url("chrome://mozapps/skin/extensions/ratings.png");
+}
+
+.addonRating[rating="0"] {
+  -moz-image-region: rect(0px 68px 12px 0px);
+}
+
+.addonRating[rating="1"], .addonRating[rating="2"] {
+  -moz-image-region: rect(12px 68px 24px 0px);
+}
+
+.addonRating[rating="3"], .addonRating[rating="4"] {
+  -moz-image-region: rect(24px 68px 36px 0px);
+}
+
+.addonRating[rating="5"], .addonRating[rating="6"] {
+  -moz-image-region: rect(36px 68px 48px 0px);
+}
+
+.addonRating[rating="7"], .addonRating[rating="8"] {
+  -moz-image-region: rect(48px 68px 60px 0px);
+}
+
+.addonRating[rating="9"], .addonRating[rating="10"] {
+  -moz-image-region: rect(60px 68px 72px 0px);
+}
+
+.addonType image {
+  -moz-margin-start: 6px;
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionIcons.png");
+  width: 16px;
+  height: 16px;
+}
+
+.addonTypeExtension image {
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+.addonTypeTheme image {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+vbox[typeName="status"][type="search-failure"],
+vbox[typeName="status"][type="recommended-failure"],
+vbox[typeName="status"][type="message-norecommended"],
+vbox[typeName="status"][type="message-nosearchresults"],
+vbox[typeName="status"][type="retrieve-search"],
+vbox[typeName="status"][type="retrieve-recommended"] {
+  margin-top: 2em;
+}
+
+vbox[typeName="status"][type="footer-recommended"],
+vbox[typeName="status"][type="footer-search"] {
+  margin-top: 1em;
+}
+
+vbox[typeName="status"][type="header-recommended"] {
+  font-size: 150%;
+  background: #CCD0DD;
+}
+
+#searchbox {
+  list-style-image: url("chrome://mozapps/skin/extensions/searchIcons.png");
+  -moz-image-region: rect(0px 19px 19px 0px);
+  padding: 0;
+}
+
+.searchbox-search, .searchbox-cancel {
+  -moz-appearance: none;
+  cursor: pointer;
+  margin: 0;
+  border: 0;
+  padding: 0;
+  width: 19px;
+  height: 19px;
+  min-width: 19px;
+}
+
+.searchbox-search .button-box,
+.searchbox-cancel .button-box {
+  border: 0px;
+  padding: 0px;
+}
+
+.searchbox-search {
+  list-style-image: url("chrome://mozapps/skin/extensions/searchIcons.png");
+  -moz-image-region: rect(0px 38px 19px 19px);
+}
+
+.searchbox-cancel {
+  list-style-image: url("chrome://mozapps/skin/extensions/searchIcons.png");
+  -moz-image-region: rect(0px 57px 19px 38px);
+}
+

 #progressBox {
   padding: 5px 5px 5px 5px;
 }
 #progressBox {
   padding: 5px 5px 5px 5px;
 }


@@ -277,8 +410,8 @@ richlistitem[opType="needs-uninstall"] .notifyBadge {
 }
 
 #viewGroup radio {
 }
 
 #viewGroup radio {

-  margin: 0px 1px 0px 1px;
-  padding: 1px 3px 1px 3px;
+  margin: 0px;
+  padding: 1px 3px;

   min-width: 4.5em;
   list-style-image: url("chrome://mozapps/skin/extensions/viewButtons.png");
   border: 1px solid transparent;
   min-width: 4.5em;
   list-style-image: url("chrome://mozapps/skin/extensions/viewButtons.png");
   border: 1px solid transparent;


@@ -290,6 +423,7 @@ richlistitem[opType="needs-uninstall"] .notifyBadge {
 
 #viewGroup radio[selected="true"] {
   border: 1px inset #CCD0DD;
 
 #viewGroup radio[selected="true"] {
   border: 1px inset #CCD0DD;

+  background-color: #DDDDDD;

 }
 
 .viewButtonIcon {
 }
 
 .viewButtonIcon {


@@ -321,6 +455,10 @@ radio#installs-view {
   -moz-image-region: rect(0px, 192px, 32px, 160px)
 }
 
   -moz-image-region: rect(0px, 192px, 32px, 160px)
 }
 

+radio#search-view {
+  -moz-image-region: rect(0px, 224px, 32px, 192px)
+}
+

 /* Update view checkbox */
 .includeUpdate {
   -moz-user-focus: none;
 /* Update view checkbox */
 .includeUpdate {
   -moz-user-focus: none;

diff --git a/EarlyBlue/mozapps/extensions/ratings.png b/EarlyBlue/mozapps/extensions/ratings.png
new file mode 100644 (file)
index 0000000..1d8222a
Binary files /dev/null and b/EarlyBlue/mozapps/extensions/ratings.png differ

diff --git a/EarlyBlue/mozapps/extensions/searchIcons.png b/EarlyBlue/mozapps/extensions/searchIcons.png
new file mode 100644 (file)
index 0000000..82259b8
Binary files /dev/null and b/EarlyBlue/mozapps/extensions/searchIcons.png differ

diff --git a/EarlyBlue/mozapps/extensions/viewButtons.png b/EarlyBlue/mozapps/extensions/viewButtons.png
index 12efb54f84a1b005638c99779312d9d2e31d98f5..b8585ba2c3c6914169f4329140081dd73edcbd52 100644 (file)
Binary files a/EarlyBlue/mozapps/extensions/viewButtons.png and b/EarlyBlue/mozapps/extensions/viewButtons.png differ

diff --git a/EarlyBlue/mozapps/handling/handling.css b/EarlyBlue/mozapps/handling/handling.css
index 5c413f3d65ae6e428bde3a4ec0066205ae3c6a75..441ff04a53f50bd617483b3bfdf48cd4de2b6b49 100644 (file)
--- a/EarlyBlue/mozapps/handling/handling.css
+++ b/EarlyBlue/mozapps/handling/handling.css
@@ -5,6 +5,7 @@
 
 richlistitem[type] {
   min-height: 36px; /* Don't forget to update the richlistbox height! */
 
 richlistitem[type] {
   min-height: 36px; /* Don't forget to update the richlistbox height! */

+  -moz-padding-start: 2px;

 }
 
 richlistitem {
 }
 
 richlistitem {


@@ -15,3 +16,11 @@ richlistbox {
   /* 3 items high, plus 4px for top and bottom margins, less 2px for border */
   min-height: 110px; 
 }
   /* 3 items high, plus 4px for top and bottom margins, less 2px for border */
   min-height: 110px; 
 }

+
+.name {
+  font-weight: bold;
+}
+
+.description {
+  color: #808080;
+}

diff --git a/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css b/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css
index 7ffd0040d68681f54f6c575d006c25a6ed16fff1..41f38b7dbe1966f8f4973b0948df5402b2b18061 100644 (file)
--- a/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css
+++ b/EarlyBlue/mozapps/xpinstall/xpinstallConfirm.css
@@ -1,10 +1,19 @@
+#xpinstallheader {
+  margin-bottom: 2em;
+}
+

 #itemList {
 #itemList {

-  margin: 10px 4px 10px 4px;
+  margin: 3px 4px 10px 4px;
+  height: 14em;

   border: 1px inset #CCD0DD;
   background-color: #FFFFFF;
   color: #000000;
 }
 
   border: 1px inset #CCD0DD;
   background-color: #FFFFFF;
   color: #000000;
 }
 

+#itemWarningIntro {
+  -moz-margin-start: 8px;
+}
+

 #dialogContentBox {
   padding: 5px;
 }
 #dialogContentBox {
   padding: 5px;
 }


@@ -18,8 +27,14 @@ installitem {
   margin-bottom: 5px;
 }
 
   margin-bottom: 5px;
 }
 

+.alert-icon {
+  -moz-margin-end: 20px;
+}
+

 .warning {
   font-weight: bold;
 .warning {
   font-weight: bold;

+  font-size: 1.25em;
+  margin-bottom: 1em;

 }
 
 .xpinstallItemIcon {
 }
 
 .xpinstallItemIcon {


@@ -36,23 +51,19 @@ installitem {
 
 .xpinstallItemSigned {
   font-style: italic;
 
 .xpinstallItemSigned {
   font-style: italic;

-}
-
-.xpinstallItemSigned[signed=false] {
-  color: #ED1C24;
-  font-style: normal;
-  font-weight: bold;
-}
-
-.xpinstallItemNameRow {
-  padding-bottom: 3px;
+  font-size: 0.9em;

 }
 
 .xpinstallItemURL {
   -moz-appearance: none;
   border: none;
 }
 
 .xpinstallItemURL {
   -moz-appearance: none;
   border: none;

+  padding: 0;

   background-color: #FFFFFF;
   color: #000000;
   background-color: #FFFFFF;
   color: #000000;

+  margin-top: 1px;
+  margin-bottom: 1px;
+  -moz-margin-start: 6px;
+  -moz-margin-end: 5px;

 }
 
 .xpinstallItemIcon {
 }
 
 .xpinstallItemIcon {