diff --git a/themes/classic/communicator/bookmarks/bookmarks.css b/themes/classic/communicator/bookmarks/bookmarks.css index 62cd78d7ff1b..70cf335091c6 100644 --- a/themes/classic/communicator/bookmarks/bookmarks.css +++ b/themes/classic/communicator/bookmarks/bookmarks.css @@ -22,135 +22,167 @@ * Josh Soref */ -/** - * Style rules for bookmark items in Navigator. - **/ - - - #home-button - { - list-style-image : url("chrome://communicator/skin/bookmarks/home.gif"); - } - - #home-button:hover - { - list-style-image : url("chrome://communicator/skin/bookmarks/home-hover.gif"); - } - - #home-button:hover:active - { - list-style-image : url("chrome://communicator/skin/bookmarks/home-active.gif"); - } - -/** - * Personal toolbar items - **/ - - .bookmarkitem +/** + * Style rules for bookmarks tree items. Ideally this would be usage agnostic, but + * there's window/panel specific cruft in here too. + **/ + .bookmark-item { list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); - cursor : pointer; } - - .bookmarkfolder + + .bookmark-item[container="true"] { list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); } + + .bookmark-item[container="true"][open="true"] + { + list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif"); + } + + .bookmark-item[container="true"][open="true"][loading="true"] + { + list-style-image : url("chrome://global/skin/loading.gif") ! important ; + } + + .bookmark-item[status="new"] + { + list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item-updated.gif") ! important ; + } + +/** + * XXX - need to create some different icons for file system objects + **/ + .bookmark-item[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] + { + list-style-image : url("chrome://communicator/skin/directory/file-folder-open.gif"); + } + + .bookmark-item[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"] + { + list-style-image : url("chrome://communicator/skin/directory/file-folder-closed.gif"); + } + + .bookmark-item[type="http://home.netscape.com/NC-rdf#FileSystemObject"] + { + list-style-image : url("chrome://communicator/skin/directory/file-icon.gif"); + } + +/** + * Bookmark toolbar buttons + **/ + + .button-toolbar.bookmark-item, + .button-toolbar.bookmark-item:hover, + .button-toolbar.bookmark-item:hover:active, + .button-toolbar.bookmark-item > .button-internal-box, + .button-toolbar.bookmark-item:hover > .button-internal-box, + .button-toolbar.bookmark-item:hover:active > .button-internal-box, + .button-toolbar.bookmark-item + > .menubutton-toolbar-single-internal-box, + .button-toolbar.bookmark-item:hover + > .menubutton-toolbar-single-internal-box, + .button-toolbar.bookmark-item:hover:active + > .menubutton-toolbar-single-internal-box + { + border: none !important; + } + + .bookmark-item.button-toolbar[container="true"], + .bookmark-item.button-toolbar[container="true"]:hover, + .bookmark-item.button-toolbar[container="true"]:hover:active + { + cursor : default; + background-color : transparent; + color : inherit; + text-decoration : none; + } - .bookmarkfolder > .menubutton-toolbar-single-internal-box > .menubutton-toolbar-single-dropmarker + .bookmark-item.button-toolbar + { + cursor : pointer; + } + + .bookmark-item > .menubutton-toolbar-single-internal-box > .menubutton-toolbar-single-dropmarker { display : none; } - .bookmarkfolder[open="true"] - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif"); - } - -/* Bookmark item/folder buttons on the personal toolbar */ - - /* need to override default border on button-toolbar buttons/menubuttons */ - .button-toolbar.bookmarkitem - { - -moz-binding : url("chrome://global/skin/classicBindings.xml#toolbarbutton-left"); - border : none; - vertical-align : middle; - } - - .button-toolbar.bookmarkitem, - .button-toolbar.bookmarkfolder + .button-toolbar.bookmark-item { max-width : 10em; } - .button-toolbar.bookmarkfolder > box > text + .button-toolbar.bookmark-item > .menubutton-toolbar-single-internal-box + > .menubutton-toolbar-single-text { - max-width: 8em !important; - } - - .toolbarbutton-top-icon - { - max-width : 2em; - } - - .toolbarbutton-left-text - { - max-width : 8em; - } - - .button-toolbar.bookmarkfolder, .button-toolbar.bookmarkfolder:hover - { - border : none; - } - - .button-toolbar.bookmarkitem > .toolbarbutton-left-icon - { - margin-right : 4px; + max-width: 8em !important; } - .bookmarkfolder.button-toolbar:hover - { - color : #0000FF; - cursor : pointer; - border : none; - } - - .bookmarkfolder.button-toolbar:hover:active - { - color : #FF0000; - border : none; - } - .bookmarkitem.button-toolbar:hover + .bookmark-item.button-toolbar:hover { color : #0000FF; text-decoration : underline; - cursor : pointer; - border : none; } - .bookmarkitem.button-toolbar:hover:active + .bookmark-item.button-toolbar:hover:active { + background-color : transparent; color : #FF0000; text-decoration : underline; - border : none; } /* drag and drop feedback */ - .bookmarkitem.button-toolbar[dragover-left="true"] + .bookmark-item.button-toolbar[dragover-left="true"] { margin-left : 0px; - border-left : 2px solid ThreeDDarkShadow; + border-left : 2px solid threeddarkshadow; } - .bookmarkitem.button-toolbar[dragover-right="true"] + .bookmark-item.button-toolbar[dragover-right="true"] { margin-right : 0px; - border-right : 2px solid ThreeDDarkShadow; + border-right : 2px solid threeddarkshadow; } .menubutton-toolbar-single-text[dragover-top="true"] { - background-color : ThreeDDarkShadow; - color : ThreeDHighlight; + background-color : threeddarkshadow; + color : threedhighlight; } + +/** + * Bookmarks tree + **/ + .bookmarks-panel-tree, .bookmarks-panel-tree > .tree-container-treerows + { + border : none; + } + + #bookmarksTree + { + border-top : none; + border-bottom : none; + } + +/** + * XXX - disable print plus. This needs to go into ns/!!! + */ + #navprintplus + { + display : none !important; + } + + #notification-icon + { + list-style-image : url("chrome://communicator/skin/bookmarks/notification.gif"); + } + + #schedule-icon + { + list-style-image : url("chrome://communicator/skin/bookmarks/schedule.gif"); + } + + \ No newline at end of file diff --git a/themes/classic/global/win/tree.css b/themes/classic/global/win/tree.css index e121b201ab49..37b6307fd625 100644 --- a/themes/classic/global/win/tree.css +++ b/themes/classic/global/win/tree.css @@ -46,6 +46,10 @@ tree > treechildren treeitem[selected="true"] > treerow background-color: ThreeDFace; } +treeitem { + list-style-image: none; +} + treerow { border : 1px solid transparent; @@ -176,7 +180,8 @@ treecell.propertylist padding-left : 5px; } -.tree-cell-primary-icon +.tree-cell-primary-icon, +.tree-cell-primary-icon-inline-edit-folder { list-style-image : inherit; padding-right : 2px; @@ -249,12 +254,25 @@ treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > list-style-image : url("chrome://global/skin/columnselect.gif"); } +/* Inline Editable Treecells */ + +treerow[mode="inline-edit"] + { + border-top : none !important; + border-bottom : none !important; + background-color : transparent !important; + } + .inline-edit-cell-box { margin-left : 2px; } -/* Inline Editable Treecells */ +.inline-edit-cell-box[mode="edit"] + { + margin-left : 0px; + } + .textfield-inline-edit { border : 1px solid WindowFrame !important; @@ -263,21 +281,16 @@ treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .textfield-inline-edit > .textfield-internal-box > .textfield-input { - border : 0px !important; - padding : 1px !important; + border : none !important; + padding : 0px !important; margin : 0px !important; } .textfield-inline-edit > .textfield-internal-box { - border : 0px !important; - padding : 0px !important; + border : none !important; + padding : 1px !important; margin : 0px !important; } -treerow[mode="inline-edit"] - { - background : transparent; - } - - \ No newline at end of file + diff --git a/themes/classic/navigator/personalToolbar.css b/themes/classic/navigator/personalToolbar.css index 727beca0995e..aeed90f2933f 100644 --- a/themes/classic/navigator/personalToolbar.css +++ b/themes/classic/navigator/personalToolbar.css @@ -22,11 +22,12 @@ * Josh Soref */ -/** - * Style rules for bookmark items in Navigator. - **/ +@import url("chrome://communicator/skin/bookmarks/bookmarks.css"); + +/** + * Personal toolbar items + **/ - #home-button { list-style-image : url("chrome://communicator/skin/bookmarks/home.gif"); @@ -42,114 +43,3 @@ list-style-image : url("chrome://communicator/skin/bookmarks/home-active.gif"); } -/** - * Personal toolbar items - **/ - .bookmarkitem - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); - cursor : pointer; - } - - .bookmarkfolder - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); - } - - .bookmarkfolder > .menubutton-toolbar-single-internal-box > .menubutton-toolbar-single-dropmarker - { - display : none; - } - - .bookmarkfolder[open="true"] - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif"); - } - -/* Bookmark item/folder buttons on the personal toolbar */ - - /* need to override default border on button-toolbar buttons/menubuttons */ - .button-toolbar.bookmarkitem - { - -moz-binding : url("chrome://global/skin/classicBindings.xml#toolbarbutton-left"); - border : none; - vertical-align : middle; - } - - .button-toolbar.bookmarkitem, - .button-toolbar.bookmarkfolder - { - max-width : 10em; - } - - .button-toolbar.bookmarkfolder > box > text - { - max-width: 8em !important; - } - - .toolbarbutton-top-icon - { - max-width : 2em; - } - - .toolbarbutton-left-text - { - max-width : 8em; - } - - .button-toolbar.bookmarkfolder, .button-toolbar.bookmarkfolder:hover - { - border : none; - } - - .button-toolbar.bookmarkitem > .toolbarbutton-left-icon - { - margin-right : 4px; - } - - .bookmarkfolder.button-toolbar:hover - { - color : #0000FF; - cursor : pointer; - border : none; - } - - .bookmarkfolder.button-toolbar:hover:active - { - color : #FF0000; - border : none; - } - .bookmarkitem.button-toolbar:hover - { - color : #0000FF; - text-decoration : underline; - cursor : pointer; - border : none; - } - - .bookmarkitem.button-toolbar:hover:active - { - color : #FF0000; - text-decoration : underline; - border : none; - } - - /* drag and drop feedback */ - .bookmarkitem.button-toolbar[dragover-left="true"] - { - margin-left : 0px; - border-left : 2px solid threeddarkshadow; - } - - .bookmarkitem.button-toolbar[dragover-right="true"] - { - margin-right : 0px; - border-right : 2px solid threeddarkshadow; - } - - .menubutton-toolbar-single-text[dragover-top="true"] - { - background-color : threeddarkshadow; - color : threedhighlight; - } - diff --git a/themes/modern/communicator/bookmarks/bookmarks.css b/themes/modern/communicator/bookmarks/bookmarks.css index 27c42eabd942..95c6be1804ac 100644 --- a/themes/modern/communicator/bookmarks/bookmarks.css +++ b/themes/modern/communicator/bookmarks/bookmarks.css @@ -1,5 +1,4 @@ -/* -*- Mode: C; c-basic-offset: 2 -*- - * +/* * 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 @@ -10,107 +9,72 @@ * 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 Mozilla Communicator client code, released + * March 31, 1998. * * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998-1999 Netscape Communications Corporation. All * Rights Reserved. * - * Contributor(s): + * Contributor(s): + * Ben Goodger + * Josh Soref + * */ - -.bookmarkitem - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); - cursor : pointer; - } +/* ===== bookmarks.css ================================================== + == Styles specific to trees containing bookmarks. + ======================================================================= */ -.bookmarkitem[menuactive="true"] - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); - } - -.bookmarkfolder - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); - } +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -.bookmarkfolder > box > text - { - max-width: 8em; - } +/* ::::: bookmark items ::::: */ -.bookmarkfolder[menuactive="true"] - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); - } - -.bookmarkfolder[open="true"] - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif"); - } - -.bookmarkfolder[open="true"][menuactive="true"] - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif"); - } - - -treeitem[container="true"][open="true"][loading="true"] > treerow > .treecell-bookmark -{ - list-style-image: url("resource:/res/rdf/loading.gif") ! important ; +.bookmark-item { + list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); } -treeitem[status="new"] > treerow > .treecell-bookmark -{ - list-style-image: url("resource:/res/rdf/loading.gif") ! important ; +.bookmark-item[container="true"] { + list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > .treecell-bookmark, -treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > .treecell-bookmark, -treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > .treecell-bookmark, -treeitem[container="true"] > treerow > .treecell-bookmark -{ - list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); +.bookmark-item[container="true"][open="true"] { + list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif"); } -treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > .treecell-bookmark, -treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > .treecell-bookmark, -treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > treerow > .treecell-bookmark, -treeitem[container="true"][open="true"] > treerow > .treecell-bookmark -{ - list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif"); +.bookmark-item[container="true"][open="true"][loading="true"] { + list-style-image: url("chrome://communicator/skin/icon2/loading.gif") !important; } -treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > .treecell-bookmark -{ - list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); +.bookmark-item[status="new"] { + list-style-image: url("chrome://communicator/skin/icon2/loading.gif") !important; } -treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > .treecell-bookmark -{ - list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); +/* ::::: bookmark toolbar buttons ::::: */ + +.bookmark-item.button-toolbar { + cursor: pointer; } -treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > .treecell-bookmark -{ - list-style-image: url("resource:/res/rdf/folder-open.gif"); +.bookmark-item.button-toolbar:hover { + text-decoration: underline; } -treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"] > treerow > .treecell-bookmark -{ - list-style-image: url("resource:/res/rdf/folder-closed.gif"); +.bookmark-item.button-toolbar:hover, +.bookmark-item.button-toolbar:hover:active, +.bookmark-item.button-toolbar[open="true"] { + background-color: transparent; } -treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"] > treerow > .treecell-bookmark -{ - list-style-image: url("resource:/res/rdf/article.gif"); +.bookmark-item.button-toolbar[container="true"] { + -moz-binding: url("chrome://global/content/menulistBindings.xml#menubutton-single-left"); } -treeitem > treerow > .treecell-bookmark { - list-style-image:url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); +.bookmark-item.button-toolbar[container="true"], +.bookmark-item.button-toolbar[container="true"]:hover { + cursor: default; + text-decoration: none; } #navprintplus diff --git a/themes/modern/global/textfield.css b/themes/modern/global/textfield.css index ee223b347d23..1cd57d8635a7 100644 --- a/themes/modern/global/textfield.css +++ b/themes/modern/global/textfield.css @@ -1,105 +1,125 @@ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */ -@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for XUL elements */ +/* + * 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/ + * + * 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 Netscape are + * Copyright (C) 1998-1999 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): + * + */ -/** generic text fields (in dialogs) - **/ - -/* outer frame */ - textfield - { - margin : 1px; - border : 3px solid transparent; - padding : 0px; - font : inherit; - color : #000000; - cursor : text; - } - - textfield[readonly="true"] - { - background-color : #B4C3D4; - } - - textfield[focused="true"] - { - border-color : #8C9EB5; - -moz-border-radius : 6px; - } - - textfield[focused="true"] > .textfield-internal-box - { - border: 1px solid black; - } +/* ===== textfield.css ================================================== + == Styles used by the XUL textfield element. + ======================================================================= */ - textfield[focused="true"][readonly="true"] - { - border-color: #CCCCCC; - } +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -/* internal frame */ - .textfield-internal-box, - .textarea-internal-box - { - margin : 0px; - border : 1px inset #B4C3D4; - padding : 1px 2px 1px 2px; - cursor : text; - background-color : #FFFFFF; - color : inherit; - } - - textfield[disabled="true"] > .textfield-internal-box - { - background-color : #B4C3D4; - } - -/* internal text widget */ - .textfield-input, .textfield-textarea - { - border : none !important; - margin : 0px; - padding : 0px; - font : inherit; - background-color : inherit; - color : inherit; - } +/* ::::: textfield ::::: */ - textfield[disabled="true"] - { - cursor : default ! important; - color : #999999; - } - -/** plain atomic textfields, class="plain" **/ - textfield.plain, - textfield.plain > .textfield-internal-box, - textfield.plain > .textarea-internal-box - { - padding : 0px !important; - margin : 0px !important; - border : none !important; - } +textfield { + cursor: text; + margin: 2px 4px; + background-color: #FFFFFF; + color: #000000; + font: inherit; +} - .scrollfield - { - border : none !important; - margin : 0px; - margin-top : 1px; - padding : 0px !important; - background : inherit; - } - - .scrollfield > .textfield-internal-box - { - border : none !important; - margin : 0px !important; - padding : 0px !important; - } - -/* autocomplete text field */ - .textfield-popup > menuitem - { - max-width : none !important; - } +textfield, +textfield[readonly="true"][focused="true"] { + border-top: 1px solid #A8B5C6; + border-right: 1px solid #E2E8F0; + border-bottom: 1px solid #E2E8F0; + border-left: 1px solid #A8B5C6; +} - +.textfield-internal-box, +.textarea-internal-box { + padding: 1px 0px 1px 2px; +} + +.textfield-internal-box, +.textarea-internal-box, +textfield[readonly="true"][focused="true"] > .textfield-internal-box, +textfield[readonly="true"][focused="true"] > .textarea-internal-box { + border: 1px solid #757C8A; +} + +.textfield-input, +.textfield-textarea { + margin: 0px !important; + border: none !important; + padding: 0px !important; + font: inherit; + background-color: inherit; + color: inherit; +} + +/* ..... focused state ..... */ + +textfield[focused="true"] { + border: 1px solid #96A7BD; +} + +textfield[focused="true"] > .textfield-internal-box, +textfield[focused="true"] > .textarea-internal-box { + border-color: #000000; +} + +textfield[readonly="true"] { + background-color: #B4C3D4; +} + +/* ..... disabled state ..... */ + +textfield[disabled="true"] > .textfield-internal-box { + background-color: #B4C3D4; +} + +textfield[disabled="true"] { + cursor: default !important; + color: #85959E; +} + +/* ::::: plain textfield ::::: */ + +textfield.plain, +textfield.plain > .textfield-internal-box, +textfield.plain > .textarea-internal-box { + margin: 0px !important; + border: none !important; + padding: 0px !important; +} + +/* ::::: scrollable textfield ::::: */ + +.scrollfield { + margin: 1px 0px 0px 0px; + border: none !important; + background: inherit; +} + +.scrollfield > .textfield-internal-box, +.scrollfield > .textarea-internal-box { + margin: 0px !important; + border: none !important; + padding: 0px !important; +} + +/* ::::: autocomplete text field ::::: */ + +.textfield-popup > menuitem { + max-width: none !important; +} diff --git a/themes/modern/global/tree.css b/themes/modern/global/tree.css index 4a25f1b8870e..c41c966fb847 100644 --- a/themes/modern/global/tree.css +++ b/themes/modern/global/tree.css @@ -1,57 +1,136 @@ +/* + * 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/ + * + * 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 Netscape are + * Copyright (C) 1998-1999 Netscape Communications Corporation. All + * Rights Reserved. + * + * Contributor(s): + * + */ -/******** Tree widget **********/ +/* ===== tree.css ======================================================= + == Styles used by XUL tree-related elements. + ======================================================================= */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* ::::: tree ::::: */ -/** basic tree **************************************************** - * basic tree widget for use in main windows where no decoration - * is required. - **/ tree { border: none; border-spacing: 0px; - background-color: #ffffff; + background-color: #FFFFFF; color: #000000; } -/** class="inset" ************************************************* - * this is the tree class used by dialogs to create treeviews with - * inset borders, and default dialog spacing. - **/ tree.inset { - border-top: 1px solid #666666; - border-bottom: 1px solid white; - border-left: 1px solid #666666; - border-right: 1px solid white; - margin: 1px 5px 2px 5px; + margin: 2px 4px; + border-top: 1px solid #A8B5C6; + border-right: 1px solid #E2E8F0; + border-bottom: 1px solid #E2E8F0; + border-left: 1px solid #A8B5C6; } -treecell { +tree.inset > .tree-container-treerows { + border: 1px solid #757C8A; +} + +/* ::::: treeitem ::::: */ + +treeitem { + list-style-image: none; +} + +/* ::::: treerow ::::: */ + +treerow { + border-right: 1px solid transparent; + border-left: 1px solid transparent; +} + +treeitem[selected="true"] > treerow { + background-color: #C2D0D0; + color: #000000; +} + +tree:focus > treechildren treeitem[selected="true"] > treerow, +treeitem[dd-dropon="true"] > treerow { + background-color: #486380; + color: #FFFFFF; +} + +tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow, +tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow > treecell { + border-color: #768AA0; +} + +treehead > treeitem > treerow, +treehead > treerow { + border: none; +} + +/* :::::: treecell ::::: */ + +treecell { border-top: 1px solid transparent; border-bottom: 1px solid transparent; padding: 0px 0px 1px 2px; - white-space: nowrap; vertical-align: middle; -} + white-space: nowrap; +} -.treecell-header, -.treecell-inset-header, -.treecell-header-image { - border-left: 1px solid #EDEDED !important; +/* ::::: iconic treecell ::::: */ + +.tree-cell-icon, +.tree-cell-primary-icon, +.tree-cell-primary-icon-inline-edit-folder { + padding-right: 2px; + list-style-image: inherit; +} + +.treecell-indent > .tree-cell-primary-icon { + padding-left: 14px; +} + +treeitem[container="true"] > treerow > .treecell-indent > .tree-cell-primary-icon { + padding-left: 0px; +} + +/* :::::: header treecell ::::: */ + +.treecell-header, +.treecell-inset-header, +.treecell-header-image { border-top: 1px solid #EDEDED !important; border-right: 1px solid #6E7070 !important; border-bottom: 1px solid #6E7070 !important; + border-left: 1px solid #EDEDED !important; padding: 0px; - background-color: #C2D0D0; + background-color: #C2D0D0; color: #000000; } .treecell-header-box, .treecell-header-image-box { - border-left: 1px solid #C2D0D0; border-top: 1px solid #C2D0D0; border-right: 1px solid #A4ACAC; border-bottom: 1px solid #A4ACAC; + border-left: 1px solid #C2D0D0; vertical-align: middle; -} +} .treecell-header-box { padding: 0px 4px 0px 4px; @@ -60,7 +139,7 @@ treecell { .treecell-header-image-box { padding: 0px 1px 0px 1px; } - + .treecell-header:hover:active, .treecell-header-image:hover:active, .treecell-inset-header:hover:active { @@ -75,7 +154,7 @@ treecell { border-bottom: none; border-left: 1px solid transparent; } - + .treecell-header:hover:active > .treecell-header-box, .treecell-inset-header:hover:active > .treecell-header-box { padding: 1px 4px 0px 5px; @@ -89,82 +168,63 @@ treecell { padding: 0px; } -/** class="propertylist" ****************************************** - * class for cells in grid-formatted property lists. - **/ +/* ::::: property list treecell ::::: */ + treecell.propertylist { + border-right: 1px solid #C2D0D0; + border-bottom: 1px solid #C2D0D0; padding-left: 5px; - border-right: 1px solid #CCCCCC; - border-bottom: 1px solid #CCCCCC; } -.tree-cell-primary-icon { - list-style-image: inherit; - padding-right: 2px; +/* ::::: treecell-editable ::::: */ + +treerow[mode="inline-edit"] { + background-color: transparent !important; } -.tree-cell-icon { - list-style-image: inherit; - padding-right: 2px; -} - -.treecell-indent > .tree-cell-primary-icon { - padding-left: 14px; - } - -treeitem[container="true"] > treerow > .treecell-indent > .tree-cell-primary-icon { - padding-left: 0px; -} - -.tree-cell-twisty { - list-style-image: url("chrome://global/skin/closedtwisty.gif"); - -moz-user-focus:ignore; - padding-right: 2px; -} - -treehead > treeitem > treerow, -treehead > treerow { +treerow[mode="inline-edit"] > .treecell-editable { border: none; } -treerow { - border-right: 1px solid transparent; - border-left: 1px solid transparent; +.inline-edit-cell-box { + margin-left: 2px; } -treeitem[selected="true"] > treerow { - color: #000000; - background-color: #CCCCCC; +.inline-edit-cell-box[mode="edit"] { + margin-left: 0px; } -tree:focus > treechildren treeitem[selected="true"] > treerow, -treeitem[dd-dropon="true"] > treerow { - color: #ffffff; - background-color: #486380; +.textfield-inline-edit { + margin: 0px !important; + border: 1px solid #000000 !important; } -tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow, -tree:focus > treechildren treeitem[selected="true"][current="true"] > treerow > treecell { - border-color: #768AA0; +.textfield-inline-edit > .textfield-internal-box { + border: none !important; + padding: 1px !important; } -.tree-cell-twisty:hover { - text-decoration: none; -} +/* ::::: twisty ::::: */ -.tree-cell-twisty:active { - text-decoration: none; -} - -.tree-cell-twisty[disabled="true"] { - list-style-image: none; +.tree-cell-twisty { + -moz-user-focus: ignore; + padding-right: 2px; + list-style-image: url("chrome://global/skin/closedtwisty.gif"); } treeitem[container="true"][open="true"] > treerow > treecell > .tree-cell-twisty { - list-style-image: url("chrome://global/skin/opentwisty.gif"); + list-style-image: url("chrome://global/skin/opentwisty.gif"); } -/* tree header with sort direction indicators */ +.tree-cell-twisty[disabled="true"] { + list-style-image: none; +} + +treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty { + visibility: hidden; +} + +/* ::::: sort direction indicator ::::: */ .tree-header-sortdirection { list-style-image: none; @@ -178,7 +238,9 @@ treeitem[container="true"][open="true"] > treerow > treecell > .tree-cell-twisty list-style-image: url("chrome://global/skin/sortDescending.gif"); } -.treecell-popup-icon - { - list-style-image : url("chrome://global/skin/columnselect.gif"); - } +/* ::::: column picker ::::: */ + +.treecell-popup-icon { + list-style-image: url("chrome://global/skin/columnselect.gif"); +} + diff --git a/themes/modern/navigator/personalToolbar.css b/themes/modern/navigator/personalToolbar.css index 97c8ec07974d..c000d1fa5a65 100644 --- a/themes/modern/navigator/personalToolbar.css +++ b/themes/modern/navigator/personalToolbar.css @@ -1,5 +1,4 @@ -/* -*- Mode: C; c-basic-offset: 2 -*- - * +/* * 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 @@ -10,52 +9,26 @@ * 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 Mozilla Communicator client code, released + * March 31, 1998. * * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998 Netscape Communications Corporation. All + * Communications Corporation. Portions created by Netscape are + * Copyright (C) 1998-1999 Netscape Communications Corporation. All * Rights Reserved. * - * Contributor(s): + * Contributor(s): + * */ - -.bookmarkitem - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); - cursor : pointer; - } +/* ===== personalToolbar.css ============================================ + == Styles for the Personal Toolbar in Navigator. + ======================================================================= */ -.bookmarkitem[menuactive="true"] - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-item.gif"); - } +@import url("chrome://communicator/skin/bookmarks/bookmarks.css"); -.bookmarkfolder - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); - } +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -/* This rule is TERRIBLE. Someone please spank the person who wrote it */ -.bookmarkfolder > box > text - { - max-width: 8em; - } - -.bookmarkfolder[menuactive="true"] - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif"); - } - -.bookmarkfolder[open="true"] - { - list-style-image : url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif"); - } - -.bookmarkfolder[open="true"][menuactive="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"); +} diff --git a/xpfe/browser/resources/content/navigator-toolbars.xul b/xpfe/browser/resources/content/navigator-toolbars.xul index b2d23d9152c3..cec463c56e21 100644 --- a/xpfe/browser/resources/content/navigator-toolbars.xul +++ b/xpfe/browser/resources/content/navigator-toolbars.xul @@ -154,7 +154,7 @@ @@ -248,7 +248,7 @@ object="?content"/> -