From a3b3d4d6009d8158d22bf942ab273376876140d5 Mon Sep 17 00:00:00 2001 From: robert Date: Sat, 1 Feb 2003 18:28:52 +0000 Subject: [PATCH] keeping up with Classic development, e.g. adding im, popup-blocker and junk mail icons, readding toolbar grippies --- .../bookmarks/bookmarksWindow.css | 4 +-- LCARStrek/communicator/sidebar/sidebar.css | 2 +- LCARStrek/editor/EdImageMap.css | 4 +++ LCARStrek/global/dialog.css | 1 + LCARStrek/global/globalBindings.xml | 9 ++++-- LCARStrek/global/toolbar.css | 30 ++++++++++++------ .../messenger/addressbook/addressPanes.css | 4 +++ .../messenger/addressbook/addressbook.css | 6 ++-- .../addressbook/icons/im-disabled.gif | Bin 0 -> 96 bytes .../messenger/addressbook/icons/im-hover.gif | Bin 0 -> 96 bytes LCARStrek/messenger/addressbook/icons/im.gif | Bin 0 -> 96 bytes .../icons/secure-remote-addrbook.gif | Bin 0 -> 99 bytes LCARStrek/messenger/folderMenus.css | 8 +++++ LCARStrek/messenger/folderPane.css | 11 +++++-- LCARStrek/messenger/icons/folder-junk.gif | Bin 0 -> 102 bytes .../messenger/icons/message-junk-other.gif | Bin 0 -> 85 bytes .../icons/message-mail-imapdelete-offline.gif | Bin 86 -> 108 bytes .../icons/message-mail-imapdelete.gif | Bin 126 -> 108 bytes LCARStrek/messenger/primaryToolbar.css | 6 ++-- LCARStrek/messenger/threadPane.css | 19 +++++++++++ LCARStrek/messenger/toolbar/junk-disabled.gif | Bin 0 -> 149 bytes LCARStrek/messenger/toolbar/junk-hover.gif | Bin 0 -> 124 bytes LCARStrek/messenger/toolbar/junk.gif | Bin 0 -> 124 bytes LCARStrek/navigator/icons/popup-blocked.gif | Bin 0 -> 101 bytes LCARStrek/navigator/navigator.css | 4 +++ 25 files changed, 84 insertions(+), 24 deletions(-) create mode 100644 LCARStrek/messenger/addressbook/icons/im-disabled.gif create mode 100644 LCARStrek/messenger/addressbook/icons/im-hover.gif create mode 100644 LCARStrek/messenger/addressbook/icons/im.gif create mode 100644 LCARStrek/messenger/addressbook/icons/secure-remote-addrbook.gif create mode 100644 LCARStrek/messenger/icons/folder-junk.gif create mode 100644 LCARStrek/messenger/icons/message-junk-other.gif create mode 100644 LCARStrek/messenger/toolbar/junk-disabled.gif create mode 100644 LCARStrek/messenger/toolbar/junk-hover.gif create mode 100644 LCARStrek/messenger/toolbar/junk.gif create mode 100644 LCARStrek/navigator/icons/popup-blocked.gif diff --git a/LCARStrek/communicator/bookmarks/bookmarksWindow.css b/LCARStrek/communicator/bookmarks/bookmarksWindow.css index 2db0e9c7..bc2e8b82 100644 --- a/LCARStrek/communicator/bookmarks/bookmarksWindow.css +++ b/LCARStrek/communicator/bookmarks/bookmarksWindow.css @@ -38,7 +38,6 @@ * ***** END LICENSE BLOCK ***** */ @import url("chrome://communicator/skin/bookmarks/bookmarks.css"); -@import url("chrome://communicator/skin/bookmarks/platformBookmarks.css"); @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); @@ -61,7 +60,8 @@ list-style-image: url("chrome://communicator/skin/bookmarks/schedule.gif"); } -#panel-bar { +#panel-bar, +#search-bar { border-top: 1px solid #9C9CFF; border-bottom: 1px solid #9C9CFF; } diff --git a/LCARStrek/communicator/sidebar/sidebar.css b/LCARStrek/communicator/sidebar/sidebar.css index a6551fdd..92e19b59 100644 --- a/LCARStrek/communicator/sidebar/sidebar.css +++ b/LCARStrek/communicator/sidebar/sidebar.css @@ -102,7 +102,7 @@ color: #FF9F00; } -.iframe-panel { +.iframe-panel, .browser-sidebar { } /* ::::: loading info ::::: */ diff --git a/LCARStrek/editor/EdImageMap.css b/LCARStrek/editor/EdImageMap.css index cebd6e9b..9664db00 100644 --- a/LCARStrek/editor/EdImageMap.css +++ b/LCARStrek/editor/EdImageMap.css @@ -61,6 +61,10 @@ toolbar#toolbox button.tool { color: inherit; } +toolbar.toolbox > toolbargrippy { + visibility: collapse; +} + #pointerButton { list-style-image:url("chrome://editor/skin/icons/Map_pointerTool.gif"); } diff --git a/LCARStrek/global/dialog.css b/LCARStrek/global/dialog.css index d59206d9..219d0ea2 100644 --- a/LCARStrek/global/dialog.css +++ b/LCARStrek/global/dialog.css @@ -53,6 +53,7 @@ dialog { .dialog-button { /* font: menu; */ + margin-top: 5px; } /* ::::: dialog header ::::: */ diff --git a/LCARStrek/global/globalBindings.xml b/LCARStrek/global/globalBindings.xml index 4ad4a8d6..e8234612 100755 --- a/LCARStrek/global/globalBindings.xml +++ b/LCARStrek/global/globalBindings.xml @@ -32,7 +32,8 @@ - + @@ -43,7 +44,8 @@ - + @@ -58,7 +60,8 @@ - + diff --git a/LCARStrek/global/toolbar.css b/LCARStrek/global/toolbar.css index e373239f..df7bd62c 100644 --- a/LCARStrek/global/toolbar.css +++ b/LCARStrek/global/toolbar.css @@ -66,10 +66,12 @@ menubar > .toolbar-holder { background-color: #6000CF; } -/* ::::: begcap (LCARStrek specific) ::::: */ +/* ::::: toolbargrippy ::::: */ -toolbar > .toolbar-begcap { +toolbargrippy { -moz-border-radius: 8px 0px 0px 8px; + -moz-box-orient: vertical; + -moz-box-align: center; background-color: #FF9F00; border: none; border-right: 3px solid black; @@ -77,13 +79,8 @@ toolbar > .toolbar-begcap { min-height: 16px; } -menubar > .menubar-begcap { - -moz-border-radius: 8px 0px 0px 8px; - background-color: #FF9F00; - border: none; - border-right: 3px solid black; - width: 15px; - min-height: 16px; +toolbargrippy:hover { + background-color: #FFCF00; } /* ::::: endcap (LCARStrek specific) ::::: */ @@ -106,6 +103,20 @@ menubar > .menubar-endcap { min-height: 16px; } +/* ::::: collapsed tray and grippies ::::: */ + +toolbargrippy[tbgrippy-collapsed="true"] { + -moz-box-orient: horizontal; + -moz-border-radius: 5px 0px 0px 5px; + margin-bottom: 3px; + width: 30px; + height: 10px; +} + +.collapsed-tray-spacer { + border-bottom: none; +} + /* ::::: toolbarseparator ::::: */ toolbarseparator { @@ -113,4 +124,3 @@ toolbarseparator { border-right: 1px solid #000000; width: 1px; } - diff --git a/LCARStrek/messenger/addressbook/addressPanes.css b/LCARStrek/messenger/addressbook/addressPanes.css index 3e0e354d..74f3bea7 100644 --- a/LCARStrek/messenger/addressbook/addressPanes.css +++ b/LCARStrek/messenger/addressbook/addressPanes.css @@ -56,3 +56,7 @@ treechildren:-moz-tree-image(DirCol, IsMailList-true) { treechildren:-moz-tree-image(DirCol, IsRemote-true) { list-style-image: url("chrome://messenger/skin/addressbook/icons/remote-addrbook.gif"); } + +treechildren:-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) { + list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.gif"); +} diff --git a/LCARStrek/messenger/addressbook/addressbook.css b/LCARStrek/messenger/addressbook/addressbook.css index 3bd7c0a6..04079cbe 100644 --- a/LCARStrek/messenger/addressbook/addressbook.css +++ b/LCARStrek/messenger/addressbook/addressbook.css @@ -99,16 +99,16 @@ } #button-newim { - list-style-image:url("chrome://messenger/skin/addressbook/icons/newmsg.gif"); + list-style-image:url("chrome://messenger/skin/addressbook/icons/im.gif"); } #button-newim:hover, #button-newim:hover:active { - list-style-image: url("chrome://messenger/skin/addressbook/icons/newmsg-hover.gif"); + list-style-image: url("chrome://messenger/skin/addressbook/icons/im-hover.gif"); } #button-newim[disabled="true"] { - list-style-image: url("chrome://messenger/skin/addressbook/icons/newmsg-disabled.gif") !important; + list-style-image: url("chrome://messenger/skin/addressbook/icons/im-disabled.gif") !important; } #button-delete { diff --git a/LCARStrek/messenger/addressbook/icons/im-disabled.gif b/LCARStrek/messenger/addressbook/icons/im-disabled.gif new file mode 100644 index 0000000000000000000000000000000000000000..ad6181280840659211e99db93ece01d0fd644401 GIT binary patch literal 96 zcmZ?wbhEHblw=TPXkcJy2-xud|9{1wEQ|~cj0`#qKmd|qU^4INUwQg1`=Tl51H@!k zh!wBMx!|It^ke2K*KOI;7ZqKID<}%HJoh#+`SOgWz0qqPTdPeyzU*@#1A{dH0SzS& literal 0 HcmV?d00001 diff --git a/LCARStrek/messenger/addressbook/icons/im-hover.gif b/LCARStrek/messenger/addressbook/icons/im-hover.gif new file mode 100644 index 0000000000000000000000000000000000000000..743444d4f907038c5fdfc8c3fd8651960d707651 GIT binary patch literal 96 zcmZ?wbhEHblw=TPXkY+=|Ns9h{$ycfU|?j>0r5dH3{2)d{VPwuWnVPqe1Mqj3bEo9 wITu`%lzz-y<+?3<`l6x>aRo(Tmgn9kCSRV>v^RRqV{5gk$CrH$WMHrc0ER9jj{pDw literal 0 HcmV?d00001 diff --git a/LCARStrek/messenger/addressbook/icons/im.gif b/LCARStrek/messenger/addressbook/icons/im.gif new file mode 100644 index 0000000000000000000000000000000000000000..2a8a825ba3ff73175405c43e92260f469665cac0 GIT binary patch literal 96 zcmZ?wbhEHblw=TPXkcLYf1ct0|Nn|VSr{1@7#VaJfB+=Jz+~Rjzw-23_C-_92Z+h8 z5G!7hbHPPP>Br1fuG_MwFDkkaS5OpYdG2ju^5q##d!yGpwpN>ZeA(wf1_o;Y8#pCh literal 0 HcmV?d00001 diff --git a/LCARStrek/messenger/addressbook/icons/secure-remote-addrbook.gif b/LCARStrek/messenger/addressbook/icons/secure-remote-addrbook.gif new file mode 100644 index 0000000000000000000000000000000000000000..6a01f62f8ec5b95165381d7f474a7d0ba64ee7f5 GIT binary patch literal 99 zcmZ?wbhEHb=@E-{%{$ycfU|?a;VE_Vu~wJ37c3QmXfD(9VJg}3Rx{ydMrg@wTy054W3egFUf literal 0 HcmV?d00001 diff --git a/LCARStrek/messenger/folderMenus.css b/LCARStrek/messenger/folderMenus.css index 1d87a20c..d3c6d484 100644 --- a/LCARStrek/messenger/folderMenus.css +++ b/LCARStrek/messenger/folderMenus.css @@ -102,6 +102,14 @@ list-style-image: url("chrome://messenger/skin/icons/folder-template.gif"); } +.folderMenuItem[SpecialFolder="Junk"] { + list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif"); +} + +.folderMenuItem[SpecialFolder="Junk"][open="true"] { + list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif"); +} + .folderMenuItem[IsServer="true"] { list-style-image: url("chrome://messenger/skin/icons/server-mail.gif"); } diff --git a/LCARStrek/messenger/folderPane.css b/LCARStrek/messenger/folderPane.css index 2dd9673a..b8fe03b3 100644 --- a/LCARStrek/messenger/folderPane.css +++ b/LCARStrek/messenger/folderPane.css @@ -96,6 +96,13 @@ treechildren:-moz-tree-image(folderNameCol, specialFolder-Templates) { list-style-image: url("chrome://messenger/skin/icons/folder-template.gif"); } +/* ..... Junk ..... */ + +treechildren:-moz-tree-image(folderNameCol, specialFolder-Junk) { + padding-right: 2px; + list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif"); +} + /* ..... Trash ..... */ treechildren:-moz-tree-image(folderNameCol, specialFolder-Trash) { @@ -197,7 +204,7 @@ treechildren:-moz-tree-image(syncCol, isServer-true) { border: none; } -#folderUnreadCol, -#folderTotalCol { +#folderTotalCol, +#folderSizeCol { text-align: right; } diff --git a/LCARStrek/messenger/icons/folder-junk.gif b/LCARStrek/messenger/icons/folder-junk.gif new file mode 100644 index 0000000000000000000000000000000000000000..5050f624e8ec04a98ae540d9c44a806f50890984 GIT binary patch literal 102 zcmZ?wbhEHb6krfwSjfOIXU_ls=NbNkf#OdVMg|5Z1|0?<0Le2jnNR6w>#P=tXX;fa|?7Y3aD3Ym9Uud&bX7-C11_o;YA*~-1 literal 0 HcmV?d00001 diff --git a/LCARStrek/messenger/icons/message-mail-imapdelete-offline.gif b/LCARStrek/messenger/icons/message-mail-imapdelete-offline.gif index 34e8ee5e07bdfcf5b92c7d950c880ad8ecfce2e4..83b75ed549007f6f3159af2576bb84b607a3e1d6 100644 GIT binary patch literal 108 zcmZ?wbhEHb6kyII&(ILC;Xe{k{K>+|#lXOz1H=pI|NqvrPfoVrxq_v?~&TTJUW|6JRr(5uYIU=09T ClrL%k literal 86 zcmZ?wbhEHb6kyII&(ILCL5BedK;jHc`Yrt{XB$7eQ5bkmaMQi( po&0r-CN*+1IF$uj@^)=|BzElGTB%K5i>>}$%59VBUc|s)4FEn!A$9-& diff --git a/LCARStrek/messenger/icons/message-mail-imapdelete.gif b/LCARStrek/messenger/icons/message-mail-imapdelete.gif index 57e3d16edc816b1d6eb9392993623a9aa4cad9a0..d16051d25c676db1f216fcc7ef4e6c7c43138ad3 100755 GIT binary patch literal 108 zcmZ?wbhEHb6kyH7&(ILC;Xe{k{K>+|#lXOz1H=pI|NqvrPfoVrxq_v?~&TTJUW|6JRr(5uYIU=09k C6fc?p literal 126 zcmZ?wbhEHb6kyH7&(ILCfq@9115yLh>%d|xaKdvnk5c>I&C3oS v=)L1QZ??#)W>&t)7o4#Ll}~bZ{}EYdJ1wVew_xE6*=HUhMzbBmSs1JVNOK~K diff --git a/LCARStrek/messenger/primaryToolbar.css b/LCARStrek/messenger/primaryToolbar.css index a4a0d1b1..5a293fde 100644 --- a/LCARStrek/messenger/primaryToolbar.css +++ b/LCARStrek/messenger/primaryToolbar.css @@ -193,16 +193,16 @@ } #button-junk { - list-style-image: url("chrome://messenger/skin/toolbar/mark.gif"); + list-style-image: url("chrome://messenger/skin/toolbar/junk.gif"); } #button-junk:hover, #button-junk[buttonover="true"], #button-junk[buttondown="true"], #button-junk[open="true"] { - list-style-image: url("chrome://messenger/skin/toolbar/mark-hover.gif"); + list-style-image: url("chrome://messenger/skin/toolbar/junk-hover.gif"); } #button-junk[disabled="true"] { - list-style-image: url("chrome://messenger/skin/toolbar/mark-disabled.gif") !important; + list-style-image: url("chrome://messenger/skin/toolbar/junk-disabled.gif") !important; } diff --git a/LCARStrek/messenger/threadPane.css b/LCARStrek/messenger/threadPane.css index c380c226..bffd33e9 100644 --- a/LCARStrek/messenger/threadPane.css +++ b/LCARStrek/messenger/threadPane.css @@ -170,6 +170,25 @@ treechildren:-moz-tree-image(flaggedCol, flagged) { list-style-image: url("chrome://messenger/skin/icons/flaggedmail.gif"); } +/* ..... junkStatus column ..... */ + +treecol.junkStatusHeader { + list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif"); +} + +/* "unknown" now looks like "not junk". see bug #182386 */ +treechildren:-moz-tree-image(junkStatusCol) { + list-style-image: url("chrome://messenger/skin/icons/readmail.gif"); +} + +treechildren:-moz-tree-image(junkStatusCol, junk) { + list-style-image: url("chrome://messenger/skin/icons/message-junk-other.gif"); +} + +treechildren:-moz-tree-image(junkStatusCol, notjunk) { + list-style-image: url("chrome://messenger/skin/icons/readmail.gif"); +} + /* ..... subject column ..... */ treechildren:-moz-tree-image(subjectCol) { diff --git a/LCARStrek/messenger/toolbar/junk-disabled.gif b/LCARStrek/messenger/toolbar/junk-disabled.gif new file mode 100644 index 0000000000000000000000000000000000000000..289dae922d93d4dd0bffa1460a021e1e7bf68db4 GIT binary patch literal 149 zcmZ?wbhEHblw=TPXkcJy2-xud|9{1QqRvIBi6yBi3gww4844j8sS56%z5xu1KUo;L z7#JCJ7=Qqzg@Gx!r=R^~?}h~>ysLI+Y&cmpOY)(3oT3*+p!D`)&PB~ BIhp_f literal 0 HcmV?d00001 diff --git a/LCARStrek/messenger/toolbar/junk-hover.gif b/LCARStrek/messenger/toolbar/junk-hover.gif new file mode 100644 index 0000000000000000000000000000000000000000..8e1943af30a517d08c5201aa24fa7e21cce4d691 GIT binary patch literal 124 zcmZ?wbhEHblw=TPXkY+=|Ns9h{$yd~Vqj#@0r5dH3{1g2{p=@uH!LXOU9~%7!^x^y zk`KijXLtB6J~B09%F(-?`H8ZdclBxI-fy toolbargrippy { list-style-image:url("chrome://communicator/skin/icons/lock-broken.gif"); } +#popupIcon { + list-style-image:url("chrome://navigator/skin/icons/popup-blocked.gif"); +} + /* ::::: personal toolbar ::::: */ #bookmarks-button { -- 2.35.3