From: robert <robert>
Date: Sat, 30 Jul 2005 17:33:17 +0000 (+0000)
Subject: sync LCARStrek with recent EarlyBlue changes and Classic trunk
X-Git-Tag: EarlyBlue-2.0a1~49
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=57d23eaef3f5e5538c6125d5634613fba2555e5c;p=themes.git

sync LCARStrek with recent EarlyBlue changes and Classic trunk
---

diff --git a/LCARStrek/communicator/button.css b/LCARStrek/communicator/button.css
index d8591694..e1febe12 100644
--- a/LCARStrek/communicator/button.css
+++ b/LCARStrek/communicator/button.css
@@ -56,7 +56,8 @@
 
 .toolbarbutton-1,
 .toolbarbutton-1 > .toolbarbutton-menubutton-button,
-.toolbarbutton-1[disabled="true"]:hover:active {
+.toolbarbutton-1[disabled="true"]:hover:active,
+.toolbarbutton-1[disabled="true"]:hover:active > .toolbarbutton-menubutton-button {
   padding: 1px;
 }
 
diff --git a/LCARStrek/communicator/formatting.css b/LCARStrek/communicator/formatting.css
index b87c06ae..208d08cf 100644
--- a/LCARStrek/communicator/formatting.css
+++ b/LCARStrek/communicator/formatting.css
@@ -45,12 +45,12 @@
 
 .text-link:focus {
   color: red;
-  -moz-outline: 1px dotted invert;
+  outline: 1px dotted invert;
 }
 
 .text-link:hover {
   cursor: pointer;
-} 
+}
 
 .text-link:hover:active {
   color: red;
diff --git a/LCARStrek/communicator/cookie/status-cookie.gif b/LCARStrek/communicator/permissions/status-cookie.gif
similarity index 100%
rename from LCARStrek/communicator/cookie/status-cookie.gif
rename to LCARStrek/communicator/permissions/status-cookie.gif
diff --git a/LCARStrek/communicator/cookie/taskbar-cookie.gif b/LCARStrek/communicator/permissions/taskbar-cookie.gif
similarity index 100%
rename from LCARStrek/communicator/cookie/taskbar-cookie.gif
rename to LCARStrek/communicator/permissions/taskbar-cookie.gif
diff --git a/LCARStrek/editor/editor.css b/LCARStrek/editor/editor.css
index b6222640..f35cf2e4 100644
--- a/LCARStrek/editor/editor.css
+++ b/LCARStrek/editor/editor.css
@@ -13,7 +13,7 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
  *   Robert Kaiser <KaiRo@KaiRo.at>
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
@@ -36,21 +36,20 @@
  * ***** END LICENSE BLOCK ***** */
 
 @import url(chrome://communicator/skin/);
-@import url(chrome://communicator/skin/sidebar/sidebar.css);
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-#content-frame { 
-  min-width: 10px; 
+#content-frame {
+  min-width: 10px;
   min-height: 10px;
   height: 400px;
-} 
+}
 
 .source-editor,
 .source-editor:focus {
   margin: 0px 5px 5px 0px;
   border: 0px;
-  /* Scroll bars are in content, 
+  /* Scroll bars are in content,
      so we can't use right and bottom padding! */
   padding: 5px 0px 0px 5px;
 }
@@ -64,7 +63,7 @@
 
 #appcontent {
 }
- 
+
 #ContentWindowDeck {
 }
 
