keep up with Classic trunk development

diff --git a/EarlyBlue/communicator/bookmarks/bookmarks.css b/EarlyBlue/communicator/bookmarks/bookmarks.css
index 27801a12c79ef27ecba0d3c47698d0d67a1e2ae3..ccd608c4c9cebdfe2bbccf4dfe3c0ac619f513c1 100644 (file)
--- a/EarlyBlue/communicator/bookmarks/bookmarks.css
+++ b/EarlyBlue/communicator/bookmarks/bookmarks.css
@@ -87,10 +87,23 @@ toolbarbutton.bookmark-item > .toolbarbutton-menu-dropmarker {
   max-height: 16px;
 }
 
-treechildren:-moz-tree-twisty(group,hidetwisty) {                                                                               
+treechildren:-moz-tree-twisty(group, hidetwisty) {
   list-style-image: none;
 }
 
 treechildren:-moz-tree-image(Name, container, group) {
   list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-group.gif");
 }
+
+treechildren:-moz-tree-image(Name, separator) {
+  list-style-image: none;
+}
+
+treechildren:-moz-tree-cell-text(Name, separator) {
+  color: #808080;
+  margin: 0px 5px 0px 5px;
+}
+
+treechildren:-moz-tree-cell-text(Name, separator, selected, focus) {
+  color: #FFFFFF;
+}

diff --git a/EarlyBlue/editor/editorFormatToolbar.css b/EarlyBlue/editor/editorFormatToolbar.css
index 83ea31cb5f1d2105f234cdb2e9a3735780aace19..3a25d5f1aec3a59e00d3c03f5ac3b824f5842e56 100644 (file)
--- a/EarlyBlue/editor/editorFormatToolbar.css
+++ b/EarlyBlue/editor/editorFormatToolbar.css
@@ -247,6 +247,42 @@
   list-style-image: url("chrome://editor/content/images/undecided_n.gif"); 
 }
 
