merge browser winstripe changes up to 2011-01-23

diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css
index 2e1f35ab867fcc022068577b5dc37314f23ea7e1..9c42a58bf634b9b15e3f23f4e312a8e7605b10f2 100644 (file)
--- a/LCARStrek/browser/browser.css
+++ b/LCARStrek/browser/browser.css
@@ -158,7 +158,7 @@ menubar {
   -moz-margin-start: .5em;
 }
 
-.split-menuitem-menu {
+.splitmenu-menu {
   -moz-box-pack: end;
 }
 
@@ -328,7 +328,7 @@ toolbarbutton.bookmark-item[open="true"] {
 menu.bookmark-item,
 menuitem.bookmark-item {
   min-width: 0;
-  max-width: 26em;
+  max-width: 32em;
 }
 
 .bookmark-item > .menu-iconic-left {
@@ -395,11 +395,10 @@ menuitem.bookmark-item {
 .toolbarbutton-1 > .toolbarbutton-menubutton-button {
   min-width: 36px;
   min-height: 36px;
-  -moz-box-orient: vertical;
 }
 
-.toolbarbutton-1[type="menu-button"] {
-  -moz-box-orient: horizontal;
+.toolbarbutton-1:not([type="menu-button"]) {
+  -moz-box-orient: vertical;
 }
 
 .toolbarbutton-1,
@@ -745,6 +744,10 @@ toolbar:not([iconsize="small"])[mode="icons"] #forward-button:not([disabled="tru
 
 /* ::::: fullscreen window controls ::::: */
 
+#TabsToolbar > #window-controls {
+  -moz-margin-start: 4px;
+}
+
 #minimize-button,
 #restore-button,
 #close-button {
@@ -861,14 +864,16 @@ html|*.urlbar-input:-moz-lwtheme:-moz-placeholder,
 #urlbar-display {
   margin-top: -2px;
   margin-bottom: -2px;
-  padding-top: 3px;
-  padding-bottom: 2px;
-  -moz-padding-end: 3px;
-  color: #8050B0;
   -moz-border-end: 1px solid #9C9CFF;
   -moz-margin-end: 3px;
 }
 
+#urlbar-display {
+  margin-top: 0;
+  margin-bottom: 0;
+  color: #8050B0;
+}
+
 /* over-link in location bar */
 
 .urlbar-origin-label {
@@ -1212,14 +1217,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 }
 
 #tabbrowser-tabs[tabsontop="true"] > .tabbrowser-arrowscrollbox > scrollbox:not(:-moz-lwtheme) {
-  padding-bottom: 1px;
-  margin-bottom: -1px;
-  position: relative;
-}
-
-#tabbrowser-tabs[tabsontop="true"] > .tabbrowser-tab[selected="true"]:not(:-moz-lwtheme) {
   margin-bottom: -1px;
-  padding-bottom: 1px;
 }
 
 /* Tabs */
@@ -1664,6 +1662,10 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
   outline-offset: -3px;
 }
 
+#default-notification-icon {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
+}
+
 #geo-notification-icon {
   list-style-image: url("chrome://browser/skin/Geolocation-16.png");
 }

diff --git a/origdiff b/origdiff
index a62ca895c2654a8645993ae06e4b9a43b15adc1a..3f1a78c2007dcd7d447c7b99c1e56e56762d5475 100755 (executable)
--- a/origdiff
+++ b/origdiff
@@ -4,7 +4,7 @@ RUN_DIR=$(pwd)
 cd $(dirname "$0")
 SCRIPT_DIR=$(pwd)
 
-REPO_LIST="COMM MOZ DOMI CZ"
+REPO_LIST="COMM MOZ MOZB DOMI CZ"
 
 if [ -n "$1" ]; then
   SRC_DATE="$1"
@@ -20,6 +20,11 @@ if [ -n "$1" ]; then
   MOZ_DIR=toolkit/themes/winstripe/
   MOZ_LOG=$RUN_DIR/themelog-tkwinstripe.$SRC_DATE.$DST_DATE.log
 
+  HG_MOZB_DIR=/mnt/mozilla/hg/comm-central/mozilla
+  MOZB_HG_OPTIONS=
+  MOZB_DIR=browser/themes/winstripe/
+  MOZB_LOG=$RUN_DIR/themelog-browserwin.$SRC_DATE.$DST_DATE.log
+
   HG_DOMI_DIR=/mnt/mozilla/hg/comm-central/mozilla/extensions/inspector
   DOMI_HG_OPTIONS=
   DOMI_DIR=resources/skin/classic/