From: helge Date: Thu, 21 Jul 2005 15:24:48 +0000 (+0000) Subject: fixed position for 24x24 icons X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=537c6772d7423a7927fb9a1282b40d1b3dd92994;p=scalable-opengroupware.org fixed position for 24x24 icons git-svn-id: http://svn.opengroupware.org/SOGo/trunk@879 d1b88da0-ebda-0310-925b-ed51d893ca5b --- diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog index 7c017ff4..4d1b1b6a 100644 --- a/SOGo/UI/MailerUI/ChangeLog +++ b/SOGo/UI/MailerUI/ChangeLog @@ -1,13 +1,13 @@ -2005-07-21 Marcus Mueller +2005-07-21 Helge Hess - * v0.9.165 + * UIxMailMainFrame.m: fixed positioning for 24x24 icons (v0.9.166) - * Toolbars/SOGoDraftObject.toolbar: new Anais css +2005-07-21 Marcus Mueller - * v0.9.164 + * Toolbars/SOGoDraftObject.toolbar: new Anais css (v0.9.165) * UIxMailEditor.m: fetch attachment names and provide initial style - information to left/right side of editor component + information to left/right side of editor component (v0.9.164) 2005-07-21 Helge Hess diff --git a/SOGo/UI/MailerUI/UIxMailMainFrame.m b/SOGo/UI/MailerUI/UIxMailMainFrame.m index f9db05a7..4e63a6a9 100644 --- a/SOGo/UI/MailerUI/UIxMailMainFrame.m +++ b/SOGo/UI/MailerUI/UIxMailMainFrame.m @@ -154,10 +154,18 @@ static NSString *treeRootClassName = nil; return YES; } - (NSString *)bannerToolbarStyle { +#if 0 // 32x32 return [self showLinkBanner] ? @"top: 58px;" : nil /* fallback to CSS */; +#else // 24x24 + return [self showLinkBanner] ? @"top: 50px;" : nil /* fallback to CSS */; +#endif } - (NSString *)bannerConsumeStyle { +#if 0 // 32x32 return [self showLinkBanner] ? @"height: 116px;" : nil /* fallback to CSS */; +#else // 24x24 + return [self showLinkBanner] ? @"height: 102px;" : nil /* fallback to CSS */; +#endif } /* notifications */ diff --git a/SOGo/UI/WebServerResources/ChangeLog b/SOGo/UI/WebServerResources/ChangeLog index 0eabb1cd..0ad6d0c8 100644 --- a/SOGo/UI/WebServerResources/ChangeLog +++ b/SOGo/UI/WebServerResources/ChangeLog @@ -1,5 +1,7 @@ 2005-07-21 Helge Hess + * mailer-toolbar.css: fixed positioning for 24x24 icons + * mailer.css: moved toolbar to own file, mailer-toolbar.css 2005-07-21 Marcus Mueller @@ -8,7 +10,6 @@ * mailer.css: added tbicon_anais for Anais icon - 2005-07-21 Helge Hess * mailer.js: fixed a Linux Firefox issue with using POST in diff --git a/SOGo/UI/WebServerResources/OGoLogo.gif b/SOGo/UI/WebServerResources/OGoLogo.gif old mode 100755 new mode 100644 diff --git a/SOGo/UI/WebServerResources/mailer-toolbar.css b/SOGo/UI/WebServerResources/mailer-toolbar.css index 0c71aa0b..f171d0cd 100644 --- a/SOGo/UI/WebServerResources/mailer-toolbar.css +++ b/SOGo/UI/WebServerResources/mailer-toolbar.css @@ -4,23 +4,23 @@ table.tb_maintable { width: 100%; position: fixed; top: 0px; /* this is patched when the linkbar is on */ - height: 48px; + height: 40px; /* 48px; */ z-index: 100; } td.tb_logocell { - width: 36px; + width: 24px; /* 36px; */ padding-right: 8px; } div.tb_consumer { /* consumes the spaces taken by the toolbar */ - height: 58px; /* this is patched when the linkbar is on */ + height: 52px; /* 58px; */ /* this is patched when the linkbar is on */ clear: both; } .tb_toolbar { - height: 30px; + height: 22px; /* was 30 */ } .tb_toolbar_group { - height: 30px; + height: 22px; /* was 30 */ padding-right: 16px; } @@ -38,8 +38,8 @@ div.tb_consumer { /* consumes the spaces taken by the toolbar */ } .tb_icon a { - width: 30px; - height: 30px; + width: 24px; + height: 24px; margin: 0px auto; display: block; } @@ -50,18 +50,26 @@ div.tb_consumer { /* consumes the spaces taken by the toolbar */ height: 32px; } -.tbicon_getmail { background-image: url(tbtb_getmail.png); } -.tbicon_compose { background-image: url(tbtb_compose.png); } -.tbicon_addressbook { background-image: url(tbtb_addressbook.png); } +/* TODO: hover, doesn't work this way + as soon as I add ".tbicon_getmail" it stops working +.tb_icon a:hover .tbicon_getmail { + background-image: url(tb-mail-write-off-24x24.png); +} +*/ + +.tbicon_getmail { background-image: url(tb-mail-getmail-flat-24x24.png); } +.tbicon_compose { background-image: url(tb-mail-write-flat-24x24.png); } +.tbicon_addressbook { background-image: url(tb-mail-addressbook-flat-24x24.png); } .tbicon_anais { background-image: url(tbtb_anais.png); } -.tbicon_reply { background-image: url(tbtb_reply.png); } -.tbicon_replyall { background-image: url(tbtb_replyall.png); } -.tbicon_forward { background-image: url(tbtb_forward.png); } -.tbicon_delete { background-image: url(tbtb_delete.png); } -.tbicon_trash { background-image: url(tbtb_trash.png); } -.tbicon_junk { background-image: url(tbtb_trash.png); } -.tbicon_print { background-image: url(tbtb_print.png); } -.tbicon_stop { background-image: url(tbtb_deletedoc.png); } +.tbicon_reply { background-image: url(tb-mail-reply-flat-24x24.png); } +.tbicon_replyall { background-image: url(tb-mail-replyall-flat-24x24.png); } +.tbicon_forward { background-image: url(tb-mail-forward-flat-24x24.png); } +.tbicon_delete { background-image: url(tb-mail-delete-flat-24x24.png); } +.tbicon_trash { background-image: url(tb-mail-trash-flat-24x24.png); } +.tbicon_junk { background-image: url(tb-mail-trash-flat-24x24.png); } +.tbicon_print { background-image: url(tb-mail-print-flat-24x24.png); } +.tbicon_stop { background-image: url(tb-mail-deletedoc-flat-24x24.png); } + .tbicon_send { background-image: url(tbtb_compose_send_30x30.png); } .tbicon_attach { background-image: url(tbtb_compose_attach_30x30.png); } .tbicon_save { background-image: url(tbtb_compose_file_30x30.png); }