+.insert-surprise > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/surprise_n.gif");
+}
+
+.insert-kiss > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/kiss_n.gif");
+}
+
+.insert-yell > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/yell_n.gif");
+}
+
+.insert-cool > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/cool_n.gif");
+}
+
+.insert-undecided > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/undecided_n.gif");
+}
+
+.insert-money > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/money_n.gif");
+}
+
+.insert-foot > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/foot_n.gif");
+}
+
+.insert-innocent > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/innocent_n.gif");
+}
+
+.insert-sealed > .menu-iconic-left {
+  list-style-image: url("chrome://editor/content/images/sealed_n.gif");
+}
+
 /* ::::: fg/bg color picker ::::: */
 
 .ColorPickerLabel {

diff --git a/EarlyBlue/global/button.css b/EarlyBlue/global/button.css
index ceb6ba6418fd2ae4fbb7524a8c7962f26bf50759..6998d6cd9f703f9e26772f65977d5f66f694f277 100644 (file)
--- a/EarlyBlue/global/button.css
+++ b/EarlyBlue/global/button.css
@@ -74,7 +74,6 @@ button:focus > .button-box {
 
 /* .......... default state .......... */
 
-button[default] > .button-box,
 button[default="true"] > .button-box {
   font-weight: bold;
   list-style-image: url("chrome://global/skin/icons/return.gif");

diff --git a/EarlyBlue/global/filepicker.css b/EarlyBlue/global/filepicker.css
index bce2ceb528967656d4131b6e08fd067854953516..b80bd81ac83563f0e2f6314c07f59a5976c528d6 100644 (file)
--- a/EarlyBlue/global/filepicker.css
+++ b/EarlyBlue/global/filepicker.css
@@ -63,16 +63,6 @@ treechildren:-moz-tree-image(FilenameColumn, file) {
   list-style-image: url("chrome://global/skin/filepicker/file.gif");
 }
 
-/* ::::: focus rules ::::: */
-
-#directoryTree > treerows > .tree-bodybox {
-  border: 1px solid transparent;
-} 
-
-#directoryTree:focus > treerows > .tree-bodybox {
-  border-color: #000000;
-}
-
 /* ::::: button items ::::: */
 
 .up-button {
@@ -88,4 +78,4 @@ treechildren:-moz-tree-image(FilenameColumn, file) {
 .new-dir-button {
   list-style-image: url("chrome://global/skin/filepicker/folder-new.gif");
   max-width: 28px;
-}
\ No newline at end of file
+}

diff --git a/EarlyBlue/global/popup.css b/EarlyBlue/global/popup.css
index 30b09fd6104bbf3239fd0364f060ad79ebcbaf9a..22f859b2fe7508723dc6350488a1e8c5e5d5b2f7 100644 (file)
--- a/EarlyBlue/global/popup.css
+++ b/EarlyBlue/global/popup.css
@@ -66,7 +66,9 @@ tooltip {
 }
 
 tooltip[titletip="true"] {
-  margin: -2px 0px 0px -3px;
+  /* See bug 32157 comment 128
+   * margin: -2px 0px 0px -3px;
+   */
   max-width: none;
 }
 

diff --git a/EarlyBlue/global/toolbar/chevron.gif b/EarlyBlue/global/toolbar/chevron.gif
new file mode 100644 (file)
index 0000000..186aac9
Binary files /dev/null and b/EarlyBlue/global/toolbar/chevron.gif differ

diff --git a/EarlyBlue/global/tree.css b/EarlyBlue/global/tree.css
index 6b51cab714eeb3ed291d5e9986e2ce3fa0751e81..8f434c1738c50d06323c77892da506d78b892902 100644 (file)
--- a/EarlyBlue/global/tree.css
+++ b/EarlyBlue/global/tree.css
@@ -52,10 +52,24 @@ tree {
   color: #000000;   
 }
 
+/* ::::: tree focusring ::::: */
+
+/* deactivated, looks to bad for me in EarlyBlue
+.focusring > .tree-rows > .tree-bodybox {
+  border: 1px solid transparent;
+}
+
+.focusring:focus > .tree-rows > .tree-bodybox {
+  border: 1px solid #000000;
+}
+*/
+
 /* ::::: tree rows ::::: */
 
+tree[selstyle="primary"] > treechildren:-moz-tree-row,
 treechildren:-moz-tree-row {
   border: 1px solid transparent;
+  background-color: transparent;
   min-height: 18px;
   height: 1.3em;
 }
@@ -82,6 +96,7 @@ treechildren:-moz-tree-cell {
   padding: 0px 2px 0px 2px;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text,
 treechildren:-moz-tree-cell-text {
   color: inherit;
   border: 2px solid transparent;
@@ -91,12 +106,31 @@ treechildren:-moz-tree-cell-text(selected) {
   color: #FFFFFF;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, selected) {
+  background-color: #808080;
+  color: #FFFFFF;
+}
+
 treechildren:-moz-tree-cell-text(selected, focus) {
   color: #FFFFFF;
 }
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, selected, focus) {
+  background-color: #336699;
+  color: #FFFFFF;
+}
+
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, current, focus) {
+  border: 1px dotted #9999CC;
+}
+
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, selected, current, focus) {
+  border: 1px dotted #666699;
+}
+
 /* ::::: lines connecting cells ::::: */
 
+tree[selstyle="primary"] > treechildren:-moz-tree-line,
 treechildren:-moz-tree-line {
   visibility: hidden;
 }
@@ -119,6 +153,7 @@ treechildren:-moz-tree-separator {
 
 /* ::::: drop feedback ::::: */
 
+tree[selstyle="primary"] > treechildren:-moz-tree-cell-text(primary, dropOn),
 treechildren:-moz-tree-cell-text(dropOn) {
   background-color: #336699;
   color: #FFFFFF;
@@ -272,4 +307,4 @@ treechildren.gridlines:-moz-tree-cell {
 
 treechildren.gridlines:-moz-tree-row {
   border: none;
-}
\ No newline at end of file
+}

diff --git a/EarlyBlue/messenger/addressbook/addressPanes.css b/EarlyBlue/messenger/addressbook/addressPanes.css
index 33585d0c457c15629d6c210213c85e8b3ae273d9..5c795ab3bdc0b58d80502735ef600e6075111f3d 100644 (file)
--- a/EarlyBlue/messenger/addressbook/addressPanes.css
+++ b/EarlyBlue/messenger/addressbook/addressPanes.css
@@ -60,3 +60,11 @@ treechildren:-moz-tree-image(DirCol, IsRemote-true) {
 treechildren:-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
   list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.gif");
 }
+
+#dirTree [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#dirTree [sortDirection="descending"] {
+  list-style-image: none;
+}
\ No newline at end of file

diff --git a/EarlyBlue/messenger/addressingWidget.css b/EarlyBlue/messenger/addressingWidget.css
index bc855f3ee52da14fe6edfab014e0ba500157abc2..44b941a2bba2a49a93656b3b8e4a556300205f9a 100644 (file)
--- a/EarlyBlue/messenger/addressingWidget.css
+++ b/EarlyBlue/messenger/addressingWidget.css
@@ -48,7 +48,7 @@
 }  
   
 #typecol-addressingWidget {
-  width: 9em;
+  min-width: 9em;
   border-right: 1px solid #CCD0DD;
 }
 