diff --git a/LCARStrek/global/netError.css b/LCARStrek/global/netError.css
new file mode 100644
index 00000000..4acba0d5
--- /dev/null
+++ b/LCARStrek/global/netError.css
@@ -0,0 +1,100 @@
+/*
+ *  This defines the look-and-feel styling of the error pages.
+ *  (see: netError.xhtml)
+ *
+ *  Original styling by William Price <bugzilla@mob.rice.edu>
+ *  Updated by: Steven Garrity <steven@silverorange.com>
+ *              Henrik Skupin  <mozilla@hskupin.info>
+ */
+
+html {
+  background: #000000;
+}
+
+body {
+  margin: 0;
+  padding: 0 1em;
+  color: #FF9F00;
+  font: 12px helvetica,arial,tahoma,sans-serif;
+}
+
+h1 {
+  margin: 0 0 .6em 0;
+  border-bottom: 1px solid #008484;
+  font-size: 160%;
+}
+
+ul, ol {
+  margin: 0;
+  -moz-margin-start: 1.5em;
+  padding: 0;
+}
+
+ul > li, ol > li {
+  margin-bottom: .5em;
+}
+
+ul {
+  list-style: square;
+}
+
+#errorPageContainer {
+  position: relative;
+  min-width: 13em;
+  max-width: 52em;
+  margin: 4em auto;
+  border: 1px solid #9C9FFF;
+  -moz-border-radius: 10px;
+  padding: 3em;
+  -moz-padding-start: 30px;
+  background: url("chrome://global/skin/icons/alert-exclam.gif") left 0 no-repeat #000000;
+  -moz-background-origin: content;
+}
+
+body[dir="rtl"] #errorPageContainer {
+  background-position: right 0;
+}
+
+#errorTitle {
+  -moz-margin-start: 64px;
+}
+
+#errorLongContent {
+  -moz-margin-start: 64px;
+}
+
+#errorShortDesc > p {
+  border-bottom: 1px solid #008484;
+  padding-bottom: 1em;
+  font-size: 130%;
+}
+
+#errorLongDesc {
+  -moz-padding-end: 3em;
+  font-size: 110%;
+}
+
+#errorLongDesc > p {
+}
+
+#errorTryAgain {
+  margin-top: 2em;
+  -moz-margin-start: 64px;
+}
+
+#brand {
+  position: absolute;
+  right: 0;
+  bottom: -1.5em;
+  -moz-margin-end: 10px;
+  opacity: .4;
+}
+
+body[dir="rtl"] #brand {
+  right: auto;
+  left: 0;
+}
+
+#brand > p {
+  margin: 0;
+}
diff --git a/LCARStrek/global/tabbox.css b/LCARStrek/global/tabbox.css
index b642b549..119c0c0e 100644
--- a/LCARStrek/global/tabbox.css
+++ b/LCARStrek/global/tabbox.css
@@ -97,7 +97,7 @@ tab:hover:active {
 }
 
 tab:focus > .tab-middle {
-  -moz-outline: 1px dotted invert;
+  outline: 1px dotted invert;
 }
 
 /*
diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css
index 39bc93bd..2e29c55b 100644
--- a/LCARStrek/global/toolbarbutton.css
+++ b/LCARStrek/global/toolbarbutton.css
@@ -169,6 +169,11 @@ toolbarbutton[type="menu-button"][open="true"] > toolbarbutton.toolbarbutton-men
   padding: 2px 0px 0px 2px !important;
 }
 
+toolbarbutton[disabled="true"] > toolbarbutton.toolbarbutton-menubutton-button,
+toolbarbutton[disabled="true"]:hover:active > toolbarbutton.toolbarbutton-menubutton-button {
+  padding: 1px !important;
+}
+
 /* .......... dropmarker .......... */
 
 .toolbarbutton-menubutton-dropmarker {
diff --git a/LCARStrek/messenger/accountManage.css b/LCARStrek/messenger/accountManage.css
index 5ec7663f..da8e0b96 100644
--- a/LCARStrek/messenger/accountManage.css
+++ b/LCARStrek/messenger/accountManage.css
@@ -13,7 +13,7 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
  *   Robert Kaiser <KaiRo@KaiRo.at>
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
@@ -61,3 +61,17 @@
 treechildren::-moz-tree-cell-text(isDefaultServer-true) {
   font-weight: bold;
 }
+
+/* ::::: SMTP Server Panel :::::: */
+
+.smtpServerListItem {
+  padding-left: 3px;
+}
+
+#backgroundBox {
+  background-color: #CCD0DD;
+}
+
+#smtpServerInfoBox textbox {
+  background-color: transparent;
+}
diff --git a/LCARStrek/messenger/addressingWidget.css b/LCARStrek/messenger/addressingWidget.css
index e2f241d2..7c1ce1ae 100644
--- a/LCARStrek/messenger/addressingWidget.css
+++ b/LCARStrek/messenger/addressingWidget.css
@@ -38,20 +38,24 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* ::::: addressing widget ::::: */
-  
+
 #addressingWidget {
 /*  height: 80px; */
   margin-left: 0px;
   margin-right: 0px;
   -moz-user-focus: none;
   width: 0px;
-}  
-  
+}
+
+.textbox-addressingWidget[noMatchesFound="true"] {
+  color: red;
+}
+
 #typecol-addressingWidget {
   min-width: 9em;
   border-right: 1px solid #9C9CFF;
 }
-  
+
 #addressingWidget > listitem,
 .addressingWidgetItem,
 .dummyrow {
@@ -64,7 +68,7 @@
   border-bottom: 1px solid #9C9CFF;
   padding: 0px;
 }
-  
+
 .addressingWidgetCell:first-child {
   border-top: none;
 }
