update EarlyBlue to trunk

diff --git a/EarlyBlue/communicator/bookmarks/bookmarksToolbar.css b/EarlyBlue/communicator/bookmarks/bookmarksToolbar.css
index 14e8d80c4596996af9968d64cb5ed645ffd258b9..9f3016133657ee702344ba89b1894682bde15966 100644 (file)
--- a/EarlyBlue/communicator/bookmarks/bookmarksToolbar.css
+++ b/EarlyBlue/communicator/bookmarks/bookmarksToolbar.css
@@ -60,6 +60,11 @@ toolbarbutton.bookmark-item > .toolbarbutton-menu-dropmarker {
   display: none;
 }
 
+.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
+  width: 16px;
+  height: 16px;
+}
+
 .bookmark-group {
   list-style-image: url(chrome://communicator/skin/bookmarks/bookmark-group.gif) !important;
 }

diff --git a/EarlyBlue/communicator/communicator.css b/EarlyBlue/communicator/communicator.css
index 0ed8e6c0d773e4ef54c34444c51d36dda3a27b40..e08ac8b64ea8996baab284ed44957e5b9efb3a09 100644 (file)
--- a/EarlyBlue/communicator/communicator.css
+++ b/EarlyBlue/communicator/communicator.css
@@ -43,12 +43,11 @@
 @import url("chrome://communicator/content/communicator.css");
 @import url("chrome://communicator/skin/brand.css");
 @import url("chrome://communicator/skin/button.css");
-@import url("chrome://communicator/skin/formatting.css");
 
 @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");
+  -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary");
 }
 
 #offline-status[offline="true"] {

diff --git a/EarlyBlue/editor/editorPrimaryToolbar.css b/EarlyBlue/editor/editorPrimaryToolbar.css
index 4dde291ee9f1fe9f7db69d073f02287b28db8f17..33c63e8193446559aa0872f89390b84ae89d91bf 100644 (file)
--- a/EarlyBlue/editor/editorPrimaryToolbar.css
+++ b/EarlyBlue/editor/editorPrimaryToolbar.css
@@ -184,11 +184,3 @@
 #findButton[disabled="true"] {
   list-style-image: url("chrome://editor/skin/icons/find-disabled.gif") !important;
 }
-
-#formButton {
-  list-style-image: url("chrome://editor/skin/icons/form.gif");
-}
-
-#formButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/form-disabled.gif") !important;
-}

diff --git a/EarlyBlue/editor/icons/form-disabled.gif b/EarlyBlue/editor/icons/form-disabled.gif
deleted file mode 100644 (file)
index 02d6dab..0000000
Binary files a/EarlyBlue/editor/icons/form-disabled.gif and /dev/null differ

diff --git a/EarlyBlue/editor/icons/form.gif b/EarlyBlue/editor/icons/form.gif
deleted file mode 100644 (file)
index 904114a..0000000
Binary files a/EarlyBlue/editor/icons/form.gif and /dev/null differ

