From 59cdfb559f8c9a15f5c648e75ebd2a2aa89aa96a Mon Sep 17 00:00:00 2001 From: Stefan Reinhardt Date: Tue, 13 Jan 2015 11:15:26 +0000 Subject: [PATCH] pixelegg - Mail changes - Attachment... margin + border - Toolbar: color_positive action --- mail/templates/pixelegg/app.css | 26 ++++++++++++++++--- mail/templates/pixelegg/app.less | 44 ++++++++++++++++++++++++++++---- 2 files changed, 62 insertions(+), 8 deletions(-) diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index ae3698da4a..6bb22e46de 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -1086,6 +1086,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje /*background-color: @gray-0;*/ /*.gradient_thead;*/ } +#mail-compose .et2_toolbar button.toolbar_toggled { + background-color: #189800; +} #mail-compose #mail-compose_composeToolbar button#composeToolbar-send { height: 24px; /*margin-right: 3px !important;*/ @@ -1227,8 +1230,22 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje #mail-compose fieldset.mailSignature span { margin: 0px 8px; } -#mail-compose fieldset.mailUploadSection { +#mail-compose div.mailUploadSection { + border-top: 0px solid silver; + margin-top: 16px; + width: 99%; +} +#mail-compose div.mailUploadSection div.et2_hbox { + margin: -11px 0 5px -4px; +} +#mail-compose div.mailUploadSection div.et2_hbox label { + margin-right: 10%; +} +#mail-compose div.mailUploadSection #mail-compose_attachments { border-top: 1px solid silver; +} +#mail-compose fieldset.mailUploadSection { + border-top: 0px solid silver; font-size: 0.8em; margin: 8px 0; border-bottom: none; @@ -1269,8 +1286,8 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje #mail-display .et2_toolbar div.et2_toolbar_actionlist, #mail-display #mail-display_toolbar div.et2_toolbar_actionlist, #mail-display mail-display_displayToolbar div.et2_toolbar_actionlist { - margin-top: 3px; - margin-left: 3px; + margin-top: 0px; + margin-left: 0px; } #mail-display .et2_toolbar button, #mail-display #mail-display_toolbar button, @@ -1575,8 +1592,11 @@ div.ui-toolbar-menulist { -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0); box-shadow: 0px 0px 0px rgba(0, 0, 0, 0); border: none !important; + height: 24px !important; } .et2_toolbar_actionlist .et2_toolbar-dropdown .et2_dropdown button { + margin: 0px; + padding-top: -3px !important; -webkit-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0); -moz-box-shadow: 0px 0px 0px rgba(0, 0, 0, 0); box-shadow: 0px 0px 0px rgba(0, 0, 0, 0); diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index 3cc10b9095..160c142c1f 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -349,6 +349,14 @@ div#mail-index{ // ################################## // Toolbar +.et2_toolbar button.toolbar_toggled { + background-color: @color_positive_action; +} + + + + + #mail-compose_composeToolbar{ @@ -447,9 +455,30 @@ div#mail-index{ } - // Anhang + // File sent as... +div.mailUploadSection { + border-top: 0px solid silver; + margin-top: 16px; + width: 99%; + + // File Compose Elements + div.et2_hbox { + margin: -11px 0 5px -4px; + + label { margin-right: 10%;} + + } + + // Table - attachments + #mail-compose_attachments{ + border-top: 1px solid silver; + } + +} + + fieldset.mailUploadSection{ - border-top: 1px solid silver; + border-top: 0px solid silver; font-size: 0.8em; margin: 8px 0; border-bottom: none; @@ -497,7 +526,9 @@ div#mail-index{ /*display: -webkit-box;*/ // all buttons - div.et2_toolbar_actionlist{margin-top: 3px; margin-left: 3px;} + div.et2_toolbar_actionlist{ + margin-top: 0px; + margin-left: 0px;} button { .Complete_Button_Icon_normal; @@ -784,8 +815,11 @@ div.ui-toolbar-menulist{ .et2_dropdown{ .box_shadow_none; border: none !important; + height: 24px !important; button{ + margin: 0px; + padding-top: -3px !important; .box_shadow_none; background: @gray_10 !important; background-color: @gray_10 !important; @@ -798,13 +832,13 @@ div.ui-toolbar-menulist{ } } - + } .et2_button_icon { .dimension_height_xs; } - + ul> li{ } ul{ }