keeping up with Classic, make text/icons configurable toolbars working

diff --git a/LCARStrek/communicator/brand.css b/LCARStrek/communicator/brand.css
index 955e35b461b32d736d7af4d57098848ea26d8c5d..75a2e2e5f08d6c7a480fa86a5e93f3d3b8558c56 100644 (file)
--- a/LCARStrek/communicator/brand.css
+++ b/LCARStrek/communicator/brand.css
@@ -53,13 +53,16 @@
   list-style-image: url("chrome://communicator/skin/brand/throbber-anim.gif");
 }
 
+#navigator-throbber[buttonstyle="text"],
+#navigator-throbber[buttonstyle="pictures"],
 #navigator-throbber[toolbarmode="small"] {
   margin: 0 3px 0 1px;
   padding: 2px;
   list-style-image: url("chrome://communicator/skin/brand/throbber16-single.gif");
 }
 
+#navigator-throbber[buttonstyle="text"][busy="true"],
+#navigator-throbber[buttonstyle="pictures"][busy="true"],
 #navigator-throbber[toolbarmode="small"][busy="true"] {
   list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.gif");
 }
-

diff --git a/LCARStrek/communicator/button.css b/LCARStrek/communicator/button.css
index f19fb431d2d5f808cb67e14b6677d9252aab0d1b..2b4389f866bdbb507911ddf8472055843edc053d 100644 (file)
--- a/LCARStrek/communicator/button.css
+++ b/LCARStrek/communicator/button.css
@@ -71,6 +71,60 @@
   display: none;
 }
 