diff --git a/EarlyBlue/global/autocomplete.css b/EarlyBlue/global/autocomplete.css
index 055fd9e1a3d372f97ebd904aae02a178098df50f..38e74a0fe1aa8498e9c8deb4a362911687d6e681 100644 (file)
--- a/EarlyBlue/global/autocomplete.css
+++ b/EarlyBlue/global/autocomplete.css
@@ -57,14 +57,9 @@ textbox {
 /* ::::: history button ::::: */
 
 .autocomplete-history-dropmarker {
-  -moz-box-align: center;
-  -moz-box-pack: center;
   min-width: 15px;
   min-height: 19px;
-  border: 1px outset #CCD0DD;
   background-color: #9999CC;
-  padding: 1px;
-  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
 }
 
 .autocomplete-history-dropmarker[open="true"] {

diff --git a/EarlyBlue/global/button.css b/EarlyBlue/global/button.css
index 75ed8e30358da35f181372040853a87a370382f8..51fa8dc6bc1cdbe213e5b272ec59f516fd990e85 100644 (file)
--- a/EarlyBlue/global/button.css
+++ b/EarlyBlue/global/button.css
@@ -124,14 +124,10 @@ button[type="menu-button"] {
 .button-menu-dropmarker,
 .button-menubutton-dropmarker {
   margin: 1px;
-  background-image: url("chrome://global/skin/arrow/arrow-down.gif");
   min-width: 11px;
   min-height: 11px;
-}
-
-.button-menu-dropmarker[disabled="true"],
-.button-menubutton-dropmarker[disabled="true"] {
-  background-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
+  background-color: transparent !important;
+  border: none !important;
 }
 
 .button-menubutton-dropmarker[open="true"] {

diff --git a/EarlyBlue/global/dropmarker.css b/EarlyBlue/global/dropmarker.css
new file mode 100644 (file)
index 0000000..1aa89b9
--- /dev/null
+++ b/EarlyBlue/global/dropmarker.css
@@ -0,0 +1,20 @@
+dropmarker {
+  width: 15px;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  border: 1px outset #CCD0DD;
+  background-color: #CCD0DD;
+  padding: 1px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+}
+
+dropmarker:hover:active {
+  border: 1px inset #CCD0DD;
+  padding: 2px 0 0 2px;
+}
+
+dropmarker[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
+  border: 1px outset #CCD0DD !important;
+  padding: 1px !important;
+}

diff --git a/EarlyBlue/global/formatting.css b/EarlyBlue/global/formatting.css
index a2fbd6aa74d665f64a915c444b2a7f1738ce59ae..ea8e3993b8aec68a070c3fdf0de307cf53c3a2e9 100644 (file)
--- a/EarlyBlue/global/formatting.css
+++ b/EarlyBlue/global/formatting.css
@@ -174,3 +174,26 @@ label {
 .caption-text {
   margin: 0px 2px 0px 1px !important;
 }
+
+/* class for text with a 'link' appearance */
+.text-link {
+  color: blue;
+  text-decoration: underline;
+}
+
+.text-link:focus {
+  color: red;
+  outline: 1px dotted invert;
+}
+
+.text-link:hover {
+  cursor: pointer;
+}
+
+.text-link:hover:active {
+  color: red;
+}
+
+.text-link[visited="true"] {
+  color: purple;
+}

diff --git a/EarlyBlue/global/menu.css b/EarlyBlue/global/menu.css
index 1c878a21879d5356c235afcba85b07001d63b504..2264103405e15fd0845546d78915a85d8a2e3537 100644 (file)
--- a/EarlyBlue/global/menu.css
+++ b/EarlyBlue/global/menu.css
@@ -88,8 +88,9 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
   color: inherit;
 }
 
-.menu-iconic-icon {
-  list-style-image: inherit;
+menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon,
+menuitem[type="radio"] > .menu-iconic-left > .menu-iconic-icon {
+  width: 16px;
 }
 
 .menu-iconic-left {
@@ -168,17 +169,8 @@ menulist > menupopup > menuitem,
 .menulist-menupopup > menu,
 menulist > menupopup > menu {
   border: 1px solid transparent;
-  padding: 1px 30px 1px 5px;
+  padding: 1px 22px 1px 1px;
   max-width: none;
-/*  font-size: smaller;
-  color: -moz-FieldText; */
-}
-
-.menulist-menupopup > menuitem > .menu-iconic-left,
-menulist > menupopup > menuitem > .menu-iconic-left,
-.menulist-menupopup > menu > .menu-iconic-left,
-menulist > menupopup > menu > .menu-iconic-left {
-  display: none;
 }
 
 menulist > menupopup > menuitem[_moz-menuactive="true"] {

diff --git a/EarlyBlue/global/menulist.css b/EarlyBlue/global/menulist.css
index 17ac002d93ca4b00d12fc85d4f51d637dd66a8e0..95de169196d8ad0bb7057ef4d96b314c61bfc8d4 100644 (file)
--- a/EarlyBlue/global/menulist.css
+++ b/EarlyBlue/global/menulist.css
@@ -77,23 +77,13 @@ menulist[open="true"]:focus > .menulist-label-box {
 /* ..... dropmarker ..... */
 
 .menulist-dropmarker {
-  -moz-box-align: center;
-  -moz-box-pack: center;
-  min-width: 15px;
-  border: 1px outset #CCD0DD;
   background-color: #CCCCCC;
-  list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
 }
 
-.menulist-dropmarker,
 menulist[disabled="true"]:hover:active > .menulist-dropmarker {
   padding: 1px;
 }
 
-menulist[disabled="true"] > .menulist-dropmarker {
-  list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
-}
-
 menulist:hover:active > .menulist-dropmarker {
   border: 1px inset #CCD0DD;
   padding: 2px 0px 0px 2px;

diff --git a/EarlyBlue/communicator/formatting.css b/EarlyBlue/global/numberbox.css
similarity index 72%
rename from EarlyBlue/communicator/formatting.css
rename to EarlyBlue/global/numberbox.css
index 208d08cff58692a147402ef15ba14d6d2fee8818..e1515ce3a6679c067bebfd0e9685dcf6f79d87d8 100644 (file)
--- a/EarlyBlue/communicator/formatting.css
+++ b/EarlyBlue/global/numberbox.css
@@ -11,15 +11,12 @@
  * 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 of the Original Code is the Mozilla Corporation
+ * Portions created by the Initial Developer are Copyright (C) 2006
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
+ *   Neil Deakin (enndeakin@sympatico.ca)
  *
  * 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
@@ -35,27 +32,23 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+/* ===== numberbox.css ==================================================
+  == Styles used by the XUL textbox type="number" element.
+  ======================================================================= */
 
-/* class for text with a 'link' appearance */
-.text-link {
-  color: blue;
-  text-decoration: underline;
-}
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
 
-.text-link:focus {
-  color: red;
-  outline: 1px dotted invert;
+textbox[type="number"] {
+  padding: 0 !important;
+  cursor: default;
 }
 
-.text-link:hover {
-  cursor: pointer;
+html|*.numberbox-input {
+  text-align: right;
 }
 
-.text-link:hover:active {
-  color: red;
+.numberbox-input-box {
+  -moz-box-align: center;
 }
 
-.text-link[visited="true"] {
-  color: purple;
-}
\ No newline at end of file

diff --git a/EarlyBlue/global/scale.css b/EarlyBlue/global/scale.css
new file mode 100644 (file)
index 0000000..466aaa0
--- /dev/null
+++ b/EarlyBlue/global/scale.css
@@ -0,0 +1,77 @@
+/* ***** 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 Mozilla Communicator client code, released
+ * March 31, 1998.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998-2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Neil Deakin (enndeakin@sympatico.ca)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of 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 ***** */
+
+/* ===== scale.css =================================================
+  == Styles used by XUL scale elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: scale ::::: */
+
+.scale-slider {
+  background: url("chrome://global/skin/scale/scale-tray-horiz.gif") 0% 50% repeat-x;
+  margin: 2px 4px;
+  width: 100px;
+}
+
+.scale-slider[orient="vertical"]
+{
+  background: url("chrome://global/skin/scale/scale-tray-vert.gif") 50% 0% repeat-y;
+  margin: 4px 2px;
+  width: auto;
+  height: 100px;
+}
+
+/* ::::: scale thumb ::::: */
+
+.scale-thumb {
+  border: 1px inset #CCD0DD !important;
+  background-color: #CCD0DD;
+  min-width: 30px;
+  min-height: 15px;
+}
+
+.scale-thumb[orient="vertical"] {
+  min-width: 15px;
+  min-height: 30px;
+}
+
+.scale-thumb[disabled="true"] {
+  border: 1px outset #CCD0DD !important;
+}

diff --git a/EarlyBlue/global/scale/scale-tray-horiz.gif b/EarlyBlue/global/scale/scale-tray-horiz.gif
new file mode 100755 (executable)
index 0000000..016b570
Binary files /dev/null and b/EarlyBlue/global/scale/scale-tray-horiz.gif differ

diff --git a/EarlyBlue/global/scale/scale-tray-vert.gif b/EarlyBlue/global/scale/scale-tray-vert.gif
new file mode 100755 (executable)
index 0000000..5cf006d
Binary files /dev/null and b/EarlyBlue/global/scale/scale-tray-vert.gif differ

diff --git a/EarlyBlue/global/scrollbars.css b/EarlyBlue/global/scrollbars.css
index 92635b7659e764221a423baf850300d55f2767f0..3751539a2995d1f833661037b97cc2228e7c5ec9 100644 (file)
--- a/EarlyBlue/global/scrollbars.css
+++ b/EarlyBlue/global/scrollbars.css
@@ -98,7 +98,8 @@ thumb[orient="horizontal"][disabled="true"] {
 scrollbarbutton {
 }
 
-scrollbarbutton:hover:active {
+scrollbarbutton:hover:active,
+scrollbarbutton[active="true"] {
   border-style: inset;
   padding: 2px 0px 0px 2px;
 }
@@ -201,7 +202,8 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true"
 
   /* ::::: scrollbar button ::::: */
 
-  html|div scrollbarbutton {
+  html|div scrollbarbutton,
+  html|div scrollbarbutton[active="true"] {
     background: -moz-Dialog no-repeat 0px 1px;
     min-width: 16px;
     min-height: 16px;

diff --git a/EarlyBlue/global/spinbutton/spinbtn-dn-act.gif b/EarlyBlue/global/spinbutton/spinbtn-dn-act.gif
deleted file mode 100644 (file)
index 4fae4a6..0000000
Binary files a/EarlyBlue/global/spinbutton/spinbtn-dn-act.gif and /dev/null differ

diff --git a/EarlyBlue/global/spinbutton/spinbtn-dn.gif b/EarlyBlue/global/spinbutton/spinbtn-dn.gif
deleted file mode 100644 (file)
index 30ee602..0000000
Binary files a/EarlyBlue/global/spinbutton/spinbtn-dn.gif and /dev/null differ

diff --git a/EarlyBlue/global/spinbutton/spinbtn-up-act.gif b/EarlyBlue/global/spinbutton/spinbtn-up-act.gif
deleted file mode 100644 (file)
index 0f1d182..0000000
Binary files a/EarlyBlue/global/spinbutton/spinbtn-up-act.gif and /dev/null differ

diff --git a/EarlyBlue/global/spinbutton/spinbtn-up.gif b/EarlyBlue/global/spinbutton/spinbtn-up.gif
deleted file mode 100644 (file)
index f46a217..0000000
Binary files a/EarlyBlue/global/spinbutton/spinbtn-up.gif and /dev/null differ

diff --git a/EarlyBlue/global/spinbuttons.css b/EarlyBlue/global/spinbuttons.css
index 4439c705809a901db2d8715f762bb3bdc3d51730..b672db9d5bdcb0c5bc8dcded3ec51b537a29bab3 100644 (file)
--- a/EarlyBlue/global/spinbuttons.css
+++ b/EarlyBlue/global/spinbuttons.css
@@ -38,18 +38,52 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.up {
-  list-style-image: url("chrome://global/skin/spinbutton/spinbtn-up.gif")
+spinbuttons {
+  cursor: default;
 }
 
-.up:hover:active {
-  list-style-image: url("chrome://global/skin/spinbutton/spinbtn-up-act.gif")
+.spinbuttons-button {
+  min-width: 11px;
+  min-height: 11px;
+  margin: 0 !important;
+  border: 1px outset #CCD0DD;
+  background-color: #CCD0DD;
 }
 
-.down {
-  list-style-image: url("chrome://global/skin/spinbutton/spinbtn-dn.gif")
+.spinbuttons-button > .button-box {
+  border: 0;
+  padding: 0;
+  margin: 0;
 }
 
-.down:hover:active {
-  list-style-image: url("chrome://global/skin/spinbutton/spinbtn-dn-act.gif")
+.spinbuttons-button[disabled="true"] > .button-box {
+  padding: 0 !important;
+}
+
+.spinbuttons-button:hover:active {
+  border: 1px inset #CCD0DD;
+}
+
+.spinbuttons-button[disabled="true"] {
+  border: 1px outset #CCD0DD;
+}
+
+.spinbuttons-up {
+  background-image: url("chrome://global/skin/arrow/arrow-up.gif");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+
+.spinbuttons-up:hover:active {
+  background-image: url("chrome://global/skin/arrow/arrow-up-disabled.gif");
+}
+
+.spinbuttons-down {
+  background-image: url("chrome://global/skin/arrow/arrow-down.gif");
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+
+.spinbuttons-down[disabled="true"] {
+  background-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif");
 }

diff --git a/EarlyBlue/global/toolbarbutton.css b/EarlyBlue/global/toolbarbutton.css
index 3ba4e74223a139e8a79a169fa35f105b42483b63..fe4642794afd31784dc4e6868e14521b61e65b17 100644 (file)
--- a/EarlyBlue/global/toolbarbutton.css
+++ b/EarlyBlue/global/toolbarbutton.css
@@ -98,6 +98,9 @@ toolbarbutton[checked="true"] {
 
 .toolbarbutton-menu-dropmarker {
   list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+  padding: 0px;
+  border: none !important;
+  background-color: transparent !important;
 }
 
 .toolbarbutton-menu-dropmarker[disabled="true"] {
@@ -164,6 +167,8 @@ toolbarbutton[disabled="true"]:hover:active > toolbarbutton.toolbarbutton-menubu
   -moz-box-align: start;
   padding: 3px 1px 1px 1px;
   list-style-image: url("chrome://global/skin/arrow/arrow-down.gif");
+  border: none !important;
+  background-color: transparent !important;
 }
 
 toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,

diff --git a/EarlyBlue/global/tree.css b/EarlyBlue/global/tree.css
index 3f5fa29dfe1e7e231a8dfe941b8697cb45fd96aa..557667ce5814fd31f6271ff5d8b01e9e977c750c 100644 (file)
--- a/EarlyBlue/global/tree.css
+++ b/EarlyBlue/global/tree.css
@@ -55,11 +55,11 @@ tree {
 /* ::::: tree focusring ::::: */
 
 /* deactivated, looks too bad for me in EarlyBlue
-.focusring > .tree-rows > .tree-bodybox {
+.focusring > .tree-stack > .tree-rows > .tree-bodybox {
   border: 1px solid transparent;
 }
 
-.focusring:focus > .tree-rows > .tree-bodybox {
+.focusring:focus > .tree-stack > .tree-rows > .tree-bodybox {
   border: 1px solid #000000;
 }
 */
@@ -89,7 +89,8 @@ treechildren::-moz-tree-row(selected, current, focus) {
   border: 1px dotted #666699;
 }
 
-tree[selstyle="primary"] > treechildren::-moz-tree-row {
+tree[seltype="cell"] > treechildren::-moz-tree-row,
+tree[seltype="text"] > treechildren::-moz-tree-row {
   border: none;
   background-color: transparent;
 }
@@ -100,7 +101,8 @@ treechildren::-moz-tree-cell {
   padding: 0px 2px 0px 2px;
 }
 
-tree[selstyle="primary"] > treechildren::-moz-tree-cell-text,
+tree[seltype="cell"] > treechildren::-moz-tree-cell-text,
+tree[seltype="text"] > treechildren::-moz-tree-cell-text,
 treechildren::-moz-tree-cell-text {
   color: inherit;
 }
@@ -109,12 +111,24 @@ treechildren::-moz-tree-cell-text(selected) {
   color: #FFFFFF;
 }
 
-tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary) {
+tree[seltype="cell"] > treechildren::-moz-tree-cell {
+  border: 1px solid transparent;
+  padding: 0px 1px 0px 1px;
+}
+
+tree[seltype="text"] > treechildren::-moz-tree-cell-text {
   border: 1px solid transparent;
   padding: 0px 1px 1px 1px;
 }
 
-tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary, selected) {
+tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected) {
+  background-color: #808080;
+}
+tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected) {
+  color: #FFFFFF;
+}
+
+tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected) {
   background-color: #808080;
   color: #FFFFFF;
 }
@@ -123,31 +137,50 @@ treechildren::-moz-tree-cell-text(selected, focus) {
   color: #FFFFFF;
 }
 
-tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary, selected, focus) {
+tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, focus) {
   background-color: #336699;
+}
+tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
   color: #FFFFFF;
 }
 
-tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary, current, focus) {
+tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, focus) {
+  background-color: #336699;
+  color: #FFFFFF;
+}
+
+tree[seltype="cell"] > treechildren::-moz-tree-cell(active, current, focus) {
+  border: 1px dotted #9999CC;
+}
+
+tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, current, focus) {
   border: 1px dotted #9999CC;
 }
 
-tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary, selected, current, focus) {
+tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, current, focus) {
+  border: 1px dotted #666699;
+}
+
+tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, current, focus) {
   border: 1px dotted #666699;
 }
 
 /* ::::: lines connecting cells ::::: */
 
-tree[selstyle="primary"] > treechildren::-moz-tree-line,
+tree[seltype="cell"] > treechildren::-moz-tree-line,
+tree[seltype="text"] > treechildren::-moz-tree-line,
 treechildren::-moz-tree-line {
   visibility: hidden;
 }
 
 /*
+tree[seltype="cell"] > treechildren::-moz-tree-line,
+tree[seltype="text"] > treechildren::-moz-tree-line,
 treechildren::-moz-tree-line {
   border: 1px dotted grey;
 }
 
+tree[seltype="cell"] > treechildren::-moz-tree-line(active, selected, focus),
 treechildren::-moz-tree-line(selected, focus) {
   border: 1px dotted black;
 }
@@ -163,7 +196,8 @@ treechildren::-moz-tree-separator {
 
 /* ::::: drop feedback ::::: */
 
-tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary, dropOn),
+tree[seltype="cell"] > treechildren::-moz-tree-cell-text(primary, dropOn),
+tree[seltype="text"] > treechildren::-moz-tree-cell-text(primary, dropOn),
 treechildren::-moz-tree-cell-text(dropOn) {
   background-color: #336699;
   color: #FFFFFF;
@@ -343,3 +377,21 @@ treechildren[alternatingbackground="true"]::-moz-tree-row(odd, selected) {
 treechildren[alternatingbackground="true"]::-moz-tree-row(odd, selected, focus) {
   background-color: #6699CC;
 }
+
+/* ::::: editable tree ::::: */
+
+treechildren::-moz-tree-row(selected, editing) {
+  background-color: transparent;
+  border: none;
+}
+
+treechildren::-moz-tree-cell-text(selected, editing) {
+  color: inherit;
+}
+
+.tree-input {
+  -moz-appearance: none;
+  border: 1px solid #336699;
+  margin: 0 0 0 -4px;
+  padding: 1px;
+}