diff --git a/LCARStrek/messenger/filterDialog.css b/LCARStrek/messenger/filterDialog.css
index d4ca6fa7..e4e06d19 100644
--- a/LCARStrek/messenger/filterDialog.css
+++ b/LCARStrek/messenger/filterDialog.css
@@ -13,7 +13,7 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
  *   Robert Kaiser <KaiRo@KaiRo.at>
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
@@ -53,8 +53,18 @@ treechildren::-moz-tree-image(activeColumn, Enabled-true) {
  list-style-image: url("chrome://messenger/skin/icons/check.gif");
 }
 
+.small-button {
+  min-width: 3em;
+  padding: 0px;
+  margin: 0px 1px;
+}
+
+listbox {
+  padding-top: 2px;
+}
+
 menulist {
-  min-width: 15em;
+  width: 12em;
 }
 
 menulist > menupopup > menuitem {
diff --git a/LCARStrek/messenger/folderMenus.css b/LCARStrek/messenger/folderMenus.css
index d3c6d484..1718200d 100644
--- a/LCARStrek/messenger/folderMenus.css
+++ b/LCARStrek/messenger/folderMenus.css
@@ -13,7 +13,7 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
  *   Robert Kaiser <KaiRo@KaiRo.at>
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
@@ -110,6 +110,10 @@
   list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
 }
 
+.folderMenuItem[SpecialFolder="Virtual"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-search.gif");
+}
+
 .folderMenuItem[IsServer="true"] {
   list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
 }
diff --git a/LCARStrek/messenger/folderPane.css b/LCARStrek/messenger/folderPane.css
index da6a6b8a..faac6695 100644
--- a/LCARStrek/messenger/folderPane.css
+++ b/LCARStrek/messenger/folderPane.css
@@ -110,6 +110,12 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
   list-style-image: url("chrome://messenger/skin/icons/folder-trash.gif");
 }
 
+/* ..... Saved Searches ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-search.gif");
+}
+
 treechildren::-moz-tree-image(folderNameCol, isServer-true) {
   padding-right: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
diff --git a/LCARStrek/messenger/icons/attachment-col.gif b/LCARStrek/messenger/icons/attachment-col.gif
new file mode 100644
index 00000000..db65a66b
Binary files /dev/null and b/LCARStrek/messenger/icons/attachment-col.gif differ
diff --git a/LCARStrek/messenger/icons/attachment.gif b/LCARStrek/messenger/icons/attachment.gif
new file mode 100644
index 00000000..db65a66b
Binary files /dev/null and b/LCARStrek/messenger/icons/attachment.gif differ
diff --git a/LCARStrek/messenger/icons/folder-search.gif b/LCARStrek/messenger/icons/folder-search.gif
new file mode 100644
index 00000000..045b4698
Binary files /dev/null and b/LCARStrek/messenger/icons/folder-search.gif differ
diff --git a/LCARStrek/messenger/icons/message-mail-attach-del.gif b/LCARStrek/messenger/icons/message-mail-attach-del.gif
new file mode 100644
index 00000000..96c9ba2b
Binary files /dev/null and b/LCARStrek/messenger/icons/message-mail-attach-del.gif differ
diff --git a/LCARStrek/messenger/icons/winclassic.gif b/LCARStrek/messenger/icons/winclassic.gif
deleted file mode 100755
index ad7ff409..00000000
Binary files a/LCARStrek/messenger/icons/winclassic.gif and /dev/null differ
diff --git a/LCARStrek/messenger/icons/winvertical.gif b/LCARStrek/messenger/icons/winvertical.gif
deleted file mode 100644
index f206ba71..00000000
Binary files a/LCARStrek/messenger/icons/winvertical.gif and /dev/null differ
diff --git a/LCARStrek/messenger/icons/winwide.gif b/LCARStrek/messenger/icons/winwide.gif
deleted file mode 100755
index bd939c0b..00000000
Binary files a/LCARStrek/messenger/icons/winwide.gif and /dev/null differ
diff --git a/LCARStrek/messenger/prefPanels.css b/LCARStrek/messenger/prefPanels.css
index aabb1a27..772ed0c0 100644
--- a/LCARStrek/messenger/prefPanels.css
+++ b/LCARStrek/messenger/prefPanels.css
@@ -43,20 +43,3 @@
 @import url("chrome://communicator/skin/dialogOverlay.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* :::::: layout preference icons ::::: */
-
-#classic {
-  min-height       : 32px;
-  list-style-image : url("chrome://messenger/skin/icons/winclassic.gif");
-}
-
-#wide {
-  min-height       : 32px;
-  list-style-image : url("chrome://messenger/skin/icons/winwide.gif");
-}
-
-#vertical {
-  min-height: 32px;
-  list-style-image: url("chrome://messenger/skin/icons/winvertical.gif");
-}
diff --git a/LCARStrek/messenger/searchDialog.css b/LCARStrek/messenger/searchDialog.css
index 4c7428e3..f0588c37 100644
--- a/LCARStrek/messenger/searchDialog.css
+++ b/LCARStrek/messenger/searchDialog.css
@@ -13,7 +13,7 @@
  *
  * The Original Code is mozilla.org code.
  *