@@ -77,4 +77,4 @@
 .person-icon {
   margin: 0px 3px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.gif");
-}
\ No newline at end of file
+}

diff --git a/EarlyBlue/messenger/filterDialog.css b/EarlyBlue/messenger/filterDialog.css
index 7d7cd9abd4edac441f444aa526b049588d282b8c..91ce4611e2cfb109aa8f6db2de70423ea9333b4a 100644 (file)
--- a/EarlyBlue/messenger/filterDialog.css
+++ b/EarlyBlue/messenger/filterDialog.css
@@ -52,3 +52,19 @@ treechildren:-moz-tree-image(activeColumn) {
 treechildren:-moz-tree-image(activeColumn, Enabled-true) {
  list-style-image: url("chrome://messenger/skin/icons/check.gif");
 }
+menulist {
+  min-width: 15em;
+}
+
+menulist > menupopup > menuitem {
+  padding-right: 2px;
+}
+
+textbox {
+  margin: 1px 4px;
+}
+
+#FilterEditor {
+  width: 560px;
+  min-height: 1px;
+}

diff --git a/EarlyBlue/messenger/folderPane.css b/EarlyBlue/messenger/folderPane.css
index 41a72d4787317ecfe1f384723e82b1375d965a3a..2a8cf8c237eb8a379d9bfb8ba7981d3c4ffc9eeb 100644 (file)
--- a/EarlyBlue/messenger/folderPane.css
+++ b/EarlyBlue/messenger/folderPane.css
@@ -209,3 +209,11 @@ treechildren:-moz-tree-image(syncCol, isServer-true) {
 #folderSizeCol {
   text-align: right;
 }
+
+#folderNameCol [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="descending"] {
+  list-style-image: none;
+}

diff --git a/EarlyBlue/messenger/messageBody.css b/EarlyBlue/messenger/messageBody.css
index 19b5848df4a9e88591dc690aaa50aaa9bfbd0c85..cbcc521dbcc89dc490e4f1e07cb47e471d7aae26 100644 (file)
--- a/EarlyBlue/messenger/messageBody.css
+++ b/EarlyBlue/messenger/messageBody.css
@@ -147,11 +147,21 @@ span.moz-smiley-s3,
 span.moz-smiley-s4,
 span.moz-smiley-s5,
 span.moz-smiley-s6,
