From 1d4ddf3044b84fc0b806064b1edcdbaa4c44677b Mon Sep 17 00:00:00 2001 From: robert Date: Sun, 8 Oct 2006 15:05:06 +0000 Subject: [PATCH] update EarlyBlue to trunk --- .../bookmarks/bookmarksToolbar.css | 5 ++ EarlyBlue/communicator/communicator.css | 3 +- EarlyBlue/editor/editorPrimaryToolbar.css | 8 -- EarlyBlue/editor/icons/form-disabled.gif | Bin 119 -> 0 bytes EarlyBlue/editor/icons/form.gif | Bin 102 -> 0 bytes EarlyBlue/global/autocomplete.css | 5 -- EarlyBlue/global/button.css | 8 +- EarlyBlue/global/dropmarker.css | 20 +++++ EarlyBlue/global/formatting.css | 23 ++++++ EarlyBlue/global/menu.css | 16 +--- EarlyBlue/global/menulist.css | 10 --- .../formatting.css => global/numberbox.css} | 37 ++++----- EarlyBlue/global/scale.css | 77 ++++++++++++++++++ EarlyBlue/global/scale/scale-tray-horiz.gif | Bin 0 -> 50 bytes EarlyBlue/global/scale/scale-tray-vert.gif | Bin 0 -> 50 bytes EarlyBlue/global/scrollbars.css | 6 +- .../global/spinbutton/spinbtn-dn-act.gif | Bin 72 -> 0 bytes EarlyBlue/global/spinbutton/spinbtn-dn.gif | Bin 70 -> 0 bytes .../global/spinbutton/spinbtn-up-act.gif | Bin 72 -> 0 bytes EarlyBlue/global/spinbutton/spinbtn-up.gif | Bin 71 -> 0 bytes EarlyBlue/global/spinbuttons.css | 50 ++++++++++-- EarlyBlue/global/toolbarbutton.css | 5 ++ EarlyBlue/global/tree.css | 74 ++++++++++++++--- 23 files changed, 261 insertions(+), 86 deletions(-) delete mode 100644 EarlyBlue/editor/icons/form-disabled.gif delete mode 100644 EarlyBlue/editor/icons/form.gif create mode 100644 EarlyBlue/global/dropmarker.css rename EarlyBlue/{communicator/formatting.css => global/numberbox.css} (72%) create mode 100644 EarlyBlue/global/scale.css create mode 100755 EarlyBlue/global/scale/scale-tray-horiz.gif create mode 100755 EarlyBlue/global/scale/scale-tray-vert.gif delete mode 100644 EarlyBlue/global/spinbutton/spinbtn-dn-act.gif delete mode 100644 EarlyBlue/global/spinbutton/spinbtn-dn.gif delete mode 100644 EarlyBlue/global/spinbutton/spinbtn-up-act.gif delete mode 100644 EarlyBlue/global/spinbutton/spinbtn-up.gif diff --git a/EarlyBlue/communicator/bookmarks/bookmarksToolbar.css b/EarlyBlue/communicator/bookmarks/bookmarksToolbar.css index 14e8d80c..9f301613 100644 --- 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 0ed8e6c0..e08ac8b6 100644 --- 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 4dde291e..33c63e81 100644 --- 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 index 02d6dabf9de1ef149fdd70b928dbc83fa0e57417..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 119 zcmZ?wbhEHb6k!lyXkcJyXlVHV|G(ltQRkx6#FEq$h4Rdj426)4R0VfW-v9>1pDc`A z42%pq3_t+V!oXzO)4%fcTkb`3L==AWTw8c .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 17ac002d..95de1691 100644 --- 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 208d08cf..e1515ce3 100644 --- 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 + * 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 index 00000000..466aaa08 --- /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 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/EarlyBlue/global/scale/scale-tray-vert.gif b/EarlyBlue/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/EarlyBlue/global/scrollbars.css b/EarlyBlue/global/scrollbars.css index 92635b76..3751539a 100644 --- 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 index 4fae4a66c63e919982bcfce850ac9ebba548e71c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 72 zcmZ?wbhEHb6bVyE7msWb0^0pw!_CZ Y7Rs7ribe*>9bNaP($ddKo|VBG0ING0rT_o{ diff --git a/EarlyBlue/global/spinbutton/spinbtn-dn.gif b/EarlyBlue/global/spinbutton/spinbtn-dn.gif deleted file mode 100644 index 30ee602f6137c20a9794a2f7f1c177352ceec05d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 70 zcmZ?wbhEHb6bVyE7msWbEgI4){2IB Y$4l;BbKIw?Z|%&fu=I11XJxPk0I3uib^rhX diff --git a/EarlyBlue/global/spinbutton/spinbtn-up.gif b/EarlyBlue/global/spinbutton/spinbtn-up.gif deleted file mode 100644 index f46a217b8188f691cf8dbbdae1c43491e54f429c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 71 zcmZ?wbhEHb .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 3ba4e742..fe464279 100644 --- 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 3f5fa29d..557667ce 100644 --- 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; +} -- 2.35.3