From a12570b9df613c628ada41eac0bf14f642ecf578 Mon Sep 17 00:00:00 2001 From: robert Date: Sun, 8 Oct 2006 17:42:30 +0000 Subject: [PATCH] update LCARStrek to trunk --- .../bookmarks/bookmarksToolbar.css | 7 +- LCARStrek/communicator/communicator.css | 3 +- LCARStrek/editor/editorPrimaryToolbar.css | 13 --- LCARStrek/editor/icons/form-disabled.gif | Bin 94 -> 0 bytes LCARStrek/editor/icons/form-hover.gif | Bin 119 -> 0 bytes LCARStrek/editor/icons/form.gif | Bin 119 -> 0 bytes LCARStrek/global/autocomplete.css | 18 +--- LCARStrek/global/button.css | 15 ---- LCARStrek/global/dropmarker.css | 29 ++++++ LCARStrek/global/formatting.css | 65 +++++++++----- LCARStrek/global/menu.css | 14 +-- LCARStrek/global/menulist.css | 10 --- .../formatting.css => global/numberbox.css} | 37 ++++---- LCARStrek/global/scale.css | 77 ++++++++++++++++ LCARStrek/global/scale/scale-tray-horiz.gif | Bin 0 -> 50 bytes LCARStrek/global/scale/scale-tray-vert.gif | Bin 0 -> 50 bytes LCARStrek/global/scrollbars.css | 6 +- .../global/spinbutton/spinbtn-dn-act.gif | Bin 62 -> 0 bytes LCARStrek/global/spinbutton/spinbtn-dn.gif | Bin 62 -> 0 bytes .../global/spinbutton/spinbtn-up-act.gif | Bin 61 -> 0 bytes LCARStrek/global/spinbutton/spinbtn-up.gif | Bin 61 -> 0 bytes LCARStrek/global/spinbuttons.css | 84 +++++++++++++----- LCARStrek/global/textbox.css | 4 +- LCARStrek/global/toolbarbutton.css | 11 ++- LCARStrek/global/tree.css | 74 ++++++++++++--- LCARStrek/inspector/viewers/dom/dom.css | 4 + .../inspector/viewers/domNode/domNode.css | 8 ++ 27 files changed, 334 insertions(+), 145 deletions(-) delete mode 100644 LCARStrek/editor/icons/form-disabled.gif delete mode 100644 LCARStrek/editor/icons/form-hover.gif delete mode 100644 LCARStrek/editor/icons/form.gif create mode 100644 LCARStrek/global/dropmarker.css rename LCARStrek/{communicator/formatting.css => global/numberbox.css} (72%) create mode 100644 LCARStrek/global/scale.css create mode 100755 LCARStrek/global/scale/scale-tray-horiz.gif create mode 100755 LCARStrek/global/scale/scale-tray-vert.gif delete mode 100644 LCARStrek/global/spinbutton/spinbtn-dn-act.gif delete mode 100644 LCARStrek/global/spinbutton/spinbtn-dn.gif delete mode 100644 LCARStrek/global/spinbutton/spinbtn-up-act.gif delete mode 100644 LCARStrek/global/spinbutton/spinbtn-up.gif diff --git a/LCARStrek/communicator/bookmarks/bookmarksToolbar.css b/LCARStrek/communicator/bookmarks/bookmarksToolbar.css index 3d4e6313..28807c45 100644 --- a/LCARStrek/communicator/bookmarks/bookmarksToolbar.css +++ b/LCARStrek/communicator/bookmarks/bookmarksToolbar.css @@ -44,7 +44,7 @@ ======================================================================= */ /* ::::: bookmark toolbar buttons ::::: */ - + toolbarbutton.bookmark-item { cursor: pointer; min-width: 0px; @@ -67,6 +67,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/LCARStrek/communicator/communicator.css b/LCARStrek/communicator/communicator.css index 578c3942..58836219 100644 --- a/LCARStrek/communicator/communicator.css +++ b/LCARStrek/communicator/communicator.css @@ -39,7 +39,6 @@ @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"); /* the line below is only LCARStrek */ @import url("chrome://communicator/skin/toolbar.css"); @@ -50,7 +49,7 @@ ========================================================================== */ .toolbar-primary { - -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-primary"); + -moz-binding: url("chrome://communicator/content/bindings/toolbar.xml#grippytoolbar-primary"); } #offline-status[offline="true"] { diff --git a/LCARStrek/editor/editorPrimaryToolbar.css b/LCARStrek/editor/editorPrimaryToolbar.css index c840cbca..9f621eb6 100644 --- a/LCARStrek/editor/editorPrimaryToolbar.css +++ b/LCARStrek/editor/editorPrimaryToolbar.css @@ -275,16 +275,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:hover, -#formButton:hover:active { - list-style-image: url("chrome://editor/skin/icons/form-hover.gif"); -} - -#formButton[disabled="true"] { - list-style-image: url("chrome://editor/skin/icons/form-disabled.gif") !important; -} diff --git a/LCARStrek/editor/icons/form-disabled.gif b/LCARStrek/editor/icons/form-disabled.gif deleted file mode 100644 index 5f4b2d837bb5e214b5ba932848662a328dbe966f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94 zcmZ?wbhEHb6k!lyXkcJy2-xud|9{1wER0+Xj0`#qKmd|qU^4CLUwQg1_o6u>3cq=- wEj+imREZ^SuK3g}u_VRFsG?b0<|L;-{;RdEX4cZ8z5acrj+G^6(ij=60g><`F#rGn diff --git a/LCARStrek/editor/icons/form-hover.gif b/LCARStrek/editor/icons/form-hover.gif deleted file mode 100644 index efa37dfc6d0ff0d1116f8bd85c12e6e6b9b0b8ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmZ?wbhEHb6k!lyXkY+=|Ns9h{u6aBN=+pBPyfo(Z@CxE5mETfb8X?d&812#adX9|W{D*!Mn)CQ+A=3O{qbL| WZ8fu&7VY)#D|M_aIg`f7U=098i7M3q diff --git a/LCARStrek/global/autocomplete.css b/LCARStrek/global/autocomplete.css index 1d450ac9..878094d4 100644 --- a/LCARStrek/global/autocomplete.css +++ b/LCARStrek/global/autocomplete.css @@ -58,28 +58,18 @@ textbox { /* ::::: history button ::::: */ .autocomplete-history-dropmarker { - -moz-box-align: center; - -moz-box-pack: center; min-width: 15px; min-height: 15px; - border: none; - border-left: 1px solid #9C9CFF; background-color: #000000; - padding: 1px; - list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); -moz-border-radius: 0px 3px 3px 0px; } -.autocomplete-history-dropmarker:hover { - background-color: #FFCF00; - list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); -} - +.autocomplete-history-dropmarker, +.autocomplete-history-dropmarker:hover, .autocomplete-history-dropmarker:hover:active, .autocomplete-history-dropmarker[open="true"] { - background-color: #FF9F00; - list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); - padding: 2px 0px 0px 2px; + border: none; + border-left: 1px solid #9C9CFF; } /* ::::: autocomplete popups ::::: */ diff --git a/LCARStrek/global/button.css b/LCARStrek/global/button.css index 137ebf52..c41cc2a3 100644 --- a/LCARStrek/global/button.css +++ b/LCARStrek/global/button.css @@ -146,25 +146,10 @@ button[type="menu-button"] { .button-menubutton-dropmarker { -moz-border-radius: 3px; margin: 1px; - background-image: url("chrome://global/skin/arrow/arrow-down.gif"); min-width: 11px; min-height: 11px; } -.button-menu-dropmarker:hover, -.button-menubutton-dropmarker:hover { - background-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); -} - -.button-menu-dropmarker[disabled="true"], -.button-menubutton-dropmarker[disabled="true"] { - background-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif") !important; -} - -.button-menubutton-dropmarker[open="true"] { - margin: 2px 0px 0px 2px; -} - /* ::::: plain buttons ::::: */ button.plain { diff --git a/LCARStrek/global/dropmarker.css b/LCARStrek/global/dropmarker.css new file mode 100644 index 00000000..ee51aa64 --- /dev/null +++ b/LCARStrek/global/dropmarker.css @@ -0,0 +1,29 @@ +dropmarker { + min-width: 11px; + -moz-box-align: center; + -moz-box-pack: center; + border: 1px solid #FF9F00; + background-color: #000000; + padding: 1px; + list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); +} + +dropmarker:hover { + background-color: #FFCF00; + border: 1px solid #FFCF00; + list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); +} + +dropmarker:hover:active, +dropmarker[open="true"] { + background-color: #FF9F00; + padding: 2px 0 0 2px; + list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); +} + +dropmarker[disabled="true"] { + list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif"); + border: 1px solid #8050B0 !important; + background-color: #000000 !important; + padding: 1px !important; +} diff --git a/LCARStrek/global/formatting.css b/LCARStrek/global/formatting.css index 953ae1a1..56a33fd3 100644 --- a/LCARStrek/global/formatting.css +++ b/LCARStrek/global/formatting.css @@ -42,7 +42,7 @@ /* border: 1px inset #FF9F00; margin: 0px 5px 5px 5px; */ } - + .box-inset { -moz-border-radius: 3px; margin: 2px 4px; @@ -55,19 +55,19 @@ .groove-top { border-top: 2px groove #FF9F00; } - + .groove-right { border-right: 2px groove #FF9F00; } - + .groove-left { border-left: 2px groove #FF9F00; } - + .groove-bottom { - border-bottom: 2px groove #FF9F00;; + border-bottom: 2px groove #FF9F00; } - + .outset { /* border: 1px outset #FF9F00; */ } @@ -77,7 +77,7 @@ separator, separator[orient="horizontal"] { height: 1.5em; } - + separator[orient="vertical"] { width: 1.5em; } @@ -86,7 +86,7 @@ separator[orient="vertical"] { separator.thin, separator.thin[orient="horizontal"] { height: 0.5em; } - + separator.thin[orient="vertical"] { width: 0.5em; } @@ -99,19 +99,19 @@ separator.groove[orient="horizontal"] { margin-top: 0.4em; margin-bottom: 0.4em; } - + separator.groove[orient="vertical"] { border-left: 2px groove #FF9F00; margin-left: 0.4em; margin-right: 0.4em; } - -/* groove separators (0 padding, for dividing effects) */ + +/* groove separators (0 padding, for dividing effects) */ separator.groove-thin { border-top: 2px groove #FF9F00; height: 0px; } - + separator[orient="vertical"].groove-thin { border-left: 2px groove #FF9F00; } @@ -121,16 +121,16 @@ separator[orient="vertical"].groove-thin { .small-margin { margin: 0px 1px; } - + label[disabled="true"] { color: #8050B0; -} - +} + description, label { cursor: default; margin: 1px 3px; } - + description { /* margin: 1px 5px 4px 5px; */ } @@ -150,11 +150,11 @@ label { .smaller-text { font-size: smaller; } - + .monospace { font-family: monospace; } - + .indent { /* margin-left: 23px; */ margin-left: 15px; @@ -162,16 +162,39 @@ label { .box-padded { padding: 5px; -} +} .spaced { margin: 1px 3px; -} +} .wizard-box { padding: 15px 35px 10px 35px; -} +} .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/LCARStrek/global/menu.css b/LCARStrek/global/menu.css index 5e105a3e..743e0870 100644 --- a/LCARStrek/global/menu.css +++ b/LCARStrek/global/menu.css @@ -90,8 +90,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 { @@ -174,17 +175,10 @@ 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; } -.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"] { border: 1px dotted #FF9F00; } diff --git a/LCARStrek/global/menulist.css b/LCARStrek/global/menulist.css index 7da4ac5b..11b6911a 100644 --- a/LCARStrek/global/menulist.css +++ b/LCARStrek/global/menulist.css @@ -93,12 +93,8 @@ menulist[open="true"]:focus > .menulist-label-box { .menulist-dropmarker { -moz-border-radius: 0px 3px 3px 0px; - -moz-box-align: center; - -moz-box-pack: center; min-width: 15px; border-left: 1px solid #9C9CFF; - background-color: #000000; - list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); } .menulist-dropmarker, @@ -106,12 +102,6 @@ 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") !important; - border-left: 1px solid #8050B0 !important; - background-color: #000000 !important; -} - menulist[menuactive="true"] > .menulist-dropmarker, menulist[open="true"] > .menulist-dropmarker, menulist:hover > .menulist-dropmarker, diff --git a/LCARStrek/communicator/formatting.css b/LCARStrek/global/numberbox.css similarity index 72% rename from LCARStrek/communicator/formatting.css rename to LCARStrek/global/numberbox.css index 208d08cf..e1515ce3 100644 --- a/LCARStrek/communicator/formatting.css +++ b/LCARStrek/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 + * 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/LCARStrek/global/scale.css b/LCARStrek/global/scale.css new file mode 100644 index 00000000..d4c17eb0 --- /dev/null +++ b/LCARStrek/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 solid #9C9CFF !important; + background-color: #000000; + min-width: 30px; + min-height: 15px; +} + +.scale-thumb[orient="vertical"] { + min-width: 15px; + min-height: 30px; +} + +.scale-thumb[disabled="true"] { + border: 1px solid #8050B0 !important; +} diff --git a/LCARStrek/global/scale/scale-tray-horiz.gif b/LCARStrek/global/scale/scale-tray-horiz.gif new file mode 100755 index 0000000000000000000000000000000000000000..016b570759f7be3aed41ed70eda9fe1caf67bfab GIT binary patch literal 50 ycmZ?wbhEHbWMp7tSjfcC(9m$^!rlL1p!k!8k&A(eL5BedK=KSs%py$z4Aua?EDp*5 literal 0 HcmV?d00001 diff --git a/LCARStrek/global/scale/scale-tray-vert.gif b/LCARStrek/global/scale/scale-tray-vert.gif new file mode 100755 index 0000000000000000000000000000000000000000..5cf006defa7e8f7f92bea38b21c2812332a15d80 GIT binary patch literal 50 ycmZ?wbhEHbWMg1tSjfcC(9m$^!rlL1p!k!8k&A(eL5BedK=KSs%py$z4Aua?Kn}_P literal 0 HcmV?d00001 diff --git a/LCARStrek/global/scrollbars.css b/LCARStrek/global/scrollbars.css index d53df486..d42129e2 100644 --- a/LCARStrek/global/scrollbars.css +++ b/LCARStrek/global/scrollbars.css @@ -105,7 +105,8 @@ thumb[orient="horizontal"][disabled="true"] { scrollbarbutton { } -scrollbarbutton:hover:active { +scrollbarbutton:hover:active, +scrollbarbutton[active="true"] { padding: 2px 0px 0px 2px; } @@ -232,7 +233,8 @@ scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"][disabled="true" min-height: 16px; } - html|div scrollbarbutton:hover:active { + html|div scrollbarbutton:hover:active, + html|div scrollbarbutton[active="true"] { -moz-border-top-colors: ThreeDShadow -moz-Dialog; -moz-border-right-colors: ThreeDShadow -moz-Dialog; -moz-border-bottom-colors: ThreeDShadow -moz-Dialog; diff --git a/LCARStrek/global/spinbutton/spinbtn-dn-act.gif b/LCARStrek/global/spinbutton/spinbtn-dn-act.gif deleted file mode 100644 index 7e3f79690d9cc2062fd72726a3b9ccb7107049e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62 zcmZ?wbhEHb0x;Sr+{|#-GbDx8b)CQRt KP6=dSum%9{z!EM1 diff --git a/LCARStrek/global/spinbutton/spinbtn-up-act.gif b/LCARStrek/global/spinbutton/spinbtn-up-act.gif deleted file mode 100644 index eab646d8279338bf7af7d63eed07b85aef4cc517..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 61 zcmZ?wbhEHb0x;QT+Nv%=$UQso7)5RkZ IZj21p0MNk^K>z>% diff --git a/LCARStrek/global/spinbuttons.css b/LCARStrek/global/spinbuttons.css index 050aec03..90afd27d 100644 --- a/LCARStrek/global/spinbuttons.css +++ b/LCARStrek/global/spinbuttons.css @@ -1,21 +1,21 @@ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * The contents of this file are subject to the Netscape 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/NPL/ + * 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.org code. + * The Original Code is "Classic" theme of mozilla.org code. * - * The Initial Developer of the Original Code is - * Netscape Communications Corporation. - * Portions created by the Initial Developer are Copyright (C) 1998 + * 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): @@ -23,33 +23,77 @@ * Robert Kaiser * * 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 * 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 NPL, indicate your + * 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 NPL, the GPL or the LGPL. + * 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"); -.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 { + -moz-border-radius: 3px; + min-width: 11px; + min-height: 11px; + margin: 0 !important; + border: none; + background-color: #000000; } -.down { - list-style-image: url("chrome://global/skin/spinbutton/spinbtn-dn.gif") +.spinbuttons-button > .button-box { + -moz-border-radius: 3px; + 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 { + background-color: #FFCF00; +} + +.spinbuttons-button[disabled="true"] { + background-color: #000000 !important; +} + +.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-hover.gif"); +} + +.spinbuttons-up[disabled="true"] { + 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:hover:active { + background-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); +} + +.spinbuttons-down[disabled="true"] { + background-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif"); } diff --git a/LCARStrek/global/textbox.css b/LCARStrek/global/textbox.css index 115c7b1a..ede01f3d 100644 --- a/LCARStrek/global/textbox.css +++ b/LCARStrek/global/textbox.css @@ -89,7 +89,7 @@ textbox[disabled="true"] { -moz-border-left-colors: transparent #8050B0; cursor: default; color: #8050B0; -} +} /* ..... focused state ..... */ @@ -114,5 +114,7 @@ textbox.plain { padding: 0px !important; margin: 0px !important; border: none !important; + background-color: inherit !important; + color: inherit !important; min-height: 0px; } diff --git a/LCARStrek/global/toolbarbutton.css b/LCARStrek/global/toolbarbutton.css index 2e29c55b..5715ddd7 100644 --- a/LCARStrek/global/toolbarbutton.css +++ b/LCARStrek/global/toolbarbutton.css @@ -105,6 +105,9 @@ toolbarbutton[checked="true"]:hover { /* ::::: toolbarbutton menu ::::: */ .toolbarbutton-menu-dropmarker { + padding: 0px; + border: none !important; + background-color: transparent !important; list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); } @@ -180,7 +183,9 @@ toolbarbutton[disabled="true"]:hover:active > toolbarbutton.toolbarbutton-menubu -moz-border-radius: 3px; -moz-box-align: start; padding: 3px 1px 1px 1px; - list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); +/* list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); + border: none; */ + background-color: transparent; } toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, @@ -191,10 +196,10 @@ toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropm toolbarbutton[type="menu-button"]:hover > .toolbarbutton-menubutton-dropmarker, toolbarbutton[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker { - list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); +/* list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); */ } .toolbarbutton-menubutton-dropmarker[disabled="true"] { padding: 3px 1px 1px 1px !important; - list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif") !important; +/* list-style-image: url("chrome://global/skin/arrow/arrow-down-disabled.gif") !important; */ } diff --git a/LCARStrek/global/tree.css b/LCARStrek/global/tree.css index 381dcd3d..b7e588c4 100644 --- a/LCARStrek/global/tree.css +++ b/LCARStrek/global/tree.css @@ -56,11 +56,11 @@ tree { /* ::::: tree focusring ::::: */ /* deactivated, looks too bad for me in LCARStrek -.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-color: #FFCF00; } */ @@ -92,7 +92,8 @@ treechildren::-moz-tree-row(selected, current, focus) { border: 1px dotted #FF9F00; } -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; } @@ -103,12 +104,18 @@ treechildren::-moz-tree-cell { padding: 0px 0px 1px 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; } -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; } @@ -117,7 +124,14 @@ treechildren::-moz-tree-cell-text(selected) { color: #FFCF00; } -tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary, selected) { +tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected) { + background-color: #008484; +} +tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected) { + color: #FFCF00; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected) { background-color: #008484; color: #FFCF00; } @@ -126,31 +140,50 @@ treechildren::-moz-tree-cell-text(selected, focus) { color: #FFCF00; } -tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary, selected, focus) { +tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, focus) { + background-color: #008484; +} +tree[seltype="cell"] > treechildren::-moz-tree-cell-text(active, selected, focus) { + color: #FFCF00; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, focus) { background-color: #008484; color: #FFCF00; } -tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary, current, focus) { +tree[seltype="cell"] > treechildren::-moz-tree-cell(active, current, focus) { + border: 1px dotted #FF9F00; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, current, focus) { border: 1px dotted #FF9F00; } -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 #FF9F00; +} + +tree[seltype="text"] > treechildren::-moz-tree-cell-text(active, selected, current, focus) { border: 1px dotted #FF9F00; } /* ::::: 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) { border: 1px dotted black; } @@ -166,7 +199,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: #008484; color: #FFCF00; @@ -356,3 +390,21 @@ treechildren[alternatingbackground="true"]::-moz-tree-row(odd, selected) { treechildren[alternatingbackground="true"]::-moz-tree-row(odd, selected, focus) { background-color: #E7ADE7; } + +/* ::::: 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 #9C9CFF; + margin: 0 0 0 -4px; + padding: 1px; +} diff --git a/LCARStrek/inspector/viewers/dom/dom.css b/LCARStrek/inspector/viewers/dom/dom.css index ef1eb23c..e9a21314 100644 --- a/LCARStrek/inspector/viewers/dom/dom.css +++ b/LCARStrek/inspector/viewers/dom/dom.css @@ -40,6 +40,10 @@ /* :::::::: node type color coding :::::::: */ +treechildren::-moz-tree-cell-text(ACCESSIBLE_NODE) { + font-weight: bold; +} + treechildren::-moz-tree-cell-text(ELEMENT_NODE) { color: #FF9F00; } diff --git a/LCARStrek/inspector/viewers/domNode/domNode.css b/LCARStrek/inspector/viewers/domNode/domNode.css index d7f28d5b..0c0a849e 100644 --- a/LCARStrek/inspector/viewers/domNode/domNode.css +++ b/LCARStrek/inspector/viewers/domNode/domNode.css @@ -38,3 +38,11 @@ @import url("chrome://inspector/skin"); @import url("chrome://inspector/content/extensions/treeEditable.css"); + +#olNodeInfo label { + padding-right: 0.5em; +} + +#olNodeInfo { + padding-bottom: 0.5em; +} -- 2.35.3