- * The Initial Developer of the Original Code is 
+ * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
@@ -22,7 +22,7 @@
  *   Robert Kaiser <KaiRo@KaiRo.at>
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
  * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
@@ -59,7 +59,7 @@
 }
 
 menulist {
-  min-width: 15em;
+  width: 12em;
 }
 
 menulist > menupopup > menuitem {
@@ -69,3 +69,13 @@ menulist > menupopup > menuitem {
 textbox {
   margin: 1px 4px;
 }
+
+.small-button {
+  min-width: 3em;
+  padding: 0px;
+  margin: 0px 1px;
+}
+
+listbox {
+  padding-top: 2px;
+}
diff --git a/LCARStrek/messenger/threadPane.css b/LCARStrek/messenger/threadPane.css
index dc00694b..9124a569 100644
--- a/LCARStrek/messenger/threadPane.css
+++ b/LCARStrek/messenger/threadPane.css
@@ -102,15 +102,15 @@ treechildren::-moz-tree-cell-text(priorityCol, selected, focus) {
 
 /* ..... thread column ..... */
 
-treecol.threadColumnHeader {
+.threadColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/unthreadcol.gif");
 }
 
-treecol.threadColumnHeader[sortDirection="ascending"]  {
+.threadColumnHeader[sortDirection="ascending"]  {
   list-style-image: url("chrome://messenger/skin/icons/threadcol.gif");
 }
 
-treecol.threadColumnHeader[sortDirection="descending"] {
+.threadColumnHeader[sortDirection="descending"] {
   list-style-image: url("chrome://messenger/skin/icons/threadcol.gif");
 }
 
@@ -148,7 +148,7 @@ treechildren::-moz-tree-image(threadCol, container, hasUnread, open, offline) {
 
 /* ..... read column ..... */
 
-treecol.readColumnHeader {
+.readColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/readcol.gif");
 }
 
@@ -160,9 +160,19 @@ treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
   list-style-image: url("chrome://messenger/skin/icons/unreadmail.gif");
 }
 
+/* ..... attachment column ..... */
+
+.attachmentColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/attachment-col.gif");
+}
+
+treechildren::-moz-tree-image(attachmentCol, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/attachment.gif");
+}
+
 /* ..... flag column ..... */
 
-treecol.flagColumnHeader {
+.flagColumnHeader {
   list-style-image: url("chrome://messenger/skin/icons/flagcol.gif");
 }
 
@@ -176,7 +186,7 @@ treechildren::-moz-tree-image(flaggedCol, flagged) {
 
 /* ..... junkStatus column ..... */
 
-treecol.junkStatusHeader {
+.junkStatusHeader {
   list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif");
 }
 
diff --git a/LCARStrek/messenger/threadPaneLabels.css b/LCARStrek/messenger/threadPaneLabels.css
index 3b7802ed..24892218 100644
--- a/LCARStrek/messenger/threadPaneLabels.css
+++ b/LCARStrek/messenger/threadPaneLabels.css
@@ -56,49 +56,49 @@
 treechildren::-moz-tree-cell-text(lc-FFFFFF) {
   color: #FFFFFF
 }
-treechildren::-moz-tree-row(lc-FFFFFF, selected) {
+treechildren::-moz-tree-row(lc-FFFFFF, selected, focus) {
   background-color: #FFFFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-CCCCCC) {
   color: #CCCCCC
 }
-treechildren::-moz-tree-row(lc-CCCCCC, selected) {
+treechildren::-moz-tree-row(lc-CCCCCC, selected, focus) {
   background-color: #CCCCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-C0C0C0) {
   color: #C0C0C0
 }
-treechildren::-moz-tree-row(lc-C0C0C0, selected) {
+treechildren::-moz-tree-row(lc-C0C0C0, selected, focus) {
   background-color: #C0C0C0;
 }
 
 treechildren::-moz-tree-cell-text(lc-999999) {
   color: #999999
 }
-treechildren::-moz-tree-row(lc-999999, selected) {
+treechildren::-moz-tree-row(lc-999999, selected, focus) {
   background-color: #999999;
 }
 
 treechildren::-moz-tree-cell-text(lc-666666) {
   color: #666666
 }
-treechildren::-moz-tree-row(lc-666666, selected) {
+treechildren::-moz-tree-row(lc-666666, selected, focus) {
   background-color: #666666;
 }
 
 treechildren::-moz-tree-cell-text(lc-333333) {
   color: #333333
 }
-treechildren::-moz-tree-row(lc-333333, selected) {
+treechildren::-moz-tree-row(lc-333333, selected, focus) {
   background-color: #333333;
 }
 
 treechildren::-moz-tree-cell-text(lc-000000) {
   color: #000000
 }
-treechildren::-moz-tree-row(lc-000000, selected) {
+treechildren::-moz-tree-row(lc-000000, selected, focus) {
   background-color: #000000;
 }
 
@@ -106,49 +106,49 @@ treechildren::-moz-tree-row(lc-000000, selected) {
 treechildren::-moz-tree-cell-text(lc-FFCCCC) {
   color: #FFCCCC
 }
-treechildren::-moz-tree-row(lc-FFCCCC, selected) {
+treechildren::-moz-tree-row(lc-FFCCCC, selected, focus) {
   background-color: #FFCCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF6666) {
   color: #FF6666
 }
-treechildren::-moz-tree-row(lc-FF6666, selected) {
+treechildren::-moz-tree-row(lc-FF6666, selected, focus) {
   background-color: #FF6666;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF0000) {
   color: #FF0000
 }
-treechildren::-moz-tree-row(lc-FF0000, selected) {
+treechildren::-moz-tree-row(lc-FF0000, selected, focus) {
   background-color: #FF0000;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC0000) {
   color: #CC0000
 }
-treechildren::-moz-tree-row(lc-CC0000, selected) {
+treechildren::-moz-tree-row(lc-CC0000, selected, focus) {
   background-color: #CC0000;
 }
 
 treechildren::-moz-tree-cell-text(lc-990000) {
   color: #990000
 }
-treechildren::-moz-tree-row(lc-990000, selected) {
+treechildren::-moz-tree-row(lc-990000, selected, focus) {
   background-color: #990000;
 }
 
 treechildren::-moz-tree-cell-text(lc-660000) {
   color: #660000
 }
-treechildren::-moz-tree-row(lc-660000, selected) {
+treechildren::-moz-tree-row(lc-660000, selected, focus) {
   background-color: #660000;
 }
 
 treechildren::-moz-tree-cell-text(lc-330000) {
   color: #330000
 }
-treechildren::-moz-tree-row(lc-330000, selected) {
+treechildren::-moz-tree-row(lc-330000, selected, focus) {
   background-color: #330000;
 }
 
@@ -156,49 +156,49 @@ treechildren::-moz-tree-row(lc-330000, selected) {
 treechildren::-moz-tree-cell-text(lc-FFCC99) {
   color: #FFCC99
 }
-treechildren::-moz-tree-row(lc-FFCC99, selected) {
+treechildren::-moz-tree-row(lc-FFCC99, selected, focus) {
   background-color: #FFCC99;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF9966) {
   color: #FF9966
 }
-treechildren::-moz-tree-row(lc-FF9966, selected) {
+treechildren::-moz-tree-row(lc-FF9966, selected, focus) {
   background-color: #FF9966;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF9900) {
   color: #FF9900
 }
-treechildren::-moz-tree-row(lc-FF9900, selected) {
+treechildren::-moz-tree-row(lc-FF9900, selected, focus) {
   background-color: #FF9900;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF6600) {
   color: #FF6600
 }
-treechildren::-moz-tree-row(lc-FF6600, selected) {
+treechildren::-moz-tree-row(lc-FF6600, selected, focus) {
   background-color: #FF6600;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC6600) {
   color: #CC6600
 }
-treechildren::-moz-tree-row(lc-CC6600, selected) {
+treechildren::-moz-tree-row(lc-CC6600, selected, focus) {
   background-color: #CC6600;
 }
 
 treechildren::-moz-tree-cell-text(lc-993300) {
   color: #993300
 }
-treechildren::-moz-tree-row(lc-993300, selected) {
+treechildren::-moz-tree-row(lc-993300, selected, focus) {
   background-color: #993300;
 }
 
 treechildren::-moz-tree-cell-text(lc-663300) {
   color: #663300
 }
-treechildren::-moz-tree-row(lc-663300, selected) {
+treechildren::-moz-tree-row(lc-663300, selected, focus) {
   background-color: #663300;
 }
 
@@ -206,49 +206,49 @@ treechildren::-moz-tree-row(lc-663300, selected) {
 treechildren::-moz-tree-cell-text(lc-FFFF99) {
   color: #FFFF99
 }
-treechildren::-moz-tree-row(lc-FFFF99, selected) {
+treechildren::-moz-tree-row(lc-FFFF99, selected, focus) {
   background-color: #FFFF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF66) {
   color: #FFFF66
 }
-treechildren::-moz-tree-row(lc-FFFF66, selected) {
+treechildren::-moz-tree-row(lc-FFFF66, selected, focus) {
   background-color: #FFFF66;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC66) {
   color: #FFCC66
 }
-treechildren::-moz-tree-row(lc-FFCC66, selected) {
+treechildren::-moz-tree-row(lc-FFCC66, selected, focus) {
   background-color: #FFCC66;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC33) {
   color: #FFCC33
 }
-treechildren::-moz-tree-row(lc-FFCC33, selected) {
+treechildren::-moz-tree-row(lc-FFCC33, selected, focus) {
   background-color: #FFCC33;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC9933) {
   color: #CC9933
 }
-treechildren::-moz-tree-row(lc-CC9933, selected) {
+treechildren::-moz-tree-row(lc-CC9933, selected, focus) {
   background-color: #CC9933;
 }
 
 treechildren::-moz-tree-cell-text(lc-996633) {
   color: #996633
 }
-treechildren::-moz-tree-row(lc-996633, selected) {
+treechildren::-moz-tree-row(lc-996633, selected, focus) {
   background-color: #996633;
 }
 
 treechildren::-moz-tree-cell-text(lc-663333) {
   color: #663333
 }
-treechildren::-moz-tree-row(lc-663333, selected) {
+treechildren::-moz-tree-row(lc-663333, selected, focus) {
   background-color: #663333;
 }
 
@@ -256,49 +256,49 @@ treechildren::-moz-tree-row(lc-663333, selected) {
 treechildren::-moz-tree-cell-text(lc-FFFFCC) {
   color: #FFFFCC
 }
-treechildren::-moz-tree-row(lc-FFFFCC, selected) {
+treechildren::-moz-tree-row(lc-FFFFCC, selected, focus) {
   background-color: #FFFFCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF33) {
   color: #FFFF33
 }
-treechildren::-moz-tree-row(lc-FFFF33, selected) {
+treechildren::-moz-tree-row(lc-FFFF33, selected, focus) {
   background-color: #FFFF33;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF00) {
   color: #FFFF00
 }
-treechildren::-moz-tree-row(lc-FFFF00, selected) {
+treechildren::-moz-tree-row(lc-FFFF00, selected, focus) {
   background-color: #FFFF00;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC00) {
   color: #FFCC00
 }
-treechildren::-moz-tree-row(lc-FFCC00, selected) {
+treechildren::-moz-tree-row(lc-FFCC00, selected, focus) {
   background-color: #FFCC00;
 }
 
 treechildren::-moz-tree-cell-text(lc-999900) {
   color: #999900
 }
-treechildren::-moz-tree-row(lc-999900, selected) {
+treechildren::-moz-tree-row(lc-999900, selected, focus) {
   background-color: #999900;
 }
 
 treechildren::-moz-tree-cell-text(lc-666600) {
   color: #666600
 }
-treechildren::-moz-tree-row(lc-666600, selected) {
+treechildren::-moz-tree-row(lc-666600, selected, focus) {
   background-color: #666600;
 }
 
 treechildren::-moz-tree-cell-text(lc-333300) {
   color: #333300
 }
-treechildren::-moz-tree-row(lc-333300, selected) {
+treechildren::-moz-tree-row(lc-333300, selected, focus) {
   background-color: #333300;
 }
 
@@ -306,49 +306,49 @@ treechildren::-moz-tree-row(lc-333300, selected) {
 treechildren::-moz-tree-cell-text(lc-99FF99) {
   color: #99FF99
 }
-treechildren::-moz-tree-row(lc-99FF99, selected) {
+treechildren::-moz-tree-row(lc-99FF99, selected, focus) {
   background-color: #99FF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-66FF99) {
   color: #66FF99
 }
-treechildren::-moz-tree-row(lc-66FF99, selected) {
+treechildren::-moz-tree-row(lc-66FF99, selected, focus) {
   background-color: #66FF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-33FF33) {
   color: #33FF33
 }
-treechildren::-moz-tree-row(lc-33FF33, selected) {
+treechildren::-moz-tree-row(lc-33FF33, selected, focus) {
   background-color: #33FF33;
 }
 
 treechildren::-moz-tree-cell-text(lc-33CC00) {
   color: #33CC00
 }
-treechildren::-moz-tree-row(lc-33CC00, selected) {
+treechildren::-moz-tree-row(lc-33CC00, selected, focus) {
   background-color: #33CC00;
 }
 
 treechildren::-moz-tree-cell-text(lc-009900) {
   color: #009900
 }
-treechildren::-moz-tree-row(lc-009900, selected) {
+treechildren::-moz-tree-row(lc-009900, selected, focus) {
   background-color: #009900;
 }
 
 treechildren::-moz-tree-cell-text(lc-006600) {
   color: #006600
 }
-treechildren::-moz-tree-row(lc-006600, selected) {
+treechildren::-moz-tree-row(lc-006600, selected, focus) {
   background-color: #006600;
 }
 
 treechildren::-moz-tree-cell-text(lc-003300) {
   color: #003300
 }
-treechildren::-moz-tree-row(lc-003300, selected) {
+treechildren::-moz-tree-row(lc-003300, selected, focus) {
   background-color: #003300;
 }
 
@@ -356,49 +356,49 @@ treechildren::-moz-tree-row(lc-003300, selected) {
 treechildren::-moz-tree-cell-text(lc-99FFFF) {
   color: #99FFFF
 }
-treechildren::-moz-tree-row(lc-99FFFF, selected) {
+treechildren::-moz-tree-row(lc-99FFFF, selected, focus) {
   background-color: #99FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-33FFFF) {
   color: #33FFFF
 }
-treechildren::-moz-tree-row(lc-33FFFF, selected) {
+treechildren::-moz-tree-row(lc-33FFFF, selected, focus) {
   background-color: #33FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-66CCCC) {
   color: #66CCCC
 }
-treechildren::-moz-tree-row(lc-66CCCC, selected) {
+treechildren::-moz-tree-row(lc-66CCCC, selected, focus) {
   background-color: #66CCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-00CCCC) {
   color: #00CCCC
 }
-treechildren::-moz-tree-row(lc-00CCCC, selected) {
+treechildren::-moz-tree-row(lc-00CCCC, selected, focus) {
   background-color: #00CCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-339999) {
   color: #339999
 }
-treechildren::-moz-tree-row(lc-339999, selected) {
+treechildren::-moz-tree-row(lc-339999, selected, focus) {
   background-color: #339999;
 }
 
 treechildren::-moz-tree-cell-text(lc-336666) {
   color: #336666
 }
-treechildren::-moz-tree-row(lc-336666, selected) {
+treechildren::-moz-tree-row(lc-336666, selected, focus) {
   background-color: #336666;
 }
 
 treechildren::-moz-tree-cell-text(lc-003333) {
   color: #003333
 }
-treechildren::-moz-tree-row(lc-003333, selected) {
+treechildren::-moz-tree-row(lc-003333, selected, focus) {
   background-color: #003333;
 }
 
@@ -406,49 +406,49 @@ treechildren::-moz-tree-row(lc-003333, selected) {
 treechildren::-moz-tree-cell-text(lc-CCFFFF) {
   color: #CCFFFF
 }
-treechildren::-moz-tree-row(lc-CCFFFF, selected) {
+treechildren::-moz-tree-row(lc-CCFFFF, selected, focus) {
   background-color: #CCFFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-66FFFF) {
   color: #66FFFF
 }
-treechildren::-moz-tree-row(lc-66FFFF, selected) {
+treechildren::-moz-tree-row(lc-66FFFF, selected, focus) {
   background-color: #66FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-33CCFF) {
   color: #33CCFF
 }
-treechildren::-moz-tree-row(lc-33CCFF, selected) {
+treechildren::-moz-tree-row(lc-33CCFF, selected, focus) {
   background-color: #33CCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-3366FF) {
   color: #3366FF
 }
-treechildren::-moz-tree-row(lc-3366FF, selected) {
+treechildren::-moz-tree-row(lc-3366FF, selected, focus) {
   background-color: #3366FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-3333FF) {
   color: #3333FF
 }
-treechildren::-moz-tree-row(lc-3333FF, selected) {
+treechildren::-moz-tree-row(lc-3333FF, selected, focus) {
   background-color: #3333FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-000099) {
   color: #000099
 }
-treechildren::-moz-tree-row(lc-000099, selected) {
+treechildren::-moz-tree-row(lc-000099, selected, focus) {
   background-color: #000099;
 }
 
 treechildren::-moz-tree-cell-text(lc-000066) {
   color: #000066
 }
-treechildren::-moz-tree-row(lc-000066, selected) {
+treechildren::-moz-tree-row(lc-000066, selected, focus) {
   background-color: #000066;
 }
 
@@ -456,49 +456,49 @@ treechildren::-moz-tree-row(lc-000066, selected) {
 treechildren::-moz-tree-cell-text(lc-CCCCFF) {
   color: #CCCCFF
 }
-treechildren::-moz-tree-row(lc-CCCCFF, selected) {
+treechildren::-moz-tree-row(lc-CCCCFF, selected, focus) {
   background-color: #CCCCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-9999FF) {
   color: #9999FF
 }
-treechildren::-moz-tree-row(lc-9999FF, selected) {
+treechildren::-moz-tree-row(lc-9999FF, selected, focus) {
   background-color: #9999FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-6666CC) {
   color: #6666CC
 }
-treechildren::-moz-tree-row(lc-6666CC, selected) {
+treechildren::-moz-tree-row(lc-6666CC, selected, focus) {
   background-color: #6666CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-6633FF) {
   color: #6633FF
 }
-treechildren::-moz-tree-row(lc-6633FF, selected) {
+treechildren::-moz-tree-row(lc-6633FF, selected, focus) {
   background-color: #6633FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-6600CC) {
   color: #6600CC
 }
-treechildren::-moz-tree-row(lc-6600CC, selected) {
+treechildren::-moz-tree-row(lc-6600CC, selected, focus) {
   background-color: #6600CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-333399) {
   color: #333399
 }
-treechildren::-moz-tree-row(lc-333399, selected) {
+treechildren::-moz-tree-row(lc-333399, selected, focus) {
   background-color: #333399;
 }
 
 treechildren::-moz-tree-cell-text(lc-330099) {
   color: #330099
 }
-treechildren::-moz-tree-row(lc-330099, selected) {
+treechildren::-moz-tree-row(lc-330099, selected, focus) {
   background-color: #330099;
 }
 
@@ -506,56 +506,57 @@ treechildren::-moz-tree-row(lc-330099, selected) {
 treechildren::-moz-tree-cell-text(lc-FFCCFF) {
   color: #FFCCFF
 }
-treechildren::-moz-tree-row(lc-FFCCFF, selected) {
+treechildren::-moz-tree-row(lc-FFCCFF, selected, focus) {
   background-color: #FFCCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF99FF) {
   color: #FF99FF
 }
-treechildren::-moz-tree-row(lc-FF99FF, selected) {
+treechildren::-moz-tree-row(lc-FF99FF, selected, focus) {
   background-color: #FF99FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC66CC) {
   color: #CC66CC
 }
-treechildren::-moz-tree-row(lc-CC66CC, selected) {
+treechildren::-moz-tree-row(lc-CC66CC, selected, focus) {
   background-color: #CC66CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC33CC) {
   color: #CC33CC
 }
-treechildren::-moz-tree-row(lc-CC33CC, selected) {
+treechildren::-moz-tree-row(lc-CC33CC, selected, focus) {
   background-color: #CC33CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-993399) {
   color: #993399
 }
-treechildren::-moz-tree-row(lc-993399, selected) {
+treechildren::-moz-tree-row(lc-993399, selected, focus) {
   background-color: #993399;
 }
 
 treechildren::-moz-tree-cell-text(lc-663366) {
   color: #663366
 }
-treechildren::-moz-tree-row(lc-663366, selected) {
+treechildren::-moz-tree-row(lc-663366, selected, focus) {
   background-color: #663366;
 }
 
 treechildren::-moz-tree-cell-text(lc-330033) {
   color: #330033
 }
-treechildren::-moz-tree-row(lc-330033, selected) {
+treechildren::-moz-tree-row(lc-330033, selected, focus) {
   background-color: #330033;
 }
 
 
-treechildren::-moz-tree-cell-text(lc-white, selected) {
+treechildren::-moz-tree-cell-text(lc-white, selected, focus) {
   color: #FFFFFF
 }
-treechildren::-moz-tree-cell-text(lc-black, selected) {
+treechildren::-moz-tree-cell-text(lc-black, selected, focus) {
   color: #000000
 }
+
diff --git a/LCARStrek/navigator/navigator.css b/LCARStrek/navigator/navigator.css
index a7c3e4e6..c679216d 100644
--- a/LCARStrek/navigator/navigator.css
+++ b/LCARStrek/navigator/navigator.css
@@ -40,7 +40,6 @@
 
 @import url("chrome://navigator/content/navigator.css");
 @import url("chrome://communicator/skin/");
-@import url("chrome://communicator/skin/sidebar/sidebar.css");
 @import url("chrome://communicator/skin/bookmarks/bookmarksToolbar.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@@ -299,10 +298,8 @@ toolbar[toolbarmode="small"] > toolbargrippy {
   margin-left: 2px;
 }
 
-#security-button[level="high"] {
-  list-style-image:url("chrome://communicator/skin/icons/lock-secure.gif");
-}
-
+/* |high| and |low| styles could be different, to better reflect the secure level... */
+#security-button[level="high"],
 #security-button[level="low"] {
   list-style-image:url("chrome://communicator/skin/icons/lock-secure.gif");
 }
@@ -312,7 +309,7 @@ toolbar[toolbarmode="small"] > toolbargrippy {
 }
 
 #privacy-button {
-  list-style-image: url("chrome://communicator/skin/cookie/taskbar-cookie.gif");
+  list-style-image: url("chrome://communicator/skin/permissions/taskbar-cookie.gif");
 }
 
 #popupIcon {