diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css index ccaa26f039..bff40a8794 100644 --- a/mail/templates/default/app.css +++ b/mail/templates/default/app.css @@ -941,7 +941,7 @@ img.smime_cert_unknownemail { .smimeIcons {position: absolute;right: 10px;} #mail-compose tr.mailComposeHeaders { - border-bottom: 1px solid silver; + border-top: 1px solid silver; } #mail-compose tr.mailComposeHeaders .et2_selectbox, #mail-compose tr.mailComposeHeaders .et2_taglist .ms-ctn, @@ -953,4 +953,12 @@ img.smime_cert_unknownemail { #mail-compose tr.mailComposeHeaders .et2_taglist .ms-ctn-focus { border: none; box-shadow: none; +} + +.et2_vbox.et2_box_widget.mailComposeBodySection { + margin-left: -3px; +} + +#mail-compose_subject { + padding: 10px 0 10px 0; } \ No newline at end of file diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet index 3c962d7ac3..fc2b90c2ec 100644 --- a/mail/templates/default/compose.xet +++ b/mail/templates/default/compose.xet @@ -60,10 +60,10 @@ - + - + @@ -82,16 +82,10 @@ - - - - - - - + diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css index fdf11d4a20..90bb078400 100644 --- a/mail/templates/mobile/app.css +++ b/mail/templates/mobile/app.css @@ -930,7 +930,7 @@ img.smime_cert_unknownemail { right: 10px; } #mail-compose tr.mailComposeHeaders { - border-bottom: 1px solid silver; + border-top: 1px solid silver; } #mail-compose tr.mailComposeHeaders .et2_selectbox, #mail-compose tr.mailComposeHeaders .et2_taglist .ms-ctn, @@ -943,6 +943,12 @@ img.smime_cert_unknownemail { border: none; box-shadow: none; } +.et2_vbox.et2_box_widget.mailComposeBodySection { + margin-left: -3px; +} +#mail-compose_subject { + padding: 10px 0 10px 0; +} #popupMainDiv { padding: 5px; } @@ -1109,6 +1115,9 @@ body { /*background-color: @gray-0;*/ /*.gradient_thead;*/ } +#mail-compose .mailComposeBodySection { + margin-top: -4px; +} #mail-compose .et2_toolbar button.toolbar_toggled:hover { background-color: white !important; } @@ -1187,54 +1196,34 @@ body { } #mail-compose .mailComposeHeaders span#mail-compose_cc_expander, #mail-compose .mailComposeHeadersSection span#mail-compose_cc_expander, +#mail-compose .mailComposeHeaders span#mail-compose_cc_expander, +#mail-compose .mailComposeHeadersSection span#mail-compose_cc_expander, +#mail-compose .mailComposeHeaders span#mail-compose_cc_expander, +#mail-compose .mailComposeHeadersSection span#mail-compose_cc_expander, +#mail-compose .mailComposeHeaders span#mail-compose_bcc_expander, +#mail-compose .mailComposeHeadersSection span#mail-compose_bcc_expander, #mail-compose .mailComposeHeaders span#mail-compose_bcc_expander, #mail-compose .mailComposeHeadersSection span#mail-compose_bcc_expander, #mail-compose .mailComposeHeaders span#mail-compose_folder_expander, #mail-compose .mailComposeHeadersSection span#mail-compose_folder_expander, +#mail-compose .mailComposeHeaders span#mail-compose_folder_expander, +#mail-compose .mailComposeHeadersSection span#mail-compose_folder_expander, +#mail-compose .mailComposeHeaders span#mail-compose_replyto_expander, +#mail-compose .mailComposeHeadersSection span#mail-compose_replyto_expander, #mail-compose .mailComposeHeaders span#mail-compose_replyto_expander, #mail-compose .mailComposeHeadersSection span#mail-compose_replyto_expander { - /*.border_normal;*/ - /*.box_shadow_standard_light;*/ - /*.rounded (3px);*/ - color: #000000; - -webkit-appearance: none; - -webkit-transition-property: background-color; - -moz-transition-property: background-color; - -o-transition-property: background-color; - transition-property: background-color; - -webkit-transition-duration: 0.5s; - -moz-transition-duration: 0.5s; - -o-transition-duration: 0.5s; - transition-duration: 0.5s; - -webkit-transition-timing-function: linear; - -moz-transition-timing-function: linear; - -o-transition-timing-function: linear; - transition-timing-function: linear; - background-color: #E6E6E6; - float: left; - width: 55px; - margin: 3px; - font-size: 8px; - margin-left: 12px; - padding: 0; -} -#mail-compose .mailComposeHeaders span#mail-compose_cc_expander:hover, -#mail-compose .mailComposeHeadersSection span#mail-compose_cc_expander:hover, -#mail-compose .mailComposeHeaders span#mail-compose_bcc_expander:hover, -#mail-compose .mailComposeHeadersSection span#mail-compose_bcc_expander:hover, -#mail-compose .mailComposeHeaders span#mail-compose_folder_expander:hover, -#mail-compose .mailComposeHeadersSection span#mail-compose_folder_expander:hover, -#mail-compose .mailComposeHeaders span#mail-compose_replyto_expander:hover, -#mail-compose .mailComposeHeadersSection span#mail-compose_replyto_expander:hover { - -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); - -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); - box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); - background-color: #189800; - color: #FFFFFF; + background: transparent; + border: none; + color: #26537c; + text-decoration: underline; + float: none; + width: auto; + white-space: nowrap; } #mail-compose .mailComposeHeaders input#mail-compose_subject, #mail-compose .mailComposeHeadersSection input#mail-compose_subject { max-width: 716px; + padding: 4px 0px 4px 5px; } #mail-compose .mailComposeHeaders input#mail-compose_mimeType, #mail-compose .mailComposeHeadersSection input#mail-compose_mimeType { diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index 10320b0635..d8b01124ad 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -918,7 +918,7 @@ img.smime_cert_unknownemail { right: 10px; } #mail-compose tr.mailComposeHeaders { - border-bottom: 1px solid silver; + border-top: 1px solid silver; } #mail-compose tr.mailComposeHeaders .et2_selectbox, #mail-compose tr.mailComposeHeaders .et2_taglist .ms-ctn, @@ -931,6 +931,12 @@ img.smime_cert_unknownemail { border: none; box-shadow: none; } +.et2_vbox.et2_box_widget.mailComposeBodySection { + margin-left: -3px; +} +#mail-compose_subject { + padding: 10px 0 10px 0; +} #popupMainDiv { padding: 5px; } @@ -1097,6 +1103,9 @@ body { /*background-color: @gray-0;*/ /*.gradient_thead;*/ } +#mail-compose .mailComposeBodySection { + margin-top: -4px; +} #mail-compose .et2_toolbar button.toolbar_toggled:hover { background-color: white !important; } @@ -1175,54 +1184,34 @@ body { } #mail-compose .mailComposeHeaders span#mail-compose_cc_expander, #mail-compose .mailComposeHeadersSection span#mail-compose_cc_expander, +#mail-compose .mailComposeHeaders span#mail-compose_cc_expander, +#mail-compose .mailComposeHeadersSection span#mail-compose_cc_expander, +#mail-compose .mailComposeHeaders span#mail-compose_cc_expander, +#mail-compose .mailComposeHeadersSection span#mail-compose_cc_expander, +#mail-compose .mailComposeHeaders span#mail-compose_bcc_expander, +#mail-compose .mailComposeHeadersSection span#mail-compose_bcc_expander, #mail-compose .mailComposeHeaders span#mail-compose_bcc_expander, #mail-compose .mailComposeHeadersSection span#mail-compose_bcc_expander, #mail-compose .mailComposeHeaders span#mail-compose_folder_expander, #mail-compose .mailComposeHeadersSection span#mail-compose_folder_expander, +#mail-compose .mailComposeHeaders span#mail-compose_folder_expander, +#mail-compose .mailComposeHeadersSection span#mail-compose_folder_expander, +#mail-compose .mailComposeHeaders span#mail-compose_replyto_expander, +#mail-compose .mailComposeHeadersSection span#mail-compose_replyto_expander, #mail-compose .mailComposeHeaders span#mail-compose_replyto_expander, #mail-compose .mailComposeHeadersSection span#mail-compose_replyto_expander { - /*.border_normal;*/ - /*.box_shadow_standard_light;*/ - /*.rounded (3px);*/ - color: #000000; - -webkit-appearance: none; - -webkit-transition-property: background-color; - -moz-transition-property: background-color; - -o-transition-property: background-color; - transition-property: background-color; - -webkit-transition-duration: 0.5s; - -moz-transition-duration: 0.5s; - -o-transition-duration: 0.5s; - transition-duration: 0.5s; - -webkit-transition-timing-function: linear; - -moz-transition-timing-function: linear; - -o-transition-timing-function: linear; - transition-timing-function: linear; - background-color: #E6E6E6; - float: left; - width: 55px; - margin: 3px; - font-size: 8px; - margin-left: 12px; - padding: 0; -} -#mail-compose .mailComposeHeaders span#mail-compose_cc_expander:hover, -#mail-compose .mailComposeHeadersSection span#mail-compose_cc_expander:hover, -#mail-compose .mailComposeHeaders span#mail-compose_bcc_expander:hover, -#mail-compose .mailComposeHeadersSection span#mail-compose_bcc_expander:hover, -#mail-compose .mailComposeHeaders span#mail-compose_folder_expander:hover, -#mail-compose .mailComposeHeadersSection span#mail-compose_folder_expander:hover, -#mail-compose .mailComposeHeaders span#mail-compose_replyto_expander:hover, -#mail-compose .mailComposeHeadersSection span#mail-compose_replyto_expander:hover { - -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); - -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); - box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6); - background-color: #189800; - color: #FFFFFF; + background: transparent; + border: none; + color: #26537c; + text-decoration: underline; + float: none; + width: auto; + white-space: nowrap; } #mail-compose .mailComposeHeaders input#mail-compose_subject, #mail-compose .mailComposeHeadersSection input#mail-compose_subject { max-width: 716px; + padding: 4px 0px 4px 5px; } #mail-compose .mailComposeHeaders input#mail-compose_mimeType, #mail-compose .mailComposeHeadersSection input#mail-compose_mimeType { diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index 5b69eae39d..c2a72efd10 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -203,7 +203,9 @@ body { /*background-color: @gray-0;*/ /*.gradient_thead;*/ } - + .mailComposeBodySection { + margin-top: -4px; + } // ################################## // Toolbar .et2_toolbar button.toolbar_toggled { @@ -264,20 +266,24 @@ body { /*Kopie*/ span#mail-compose_cc_expander, /*Blindkopie*/ - span#mail-compose_bcc_expander, - span#mail-compose_folder_expander, - span#mail-compose_replyto_expander{ - .Complete_Button_normal; - float: left; - width: 55px; - margin: 3px; - font-size: 8px; - margin-left: 12px; - padding:0; - &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;color: @gray_0;} + span#mail-compose_cc_expander, span#mail-compose_cc_expander, + span#mail-compose_bcc_expander, span#mail-compose_bcc_expander, + span#mail-compose_folder_expander, span#mail-compose_folder_expander, + span#mail-compose_replyto_expander, span#mail-compose_replyto_expander + { + background: transparent; + border: none; + color: #26537c; + text-decoration: underline; + float: none; + width: auto; + white-space: nowrap; } /*Betreff*/ - input#mail-compose_subject { max-width: 716px;} + input#mail-compose_subject { + max-width: 716px; + padding: 4px 0px 4px 5px; + } /*HTML Box*/ input#mail-compose_mimeType {margin-left: 12px;}