+/* ::::: small primary toolbar buttons ::::: */
+
+.toolbarbutton-1[buttonstyle="text"],
+.toolbarbutton-1[buttonstyle="pictures"],
+.toolbarbutton-1[toolbarmode="small"],
+.toolbarbutton-1 > .toolbarbutton-menubutton-button[buttonstyle="text"],
+.toolbarbutton-1 > .toolbarbutton-menubutton-button[buttonstyle="pictures"],
+.toolbarbutton-1 > .toolbarbutton-menubutton-button[toolbarmode="small"] {
+  min-width: 0px;
+  min-height: 0px;
+}
+
+.toolbarbutton-1[buttonstyle="text"] > .toolbarbutton-menubutton-dropmarker {
+  padding: 4px 1px 8px 1px;
+}
+
+.toolbarbutton-1[buttonstyle="pictures"] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker {
+  padding: 0px 1px 13px 1px;
+}
+
+.toolbarbutton-1[buttonstyle="text"][type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[buttonstyle="text"][type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[buttonstyle="text"][type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+  padding: 5px 0px 7px 2px;
+}
+
+.toolbarbutton-1[buttonstyle="pictures"][type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[buttonstyle="pictures"][type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[buttonstyle="pictures"][type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[toolbarmode="small"][type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[toolbarmode="small"][type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
+.toolbarbutton-1[toolbarmode="small"][type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+  padding: 1px 0px 12px 2px;
+}
+
+.toolbarbutton-1[buttonstyle="text"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  padding: 4px 1px 8px 1px !important;
+}
+
+.toolbarbutton-1[buttonstyle="pictures"] > .toolbarbutton-menubutton-dropmarker[disabled="true"],
+.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
+  padding: 0px 1px 13px 1px !important;
+}
+
+.toolbarbutton-text[buttonstyle="pictures"],
+.toolbarbutton-icon[buttonstyle="text"] {
+  display: none;
+}   
+                                                                            
+.toolbarbutton-text[buttonstyle="text"] {
+  padding: 4px 0;
+}
+
 /* ::::: standard toolbar buttons ::::: */
 
 .button-toolbar {

diff --git a/LCARStrek/communicator/communicator.css b/LCARStrek/communicator/communicator.css
index b3a784c8b5d7fa0963f66c29596d420eeb31d4c1..ecc25b2820ef315c6d74c6b397b5a6906cd9eaa0 100644 (file)
--- a/LCARStrek/communicator/communicator.css
+++ b/LCARStrek/communicator/communicator.css
@@ -49,6 +49,10 @@
    == Styles shared everywhere throughout the Communicator suite.
    ========================================================================== */
 
+.toolbar-primary {
+  -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar-primary");
+}
+
 #offline-status[offline="true"] {
   list-style-image: url("chrome://communicator/skin/icons/offline.gif");
 }

diff --git a/LCARStrek/communicator/prefpanels.css b/LCARStrek/communicator/prefpanels.css
index 7bc1b7cd6a3f6e2f7c876b89a71fc066f8e1d5f1..bc5325045df964131ebe3f4964f6164b69f17fb9 100644 (file)
--- a/LCARStrek/communicator/prefpanels.css
+++ b/LCARStrek/communicator/prefpanels.css
@@ -46,14 +46,14 @@
   height: 80px;
 }  
 
-#themesLink {
+.themesLink {
   margin-left: 5px;
   text-decoration: normal;
   color: #FF9F00;
   cursor: pointer;
 }
 
-#themesLink:hover {
+.themesLink:hover {
   text-decoration: underline;
   color: #9C9CFF;
 }

diff --git a/LCARStrek/communicator/securityOverlay.css b/LCARStrek/communicator/securityOverlay.css
deleted file mode 100644 (file)
index e02ab08..0000000
--- a/LCARStrek/communicator/securityOverlay.css
+++ /dev/null
@@ -1,61 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is "Classic" theme of mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * the Mozilla Organization.
- * Portions created by the Initial Developer are Copyright (C) 1998-2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   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
- * 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
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* ==== securityOverlay.css =============================================
-   == Styles used by the the overlay which contains security related
-   == content that is used throughout the Communicator suite.
-   ====================================================================== */
-
-#security-button {
-  list-style-image:url("chrome://communicator/skin/icons/lock-insecure.gif");
-  margin-left: 2px;
-  margin-right: 2px;
-}
-
-#security-button[level="high"] {
-  list-style-image:url("chrome://communicator/skin/icons/lock-secure.gif");
-}
-
-#security-button[level="low"] {
-  list-style-image:url("chrome://communicator/skin/icons/lock-secure.gif");
-}
-
-#security-button[level="broken"] {
-  list-style-image:url("chrome://communicator/skin/icons/lock-broken.gif");
-}

diff --git a/LCARStrek/global/listbox.css b/LCARStrek/global/listbox.css
index 76650a3a42bcd981bdba425f6abb8367e557f6aa..dfff59dfe059de476f508552422a7a6c556d8249 100644 (file)
--- a/LCARStrek/global/listbox.css
+++ b/LCARStrek/global/listbox.css
@@ -19,6 +19,7 @@
  *
  * Contributor(s):
  *   Joe Hewitt (hewitt@netscape.com)
+ *   Dean Tessman (dean_tessman@hotmail.com)
  *   Robert Kaiser <KaiRo@KaiRo.at>
  */
 
@@ -45,7 +46,11 @@ listitem {
   border: 1px solid transparent;
 }
 
-listbox:focus > listitem[selected="true"][current="true"] {
+listbox:focus > listitem[current="true"] {
+  border: 1px dotted #FF9F00;
+}
+
+listbox:focus > listitem[current="true"][selected="true"] {
   border: 1px dotted #FF9F00;
 }
 

diff --git a/LCARStrek/global/tree.css b/LCARStrek/global/tree.css
index 8c188c3e12749415a93318f03af87863b2190e6c..12ae83f1ff534de1fb9901797fd7de097c6dcc51 100644 (file)
--- a/LCARStrek/global/tree.css
+++ b/LCARStrek/global/tree.css
@@ -20,6 +20,8 @@
  *
  * Contributor(s):
  *   Robert Kaiser <KaiRo@KaiRo.at>
+ *   Joe Hewitt (hewitt@netscape.com)                                           
+ *   Dean Tessman (dean_tessman@hotmail.com)
  *
  * 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
@@ -70,7 +72,11 @@ treechildren:-moz-tree-row(selected, focus) {
 }
 
 treechildren:-moz-tree-row(current, focus) {
-  border: 1px dotted #008484;
+  border: 1px dotted #FF9F00;
+}
+
+treechildren:-moz-tree-row(selected, current, focus) {
+  border: 1px dotted #FF9F00;
 }
 
 /* ::::: tree cells ::::: */

diff --git a/LCARStrek/messenger/messageHeader.css b/LCARStrek/messenger/messageHeader.css
index a0815a6a12abca14a0a06f5cb77acc7f970c73d1..bd441a8a6492233f457ccfa27e55ed1e3eaf91fd 100644 (file)
--- a/LCARStrek/messenger/messageHeader.css
+++ b/LCARStrek/messenger/messageHeader.css
@@ -103,6 +103,8 @@
   margin: 0em 0em .25em 0em;
   min-width: 50px;
   white-space: normal;
+  color: inherit;
+  background-color: transparent;
 }
 
 .subjectvalue {

diff --git a/LCARStrek/navigator/navigator.css b/LCARStrek/navigator/navigator.css
index b23a948336303661a019ba545cf91a0ec422810c..a44f1872aab82ff1c912727c5d396b56d1eb6e77 100644 (file)
--- a/LCARStrek/navigator/navigator.css
+++ b/LCARStrek/navigator/navigator.css
@@ -129,10 +129,12 @@
 }
 
 /* Hides text below the above buttons */
+/*
 .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-text,
 .toolbarbutton-1 > .toolbarbutton-text {
   display: none;
 }
+*/
 
 #fullscreen-exit-button {
   list-style-image: none;
@@ -144,31 +146,16 @@
 
 /* ::::: small primary toolbar buttons ::::: */
 
-.toolbarbutton-1[toolbarmode="small"],
-.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-button {
-  min-width: 0px;
-  min-height: 0px;
-}
-
-.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker {
-  padding: 0px 1px 13px 1px;
-}
-
-.toolbarbutton-1[toolbarmode="small"][type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
-.toolbarbutton-1[toolbarmode="small"][type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker,
-.toolbarbutton-1[toolbarmode="small"][type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
-  padding: 1px 0px 12px 2px;
-}
-
-.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] {
-  padding: 0px 1px 13px 1px !important;
+.toolbarbutton-text[toolbarmode="small"] {
+  display: none;
 }
 
-.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-menubutton-button > .toolbarbutton-text,
-.toolbarbutton-1[toolbarmode="small"] > .toolbarbutton-text {
-  display: none;
+.toolbarbutton-icon[toolbarmode="small"] {
+  display: inline;
 }
 
+#nav-bar[buttonstyle="text"] > #nav-bar-inner,
+#nav-bar[buttonstyle="pictures"] > #nav-bar-inner,
 #nav-bar[toolbarmode="small"] > #nav-bar-inner {
   margin: 2px 0px 2px 6px;
 }
@@ -308,39 +295,35 @@ toolbar[toolbarmode="small"] > toolbargrippy {
   font-weight: bold;
 }
 
-/* ::::: personal toolbar ::::: */
+/* ::::: security button ::::: */
 
-#bookmarks-button {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
+#security-button {
+  list-style-image:url("chrome://communicator/skin/icons/lock-insecure.gif");
+  margin-left: 2px;
 }
 
-#bookmarks-button[open="true"] {
-  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
+#security-button[level="high"] {
+  list-style-image:url("chrome://communicator/skin/icons/lock-secure.gif");
 }
 
-#home-button {
-  list-style-image: url("chrome://communicator/skin/bookmarks/home.gif");
+#security-button[level="low"] {
+  list-style-image:url("chrome://communicator/skin/icons/lock-secure.gif");
+}
+
+#security-button[level="broken"] {
+  list-style-image:url("chrome://communicator/skin/icons/lock-broken.gif");
 }
 
-/* ::::: sidebar splitter ::::: */
+/* ::::: personal toolbar ::::: */
 
-/*
-#sidebar-splitter {
-  border-left: none;
-  border-right: none;
-  min-width: 5px; 
+#bookmarks-button {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
 }
-*/
 
-/*
-#content {
-  border-top: 1px solid ThreeDDarkShadow;
-  border-bottom: 1px solid ThreeDLightShadow;
-  border-left: 2px solid;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
+#bookmarks-button[open="true"] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
 }
 
-#status-bar {
-  border-top: none;
+#home-button {
+  list-style-image: url("chrome://communicator/skin/bookmarks/home.gif");
 }
-*/
\ No newline at end of file