-span.moz-smiley-s7 {
+span.moz-smiley-s7,
+span.moz-smiley-s8,
+span.moz-smiley-s9,
+span.moz-smiley-s10,
+span.moz-smiley-s11,
+span.moz-smiley-s12,
+span.moz-smiley-s13,
+span.moz-smiley-s14,
+span.moz-smiley-s15,
+span.moz-smiley-s16 {
   min-height: 17px; margin-left: 2px; margin-top: 2px;
   padding-left: 20px; 
   background-repeat: no-repeat; 
   background-position: center center;
+  -moz-user-select: all;
 }
 
 span.moz-smiley-s1 > span,
@@ -160,7 +170,16 @@ span.moz-smiley-s3 > span,
 span.moz-smiley-s4 > span,
 span.moz-smiley-s5 > span,
 span.moz-smiley-s6 > span,
-span.moz-smiley-s7 > span {
+span.moz-smiley-s7 > span,
+span.moz-smiley-s8 > span,
+span.moz-smiley-s9 > span,
+span.moz-smiley-s10 > span,
+span.moz-smiley-s11 > span,
+span.moz-smiley-s12 > span,
+span.moz-smiley-s13 > span,
+span.moz-smiley-s14 > span,
+span.moz-smiley-s15 > span,
+span.moz-smiley-s16 > span {
     display: none;
 }
 
@@ -184,4 +203,31 @@ span.moz-smiley-s6 {
 }
 span.moz-smiley-s7 {
   background-image: url(chrome://editor/content/images/undecided_n.gif);
-}
\ No newline at end of file
+}
+span.moz-smiley-s8 {
+  background-image: url("chrome://editor/content/images/surprise_n.gif");
+}
+span.moz-smiley-s9 {
+  background-image: url("chrome://editor/content/images/kiss_n.gif");
+}
+span.moz-smiley-s10 {
+  background-image: url("chrome://editor/content/images/yell_n.gif");
+}
+span.moz-smiley-s11 {
+  background-image: url("chrome://editor/content/images/cool_n.gif");
+}
+span.moz-smiley-s12 {
+  background-image: url("chrome://editor/content/images/money_n.gif");
+}
+span.moz-smiley-s13 {
+  background-image: url("chrome://editor/content/images/foot_n.gif");
+}
+span.moz-smiley-s14 {
+  background-image: url("chrome://editor/content/images/innocent_n.gif");
+}
+span.moz-smiley-s15 {
+  background-image: url("chrome://editor/content/images/cry_n.gif");
+}
+span.moz-smiley-s16 {
+  background-image: url("chrome://editor/content/images/sealed_n.gif");
+}

diff --git a/EarlyBlue/messenger/primaryToolbar.css b/EarlyBlue/messenger/primaryToolbar.css
index c7d0736f309d8e919e16cf3e7b09c59ebbd8fe5b..aef0ff3e55326d21ff1c4a8692b3235ad4be5686 100644 (file)
--- a/EarlyBlue/messenger/primaryToolbar.css
+++ b/EarlyBlue/messenger/primaryToolbar.css
@@ -137,4 +137,21 @@
 
 #button-junk[disabled="true"] {
   list-style-image: url("chrome://messenger/skin/toolbar/junk-disabled.gif") !important;
-}
\ No newline at end of file
+}
+
+#junkBarImage {
+  list-style-image: url("chrome://messenger/skin/toolbar/junk.gif");
+}
+
+#junkBarMessage {
+  font-weight: bold;
+}
+
+#junkBar {
+  border-bottom: 1px solid #669999;
+  background-color: #9999CC;
+}
+
+#junkIcon {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
+}

diff --git a/EarlyBlue/messenger/searchDialog.css b/EarlyBlue/messenger/searchDialog.css
index 70d95dac0a3f59a555a767ec618cc0b6a953058a..4c7428e382ee44473017358e27f403d2b2780683 100644 (file)
--- a/EarlyBlue/messenger/searchDialog.css
+++ b/EarlyBlue/messenger/searchDialog.css
@@ -57,3 +57,15 @@
   margin: 5px;
   height: 100px;
 }
+
+menulist {
+  min-width: 15em;
+}
+
+menulist > menupopup > menuitem {
+  padding-right: 2px;
+}
+
+textbox {
+  margin: 1px 4px;
+}

diff --git a/EarlyBlue/navigator/icons/about-popups.gif b/EarlyBlue/navigator/icons/about-popups.gif
new file mode 100644 (file)
index 0000000..fc5f681
Binary files /dev/null and b/EarlyBlue/navigator/icons/about-popups.gif differ

diff --git a/EarlyBlue/navigator/navigator.css b/EarlyBlue/navigator/navigator.css
index 6e95154df8b060778368b91888e5372670f0e02a..a10d7cd80a86758a0b1c10e76873c86bf3a89d46 100644 (file)
--- a/EarlyBlue/navigator/navigator.css
+++ b/EarlyBlue/navigator/navigator.css
@@ -264,6 +264,11 @@ toolbar[toolbarmode="small"] > toolbargrippy {
   list-style-image:url("chrome://navigator/skin/icons/popup-blocked.gif");
 }
 
+#popupImage {
+  list-style-image: url("chrome://navigator/skin/icons/about-popups.gif");
+  margin: 6px 0px;
+}
+
 /* ::::: personal toolbar ::::: */
 
 #bookmarks-button {
@@ -276,4 +281,12 @@ toolbar[toolbarmode="small"] > toolbargrippy {
 
 #home-button {
   list-style-image: url("chrome://communicator/skin/bookmarks/home.gif");
-}
\ No newline at end of file
+}
+
+toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
+}
+
+toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
+  display: none;
+}