update both themes for toolkit windows changes in Mozilla 22 cycle

diff --git a/EarlyBlue/global/alerts/alert.css b/EarlyBlue/global/alerts/alert.css
index f031d13f6324bf48deb98eb3d6c790392e96bbbb..c4d94a7ce8a9b9af516883a590c8131f12cff746 100644 (file)
--- a/EarlyBlue/global/alerts/alert.css
+++ b/EarlyBlue/global/alerts/alert.css
@@ -27,6 +27,10 @@
   width: 255px;
 }
 
+.alertTextBox,
+.alertCloseBox {
+}
+
 .alertBox[orient="horizontal"] > .alertImageBox {
   -moz-margin-end: 8px;
 }
@@ -43,6 +47,7 @@
 #alertImage {
   max-width: 48px;
   max-height: 48px;
+  list-style-image: url("chrome://global/skin/alerts/notification-48.png");
 }
 
 #alertNotification[clickable="true"] {
@@ -76,3 +81,12 @@ label {
     opacity: 0;
   }
 }
+
+.alertCloseButton {
+  list-style-image: url("chrome://global/skin/icons/close-button.gif");
+  padding: 4px 2px;
+}
+
+.alertCloseButton > .toolbarbutton-text {
+  display: none;
+}

diff --git a/EarlyBlue/global/alerts/notification-48.png b/EarlyBlue/global/alerts/notification-48.png
new file mode 100644 (file)
index 0000000..8a9a3c7
Binary files /dev/null and b/EarlyBlue/global/alerts/notification-48.png differ

diff --git a/EarlyBlue/global/global.css b/EarlyBlue/global/global.css
index a231448965d2f4616c2d895d4a10b3b0561e7b7a..a800586455f98bb12e20600414e9b0e44684365e 100644 (file)
--- a/EarlyBlue/global/global.css
+++ b/EarlyBlue/global/global.css
@@ -30,12 +30,6 @@ menulist > menupopup,
   -moz-binding: url("chrome://global/skin/globalBindings.xml#menulist-compact");
 }
 
-/*
-progressmeter[mode="undetermined"] {
-  -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter-undetermined");
-}
-*/
-
 /* ::::: root elements ::::: */
 
 window,

diff --git a/EarlyBlue/global/media/TopLevelImageDocument.css b/EarlyBlue/global/media/TopLevelImageDocument.css
index 2ed8b007b4d7905a5dc9acd6e5ecf6c197e1955e..7a4dc313566e137b989c348462ffec60e27e2830 100644 (file)
--- a/EarlyBlue/global/media/TopLevelImageDocument.css
+++ b/EarlyBlue/global/media/TopLevelImageDocument.css
@@ -13,6 +13,14 @@
     color: #222;
   }
 
+  .overflowing {
+    cursor: -moz-zoom-out;
+  }
+
+  .shrinkToFit {
+    cursor: -moz-zoom-in;
+  }
+
   .completeRotation {
     transition: transform 0.3s ease 0s;
   }

diff --git a/EarlyBlue/mozapps/extensions/category-service.png b/EarlyBlue/mozapps/extensions/category-service.png
new file mode 100644 (file)
index 0000000..12cde5b
Binary files /dev/null and b/EarlyBlue/mozapps/extensions/category-service.png differ

diff --git a/EarlyBlue/mozapps/extensions/extensions.css b/EarlyBlue/mozapps/extensions/extensions.css
index 1ed94278488bade85b52e80deb169a2bd60e72a7..abd2c0e9ed3c902463bb6a7b642db58c953d6fc5 100644 (file)
--- a/EarlyBlue/mozapps/extensions/extensions.css
+++ b/EarlyBlue/mozapps/extensions/extensions.css
@@ -247,6 +247,9 @@
 #category-extension > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
 }
+#category-service > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-service.png");
+}
 #category-theme > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
 }
@@ -287,6 +290,12 @@
   background-color: #FFFFFF;
 }
 
+@media (max-width: 600px) {
+  #header-search {
+    width: 12em;
+  }
+}
+
 #header-utils-btn {
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.png");
   -moz-margin-end: 16px;

diff --git a/LCARStrek/global/alerts/alert.css b/LCARStrek/global/alerts/alert.css
index 44f905066177b6b242ca25e0f2f0166e409d64b4..193e12e7fcf3f78206fa9e80f22e32df43192aba 100644 (file)
--- a/LCARStrek/global/alerts/alert.css
+++ b/LCARStrek/global/alerts/alert.css
@@ -28,6 +28,10 @@
   width: 255px;
 }
 
