From 68c293ac2fd4156c32f56cffe4f45974732aca46 Mon Sep 17 00:00:00 2001 From: helge Date: Thu, 21 Jul 2005 15:34:28 +0000 Subject: [PATCH] fixed some 24x24 positioning git-svn-id: http://svn.opengroupware.org/SOGo/trunk@880 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/MailerUI/ChangeLog | 2 + SOGo/UI/MailerUI/UIxMailMainFrame.m | 4 +- SOGo/UI/MailerUI/Version | 2 +- .../Templates/MailerUI/UIxMailPanelFrame.wox | 7 +- SOGo/UI/WebServerResources/ChangeLog | 2 + SOGo/UI/WebServerResources/mailer-compose.css | 70 ++++++++++++++++++ SOGo/UI/WebServerResources/mailer-toolbar.css | 8 +-- SOGo/UI/WebServerResources/mailer.css | 71 ------------------- 8 files changed, 85 insertions(+), 81 deletions(-) create mode 100644 SOGo/UI/WebServerResources/mailer-compose.css diff --git a/SOGo/UI/MailerUI/ChangeLog b/SOGo/UI/MailerUI/ChangeLog index 4d1b1b6a..61cd65ff 100644 --- a/SOGo/UI/MailerUI/ChangeLog +++ b/SOGo/UI/MailerUI/ChangeLog @@ -1,5 +1,7 @@ 2005-07-21 Helge Hess + * UIxMailMainFrame.m: fixed banner positioning for 24x24 (v0.9.167) + * UIxMailMainFrame.m: fixed positioning for 24x24 icons (v0.9.166) 2005-07-21 Marcus Mueller diff --git a/SOGo/UI/MailerUI/UIxMailMainFrame.m b/SOGo/UI/MailerUI/UIxMailMainFrame.m index 4e63a6a9..031ebff9 100644 --- a/SOGo/UI/MailerUI/UIxMailMainFrame.m +++ b/SOGo/UI/MailerUI/UIxMailMainFrame.m @@ -157,14 +157,14 @@ static NSString *treeRootClassName = nil; #if 0 // 32x32 return [self showLinkBanner] ? @"top: 58px;" : nil /* fallback to CSS */; #else // 24x24 - return [self showLinkBanner] ? @"top: 50px;" : nil /* fallback to CSS */; + return [self showLinkBanner] ? @"top: 58px;" : 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 */; + return [self showLinkBanner] ? @"height: 110px;" : nil /* fallback to CSS */; #endif } diff --git a/SOGo/UI/MailerUI/Version b/SOGo/UI/MailerUI/Version index 198e67e3..33309d94 100644 --- a/SOGo/UI/MailerUI/Version +++ b/SOGo/UI/MailerUI/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=165 +SUBMINOR_VERSION:=167 # v0.9.140 requires SoObjects/Mailer v0.9.100 # v0.9.134 requires libSOGo v0.9.41 diff --git a/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox b/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox index 092b76ed..02d1f6ab 100644 --- a/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox +++ b/SOGo/UI/Templates/MailerUI/UIxMailPanelFrame.wox @@ -24,9 +24,10 @@ - - - + + + + diff --git a/SOGo/UI/WebServerResources/ChangeLog b/SOGo/UI/WebServerResources/ChangeLog index 0ad6d0c8..f96a9c98 100644 --- a/SOGo/UI/WebServerResources/ChangeLog +++ b/SOGo/UI/WebServerResources/ChangeLog @@ -1,5 +1,7 @@ 2005-07-21 Helge Hess + * mailer.css: moved compose styles to own file, mailer-compose.css + * mailer-toolbar.css: fixed positioning for 24x24 icons * mailer.css: moved toolbar to own file, mailer-toolbar.css diff --git a/SOGo/UI/WebServerResources/mailer-compose.css b/SOGo/UI/WebServerResources/mailer-compose.css new file mode 100644 index 00000000..cd49cd41 --- /dev/null +++ b/SOGo/UI/WebServerResources/mailer-compose.css @@ -0,0 +1,70 @@ +/* CSS for compose panel */ + +div#compose_panel div { + padding: 2px; +} +td#compose_leftside { + vertical-align: top; +} + +td#compose_rightside { + vertical-align: top; +} + +div#compose_fromline { +} +div#compose_toselection { +} +div#compose_internetmarker { + padding: 8px; + text-align: center; + background-color: white; + border-color: red; + border-width: 2px; + border-style: solid; +} +div#compose_attachments { +} +div#compose_attachments_list { + width: 100%; + height: 100px; + background-color: #FFFFFF; + font-size: 10px; + margin-left: 0px; + border-color: #808080; + border-width: 1px; + border-style: solid; +} + +div#compose_subject { + border-bottom-color: #808080; + border-bottom-width: 1; + border-bottom-style: solid; +} +div#compose_text { + border-top-color: white; + border-top-width: 1; + border-top-style: solid; +} + +div#compose_toselection select { + font-size: 10px; +} +div#compose_toselection input { + font-size: 10px; +} + +input#compose_subject_input { + font-size: 10px; + width: 100%; +} + +.compose_label { + font-size: 11px; + text-align: left; +} + +div#compose_text textarea { + width: 100%; + height: 280px; +} diff --git a/SOGo/UI/WebServerResources/mailer-toolbar.css b/SOGo/UI/WebServerResources/mailer-toolbar.css index f171d0cd..56a7d0d6 100644 --- a/SOGo/UI/WebServerResources/mailer-toolbar.css +++ b/SOGo/UI/WebServerResources/mailer-toolbar.css @@ -65,13 +65,13 @@ div.tb_consumer { /* consumes the spaces taken by the toolbar */ .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_trash { background-image: url(tb-mail-junk-flat-24x24.png); } +.tbicon_junk { background-image: url(tb-mail-junk-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_stop { background-image: url(tb-mail-stop-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); } +.tbicon_save { background-image: url(tb-mail-file-flat-24x24.png); } .tbicon_folderadd { background-image: url(tbtb_folderadd.png); } .tbicon_folderdel { background-image: url(tbtb_folderdel.png); } diff --git a/SOGo/UI/WebServerResources/mailer.css b/SOGo/UI/WebServerResources/mailer.css index 5838c1a7..ae3b4e76 100644 --- a/SOGo/UI/WebServerResources/mailer.css +++ b/SOGo/UI/WebServerResources/mailer.css @@ -339,77 +339,6 @@ img.mailer_imagecontent { pre.mailer_plaincontent { } -/* compose */ - -div#compose_panel div { - padding: 2px; -} -td#compose_leftside { - vertical-align: top; -} - -td#compose_rightside { - vertical-align: top; -} - -div#compose_fromline { -} -div#compose_toselection { -} -div#compose_internetmarker { - padding: 8px; - text-align: center; - background-color: white; - border-color: red; - border-width: 2px; - border-style: solid; -} -div#compose_attachments { -} -div#compose_attachments_list { - width: 100%; - height: 100px; - background-color: #FFFFFF; - font-size: 10px; - margin-left: 0px; - border-color: #808080; - border-width: 1px; - border-style: solid; -} - -div#compose_subject { - border-bottom-color: #808080; - border-bottom-width: 1; - border-bottom-style: solid; -} -div#compose_text { - border-top-color: white; - border-top-width: 1; - border-top-style: solid; -} - -div#compose_toselection select { - font-size: 10px; -} -div#compose_toselection input { - font-size: 10px; -} - -input#compose_subject_input { - font-size: 10px; - width: 100%; -} - -.compose_label { - font-size: 11px; - text-align: left; -} - -div#compose_text textarea { - width: 100%; - height: 280px; -} - /* attachment editor */ form#attachment_form { -- 2.39.5