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 7c017ff40036afa5a6ed8a1db9f1b85be463d8b6..4d1b1b6a959fd36acaca41e8e5c1370545647e07 100644 (file)
--- a/SOGo/UI/MailerUI/ChangeLog
+++ b/SOGo/UI/MailerUI/ChangeLog
@@ -1,13 +1,13 @@
-2005-07-21  Marcus Mueller  <znek@mulle-kybernetik.com>
+2005-07-21  Helge Hess  <helge.hess@opengroupware.org>
 
-       * v0.9.165
+       * UIxMailMainFrame.m: fixed positioning for 24x24 icons (v0.9.166)
 
-       * Toolbars/SOGoDraftObject.toolbar: new Anais css
+2005-07-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
-       * 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  <helge.hess@opengroupware.org>
 

diff --git a/SOGo/UI/MailerUI/UIxMailMainFrame.m b/SOGo/UI/MailerUI/UIxMailMainFrame.m
index f9db05a7664f2d2f9cc3da3d5399507650822c8b..4e63a6a957a30a7bc8ad50632adffac361896367 100644 (file)
--- 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 0eabb1cdb55e6d77370ffaa1634a6e201cbd1ef7..0ad6d0c8841c7b7336af82925b9ee123d335bcb2 100644 (file)
--- a/SOGo/UI/WebServerResources/ChangeLog
+++ b/SOGo/UI/WebServerResources/ChangeLog
@@ -1,5 +1,7 @@
 2005-07-21  Helge Hess  <helge.hess@opengroupware.org>
 
+       * mailer-toolbar.css: fixed positioning for 24x24 icons
+
        * mailer.css: moved toolbar to own file, mailer-toolbar.css
 
 2005-07-21  Marcus Mueller  <znek@mulle-kybernetik.com>
@@ -8,7 +10,6 @@
 
        * mailer.css: added tbicon_anais for Anais icon
 
-
 2005-07-21  Helge Hess  <helge.hess@opengroupware.org>
 
        * 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 (executable)
new mode 100644 (file)

diff --git a/SOGo/UI/WebServerResources/mailer-toolbar.css b/SOGo/UI/WebServerResources/mailer-toolbar.css
index 0c71aa0bd80e479a8152458550d2c38009d5d966..f171d0cd0f9dcc61917342a7909436f6f217ecf8 100644 (file)
--- 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);   }