+.alertTextBox,
+.alertCloseBox {
+}
+
 .alertBox[orient="horizontal"] > .alertImageBox {
   -moz-margin-end: 8px;
 }
@@ -44,6 +48,7 @@
 #alertImage {
   max-width: 48px;
   max-height: 48px;
+  list-style-image: url("chrome://global/skin/alerts/notification-48.png");
 }
 
 #alertNotification[clickable="true"] {
@@ -77,3 +82,18 @@ label {
     opacity: 0;
   }
 }
+
+.alertCloseButton {
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  -moz-image-region: rect(0, 16px, 16px, 0);
+  padding: 4px 2px;
+}
+
+.alertCloseButton > .toolbarbutton-text {
+  display: none;
+}
+
+.alertCloseButton:hover,
+.alertCloseButton:hover:active {
+  -moz-image-region: rect(0, 32px, 16px, 16px);
+}

diff --git a/LCARStrek/global/alerts/notification-48.png b/LCARStrek/global/alerts/notification-48.png
new file mode 100644 (file)
index 0000000..e8ce918
Binary files /dev/null and b/LCARStrek/global/alerts/notification-48.png differ

diff --git a/LCARStrek/global/global.css b/LCARStrek/global/global.css
index 5be3fee956cf7d393c4473752e6dc297a0db52f6..49fd787e0f99d35a54dde65d9461eb7a3d8dab5f 100644 (file)
--- a/LCARStrek/global/global.css
+++ b/LCARStrek/global/global.css
@@ -48,11 +48,6 @@ menubar {
 toolbaritem > menubar {
   -moz-binding: url("chrome://global/content/bindings/toolbar.xml#menubar");
 }
-/*
-progressmeter[mode="undetermined"] {
-  -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter-undetermined");
-}
-*/
 
 /* ::::: root elements ::::: */
 

diff --git a/LCARStrek/global/media/TopLevelImageDocument.css b/LCARStrek/global/media/TopLevelImageDocument.css
index ddc99ad0052d6242ba3edb2e25234af38da4e0f3..eddab9b1aa47179b2a4b7894ce8f016f9a9d0b9d 100644 (file)
--- a/LCARStrek/global/media/TopLevelImageDocument.css
+++ b/LCARStrek/global/media/TopLevelImageDocument.css
@@ -13,6 +13,14 @@
     color: #221500;
   }
 
+  .overflowing {
+    cursor: -moz-zoom-out;
+  }
+
+  .shrinkToFit {
+    cursor: -moz-zoom-in;
+  }
+
   .completeRotation {
     transition: transform 0.3s ease 0s;
   }

diff --git a/LCARStrek/mozapps/extensions/category-service.png b/LCARStrek/mozapps/extensions/category-service.png
new file mode 100644 (file)
index 0000000..bd0a648
Binary files /dev/null and b/LCARStrek/mozapps/extensions/category-service.png differ

diff --git a/LCARStrek/mozapps/extensions/extensions.css b/LCARStrek/mozapps/extensions/extensions.css
index 2cb6ea00e7e7b5360b18ad930a6cb4ac74100533..154fcd0897837a90411253d0f84c5e38e268aa08 100644 (file)
--- a/LCARStrek/mozapps/extensions/extensions.css
+++ b/LCARStrek/mozapps/extensions/extensions.css
@@ -259,6 +259,9 @@
 #category-extension > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
 }
+#category-service > .category-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-service.png");
+}
 #category-theme > .category-icon {
   list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
 }
@@ -300,6 +303,12 @@
   border-color: #008484;
 }
 
+@media (max-width: 600px) {
+  #header-search {
+    width: 12em;
+  }
+}
+
 #header-utils-btn {
   list-style-image: url("chrome://mozapps/skin/extensions/utilities.png");
   -moz-margin-end: 16px;

diff --git a/origdiff b/origdiff
index ea2d71b3d2c51d268e0a26bd8cce3e0b1ee3901c..f6323e8b086dc859ad3cb97ff730797baff0cd56 100755 (executable)
--- a/origdiff
+++ b/origdiff
@@ -13,7 +13,7 @@ TAG_PRE_COMM=BETA_21_END
 TAG_POST_COMM=tip #BETA_22_END
 TAG_PRE_MOZ=FIREFOX_BETA_21_END
 TAG_POST_MOZ=tip #FIREFOX_BETA_22_END
-TAG_PRE_EXT=SEAMONKEY_2_18_RELEASE
+TAG_PRE_EXT=SEAMONKEY_2_18b4_RELEASE #SEAMONKEY_2_18_RELEASE
 TAG_POST_EXT=tip #SEAMONKEY_2_19_RELEASE
 
 # ===================== process repos =====================