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

diff --git a/EarlyBlue/communicator/brand.css b/EarlyBlue/communicator/brand.css
index 0877a277d58675c053bf659e35244185e2180bd3..3a8de56907690de3ea616d3c2713236279882dc8 100644 (file)
--- a/EarlyBlue/communicator/brand.css
+++ b/EarlyBlue/communicator/brand.css
@@ -61,11 +61,15 @@
   border: 1px inset #CCD0DD;
 }
 
+#navigator-throbber[buttonstyle="text"],
+#navigator-throbber[buttonstyle="pictures"],
 #navigator-throbber[toolbarmode="small"] {
   margin: 0 2px 0 1px;
   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/EarlyBlue/communicator/button.css b/EarlyBlue/communicator/button.css
index f19fb431d2d5f808cb67e14b6677d9252aab0d1b..2b4389f866bdbb507911ddf8472055843edc053d 100644 (file)
--- a/EarlyBlue/communicator/button.css
+++ b/EarlyBlue/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/EarlyBlue/communicator/communicator.css b/EarlyBlue/communicator/communicator.css
index 22a93031421145860c3089f75983345bc6776deb..7614bc0dfa85da04eeb27d1e959447734b8a15ec 100644 (file)
--- a/EarlyBlue/communicator/communicator.css
+++ b/EarlyBlue/communicator/communicator.css
@@ -47,6 +47,10 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
+.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/EarlyBlue/communicator/prefpanels.css b/EarlyBlue/communicator/prefpanels.css
index aa5386113a68db18ba8d80d75d8f8f09effb3e04..88e803e77cee8332ef14add626ffe75a7beddf33 100644 (file)
--- a/EarlyBlue/communicator/prefpanels.css
+++ b/EarlyBlue/communicator/prefpanels.css
@@ -46,14 +46,14 @@
   height: 80px;
 }  
 
-#themesLink {
+.themesLink {
   margin-left: 5px;
   text-decoration: underline;
   color: blue;
   cursor: pointer;
 }
 
-#themesLink:active {
+.themesLink:active {
   color: red;
 }
 

diff --git a/EarlyBlue/communicator/securityOverlay.css b/EarlyBlue/communicator/securityOverlay.css
deleted file mode 100644 (file)
index 6cfa330..0000000
--- a/EarlyBlue/communicator/securityOverlay.css
+++ /dev/null
@@ -1,60 +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 ***** */
-
-/* ==== securityOverlay.css =============================================
-   == Styles used by the the overlay which contains security related
-   == content that is used throughout the Communicator suite.
-   ====================================================================== */
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-#security-button {
-  list-style-image:url("chrome://communicator/skin/icons/lock-insecure.gif");
-  margin-left: 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/EarlyBlue/global/listbox.css b/EarlyBlue/global/listbox.css
index 0dd737d813ebc282687b919430cebcbcfe1692b9..2f882bf4a2516148b1b70e068ed53c3ea6dd6a60 100644 (file)
--- a/EarlyBlue/global/listbox.css
+++ b/EarlyBlue/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>
  */
 
@@ -44,10 +45,14 @@ listitem {
   border: 1px solid transparent;
 }
 
-listbox:focus > listitem[selected="true"][current="true"] {
+listbox:focus > listitem[current="true"] {
   border: 1px dotted #9999CC;
 }
 
+listbox:focus > listitem[current="true"][selected="true"] {
+  border: 1px dotted #666699;
+}
+
 listitem[selected="true"] {
   background-color: #808080;
   color: #FFFFFF;

diff --git a/EarlyBlue/global/tree.css b/EarlyBlue/global/tree.css
index 45109d702fd94e16f144392f569817f50d6000bc..6b51cab714eeb3ed291d5e9986e2ce3fa0751e81 100644 (file)
--- a/EarlyBlue/global/tree.css
+++ b/EarlyBlue/global/tree.css
@@ -21,6 +21,7 @@
  * 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
@@ -71,6 +72,10 @@ treechildren:-moz-tree-row(current, focus) {
   border: 1px dotted #9999CC;
 }
 
+treechildren:-moz-tree-row(selected, current, focus) {
+  border: 1px dotted #666699;
+}
+
 /* ::::: tree cells ::::: */
 
 treechildren:-moz-tree-cell {

diff --git a/EarlyBlue/messenger/messageHeader.css b/EarlyBlue/messenger/messageHeader.css
index 5fa4dfc86faf2f3c5fe6af4182cb9614c0c3f91d..070ab49db19e314dc17f0995a237fb5048ab6f9b 100644 (file)
--- a/EarlyBlue/messenger/messageHeader.css
+++ b/EarlyBlue/messenger/messageHeader.css
@@ -96,6 +96,8 @@
   margin: 0em 0em .25em 0em;
   min-width: 50px;
   white-space: normal;
+  color: #000000;
+  background-color: #CCD0DD;
 }
 
 .subjectvalue {

diff --git a/EarlyBlue/navigator/navigator.css b/EarlyBlue/navigator/navigator.css
index 899a2be9e60a355b83e732312171b3e6f696c2e9..010246b1b9506ebaeebddc8493e28cae6dab3aaf 100644 (file)
--- a/EarlyBlue/navigator/navigator.css
+++ b/EarlyBlue/navigator/navigator.css
@@ -91,11 +91,13 @@
   list-style-image: url("chrome://global/skin/icons/close-button.gif");
 }
 
-/* Hides text below the above buttons */
+/* Hides text below the above buttons - should now be configurable */
+/*
 .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-text,
 .toolbarbutton-1 > .toolbarbutton-text {
   display: none;
 }
+*/
 
 #fullscreen-exit-button {
   list-style-image: none;
@@ -107,31 +109,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 4px;
 }
@@ -254,41 +241,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");
 }
 
-/* ::::: sidebar splitter ::::: */
-
-/*
-#sidebar-splitter {
-  border-left: none;
-  border-right: none;
-  min-width: 5px; 
+#security-button[level="broken"] {
+  list-style-image:url("chrome://communicator/skin/icons/lock-broken.gif");
 }
-*/
 
-/* ::::: content area ::::: */
+/* ::::: personal toolbar ::::: */
 
-/*
-#content {
-  border-top: 1px solid ThreeDDarkShadow;
-  border-bottom: 1px solid ThreeDLightShadow;
-  border-left: 2px solid;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
+#bookmarks-button {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
 }
 
-#status-bar {
-  border-top: none;
+#bookmarks-button[open="true"] {
+  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
 }
-*/
\ No newline at end of file
+
+#home-button {
+  list-style-image: url("chrome://communicator/skin/bookmarks/home.gif");
+}
\ No newline at end of file