From 594750e7a9f2d25a47268218c2f263909c0b1d07 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 30 Dec 2013 17:34:29 +0000 Subject: [PATCH] Pixelegg changes --- addressbook/templates/pixelegg/app.css | 122 +++++++++--- addressbook/templates/pixelegg/app.less | 46 ++--- filemanager/templates/pixelegg/app.css | 77 ++++++-- filemanager/templates/pixelegg/app.less | 69 +++++-- mail/templates/pixelegg/app.css | 239 +++++++++++++----------- mail/templates/pixelegg/app.less | 161 ++++++++++------ 6 files changed, 464 insertions(+), 250 deletions(-) diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css index 633162903c..ac28bd3714 100755 --- a/addressbook/templates/pixelegg/app.css +++ b/addressbook/templates/pixelegg/app.css @@ -200,9 +200,9 @@ fieldset.emailGroup { margin-top: 0; } div#addressbook-index div.et2_hbox_left select#addressbook-index_org_view:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } div#addressbook-index div.et2_hbox_right { width: auto; @@ -225,9 +225,9 @@ fieldset.emailGroup { margin-left: 5px; } div#addressbook-index div.et2_hbox_right select.et2_selectbox:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } div#addressbook-index div.et2_hbox_right select.et2_selectbox:focus { outline: 0; @@ -248,6 +248,18 @@ fieldset.emailGroup { -moz-border-radius: 3px; border-radius: 3px; color: #000000; + -webkit-transition-property: background; + -moz-transition-property: background; + -o-transition-property: background; + transition-property: background; + -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; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; @@ -267,15 +279,27 @@ fieldset.emailGroup { -moz-border-radius: 3px; border-radius: 3px; color: #000000; + -webkit-transition-property: background; + -moz-transition-property: background; + -o-transition-property: background; + transition-property: background; + -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; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; background-size: 20px auto !important; width: auto; height: 32px; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } div#addressbook-index div.et2_hbox_right button#addressbook-index_search:focus { background-image: url('../../../pixelegg/images/advanced-search.png'); @@ -287,15 +311,27 @@ fieldset.emailGroup { -moz-border-radius: 3px; border-radius: 3px; color: #000000; + -webkit-transition-property: background; + -moz-transition-property: background; + -o-transition-property: background; + transition-property: background; + -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; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; background-size: 20px auto !important; width: auto; height: 32px; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } div#addressbook-index div.et2_hbox_right button#addressbook-index_add { background-color: #0b5fa4 !important; @@ -319,9 +355,9 @@ fieldset.emailGroup { div#addressbook-index div.et2_hbox_right button#addressbook-index_add:hover { background-color: #66a1d2 !important; color: #ffc200; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); -webkit-border-radius: 3px; -webkit-border-top-left-radius: 20px; -moz-border-radius: 3px; @@ -391,9 +427,9 @@ fieldset.emailGroup { font-size: 11px; } .et2_container[id^="infolog-index-addressbook"] .et2_hbox_right[id*="_infolog-index-header_right"] div.et2_box_widget:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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: #66a1d2 !important; } .et2_container[id^="infolog-index-addressbook"] .et2_hbox_right[id*="_infolog-index-header_right"] div.et2_box_widget img { @@ -414,9 +450,9 @@ fieldset.emailGroup { } .et2_container[id^="infolog-index-addressbook"] .et2_hbox_right[id*="_infolog-index-header_right"] div.et2_box_widget img:hover { background-color: #cccccc; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -468,7 +504,7 @@ fieldset.emailGroup { } button[id="addressbook-edit_button[delete]"] { float: right; - margin-top: -37px; + margin-top: 5px; } /*#######################################################*/ /*State: Address selected*/ @@ -539,11 +575,23 @@ fieldset.emailGroup { -moz-border-radius: 3px; border-radius: 3px; color: #000000; + -webkit-transition-property: background; + -moz-transition-property: background; + -o-transition-property: background; + transition-property: background; + -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; } div.addressbook_edit_general_picture img.photo:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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: inherit !important; } div.addressbook_edit_general_picture table.uploadphoto { @@ -777,9 +825,9 @@ fieldset.emailGroup { div#addressbook-edit fieldset.emailGroup td a.et2_url:hover, div#addressbook-search fieldset.emailGroup td a.et2_url:hover { background-color: #cccccc; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -937,9 +985,9 @@ fieldset.emailGroup { } div#addressbook-edit_addressbook-edit-links div#addressbook-edit_link_to img.et2_button_icon:hover { background-color: #cccccc; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; @@ -1009,6 +1057,18 @@ fieldset.emailGroup { -moz-border-radius: 3px; border-radius: 3px; color: #000000; + -webkit-transition-property: background; + -moz-transition-property: background; + -o-transition-property: background; + transition-property: background; + -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; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less index 932e07649d..519be2dfd1 100755 --- a/addressbook/templates/pixelegg/app.less +++ b/addressbook/templates/pixelegg/app.less @@ -105,8 +105,8 @@ div#addressbook-index{ // erweiterte Suche button#addressbook-index_search{ - .background-color-10-gray; - .color-100-gray; + .background_color_10_gray; + .color_100_gray; .Complete_Button_text_icon_before; background-image:url('../../../pixelegg/images/advanced-search.png') !important; @@ -326,7 +326,7 @@ div#addressbook-index{ // Button delete button[id="addressbook-edit_button[delete]"]{ float: right; - margin-top: -37px; + margin-top: 5px; } @@ -425,9 +425,9 @@ div.addressbook_edit_general_picture { table.uploadphoto { .rounded (3px); - .background-color-10-gray; + .background_color_10_gray; width: auto; - .bordered(@gray-100, @gray-100, @gray-100, @gray-100); + .bordered(@gray_100, @gray_100, @gray_100, @gray_100); left: 30%; top: 289px; @@ -487,7 +487,7 @@ div#addressbook-search{ /*POPUP*/ /* edit Name */ table.editname { - .background-color-10-gray; + .background_color_10_gray; z-index: 10; font-size: 1em; @@ -534,7 +534,7 @@ div#addressbook-search{ margin-top: 12px; margin-left: 1em; height: auto; - .background-color-15-gray; + .background_color_15_gray; .border_radius_button_normal; legend { text-transform: uppercase;} @@ -545,8 +545,8 @@ div#addressbook-search{ table.et2_grid { margin-left: -7px; - tr:nth-child(even) {background: @color-even;} - tr:nth-child(odd) {background: @color-odd;} + tr:nth-child(even) {background: @color_even;} + tr:nth-child(odd) {background: @color_odd;} td {padding: 3px 0px;} } @@ -577,15 +577,15 @@ div#addressbook-search{ margin-top: 10px; margin-left: 1em; height: auto; - .background-color-15-gray; + .background_color_15_gray; .border_radius_button_normal; legend { text-transform: uppercase;} table.et2_grid { margin-left: -7px; - tr:nth-child(even) {background: @color-even;} - tr:nth-child(odd) {background: @color-odd;} + tr:nth-child(even) {background: @color_even;} + tr:nth-child(odd) {background: @color_odd;} td {padding: 3px 0px;} } @@ -660,14 +660,14 @@ div#addressbook-search{ table.et2_grid{ - background-color: @gray-30; - .bordered (@gray-30,@gray-30,@gray-30,@gray-30); + background-color: @gray_30; + .bordered (@gray_30,@gray_30,@gray_30,@gray_30); .rounded (5px); margin-left: 2px; - border-top: 1px solid @gray-30 !important; - tr:nth-child(even) {background: @color-even;} - tr:nth-child(odd) {background: @color-odd;} + border-top: 1px solid @gray_30 !important; + tr:nth-child(even) {background: @color_even;} + tr:nth-child(odd) {background: @color_odd;} td {padding: 5px 0px 5px 3px;} } @@ -743,9 +743,9 @@ div#addressbook-edit_addressbook-edit-cats {overflow: scroll;} table.et2_grid{ margin-left: 2px; - border-top: 1px solid @gray-30 !important; - tr:nth-child(even) {background: @color-even;} - tr:nth-child(odd) {background: @color-odd;} + border-top: 1px solid @gray_30 !important; + tr:nth-child(even) {background: @color_even;} + tr:nth-child(odd) {background: @color_odd;} td {padding: 5px 0px 5px 3px;} } @@ -975,7 +975,7 @@ div.addressbook.edit.general{ // Dialog Upload photo .uploadphoto { - background-color: @gray-20; + background-color: @gray_20; border: 1px solid black !important; display: none; left: 48px; @@ -984,7 +984,7 @@ div.addressbook.edit.general{ top: 168px; } -table.uploadphoto {width: 360px !important; background-color: @gray-20 !important; .rounded (9px);} +table.uploadphoto {width: 360px !important; background-color: @gray_20 !important; .rounded (9px);} @@ -1063,4 +1063,4 @@ table.uploadphoto {width: 360px !important; background-color: @gray-20 !importan } -// \ No newline at end of file +// \ No newline at end of file diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css index f788d05e5f..4b827ab74d 100755 --- a/filemanager/templates/pixelegg/app.css +++ b/filemanager/templates/pixelegg/app.css @@ -118,30 +118,81 @@ input.displayNone { */ /*//****************************************************************** // iframe*/ +#filemanager-index_filemanager-index-header_left { + float: left; + height: 42px; + width: 100%; +} div.filemanager_navigation { position: relative; width: 100%; } div.filemanager_navigation img { - width: 24px; - height: 24px; + width: 16px; + height: 16px; + background-color: #f0f0f0; + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + padding: 0.2em; } +div.filemanager_navigation img:hover { + background-color: #cccccc; + -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + border: 1px solid rgba(0, 0, 0, 0.5); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +div.filemanager_navigation img#filemanager-index_tarp { + border: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; +} +div.filemanager_navigation img#filemanager-index_tarp:hover { + border: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + background-color: #f0f0f0; +} +/*Up img*/ +img#filemanager-index_up { + position: relative; + top: 5px; +} +/*Home img*/ +img#filemanager-index_home { + position: relative; + top: 5px; +} +/*Pfad */ div.filemanager_navigation > label { float: left; /*position: absolute;*/ left: 55px; - right: 625px; + right: 567px; /*padding-top: 3px;*/ font-size: 140%; - top: -9px; + top: 0px; } /*Buttons / Tarp / FileUpload*/ #filemanager-index_buttons { - float: right; - left: 0px; - right: 30%; - position: relative; - top: -26px; + /* float: right; + left: 0px; + right: 30%; + position: relative;*/ + /*top: -26px;*/ + float: left; + position: absolute; + right: 0; } #filemanager-index_buttons > * { padding-left: 3px; @@ -165,6 +216,7 @@ div.filemanager_navigation > label > input { border-top-left-radius: 20px; color: #fff; height: auto; + width: 20em; } #filemanager-index .et2_file:before { content: "+"; @@ -190,6 +242,7 @@ div.filemanager_navigation > label > input { } #filemanager-index .et2_file #filemanager-index_upload { border: none; + width: 20em; } #filemanager-index #filemanager-index_tarp { width: 32px !important; @@ -216,7 +269,7 @@ div.filemanager_navigation > label > input { #filemanager-select .dialog-header .selectPathContainer { overflow: auto; width: 470px; - margin-top: 0px; + margin_top: 0px; height: 32px; } #filemanager-select .dialog-header .selectPathContainer input { @@ -234,10 +287,10 @@ div.filemanager_navigation > label > input { border: 1px solid rgba(0, 0, 0, 0.15); } #filemanager-select table#filemanager-select_dir tr:nth-child(even) { - background: #e6e6e6; + background: #ffffff; } #filemanager-select table#filemanager-select_dir tr:nth-child(odd) { - background: #cdcdcd; + background: #ebebeb; } #filemanager-select .vfsMimeIcon { width: 16px; diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less index 3a9fd9bc96..f16ad1a034 100644 --- a/filemanager/templates/pixelegg/app.less +++ b/filemanager/templates/pixelegg/app.less @@ -25,32 +25,74 @@ /*//****************************************************************** // iframe*/ +#filemanager-index_filemanager-index-header_left { + float: left; + height: 42px; + width: 100%; +} + div.filemanager_navigation { position: relative; width: 100%; - img { width: 24px; height: 24px;} + + img { + .dimension_width_height_s; + .Complete_Button_Icon_normal; + padding: 0.2em; + + &:hover {.Complete_Button_Icon_hover;} + } + + img#filemanager-index_tarp { + border: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + &:hover { + border: none; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + .background_color_10_gray; + } + } } + /*Up img*/ + img#filemanager-index_up {position: relative; top: 5px;} + + /*Home img*/ + img#filemanager-index_home {position: relative; top: 5px;} + + + /*Pfad */ div.filemanager_navigation > label { float: left; /*position: absolute;*/ left: 55px; - right: 625px; + right: 567px; /*padding-top: 3px;*/ font-size: 140%; - top: -9px; + top: 0px; } + + /*Buttons / Tarp / FileUpload*/ #filemanager-index_buttons { - float: right; +/* float: right; left: 0px; right: 30%; - position: relative; - top: -26px; + position: relative;*/ + /*top: -26px;*/ + + float: left; + position: absolute; + right: 0; + } #filemanager-index_buttons > * { @@ -72,11 +114,12 @@ div.filemanager_navigation > label > input { &:before{font-size: 1em;} color: #fff; height: auto; + width: 20em; &:hover { .Complete_Button_add_hover; } - #filemanager-index_upload {border: none;} + #filemanager-index_upload {border: none; width: 20em;} @@ -107,9 +150,9 @@ div.filemanager_navigation > label > input { .dialog-header{ .et2_button_icon{ margin: 4px 4px 0 4px; - .bordered (@gray-0, @gray-0, @gray-0, @gray-0); + .bordered (@gray_0, @gray_0, @gray_0, @gray_0); .rounded (3px); - background-color: @gray-0; + background-color: @gray_0; height: auto; width: 24px; } @@ -117,7 +160,7 @@ div.filemanager_navigation > label > input { .selectPathContainer { overflow: auto; width: 470px; - margin-top: 0px; + margin_top: 0px; height: 32px; input {height: 20px;} @@ -125,7 +168,7 @@ div.filemanager_navigation > label > input { } } #filemanager-select_apps{ - .background-color-15-gray; + .background_color_15_gray; .et2_button_icon{ height: auto; width: 24px; @@ -135,8 +178,8 @@ div.filemanager_navigation > label > input { table#filemanager-select_dir{ .border_normal; - tr:nth-child(even) {background: @color-even;} - tr:nth-child(odd) {background: @color-odd;} + tr:nth-child(even) {background: @color_even;} + tr:nth-child(odd) {background: @color_odd;} } diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index 5d8f801075..61b1950842 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -671,9 +671,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje } .egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:hover, .egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"]:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); } .egw_fw_ui_category_content #mail-index_buttonmailcreate button#mail-index_button[mailcreate]:focus, .egw_fw_ui_category_content #mail-index_buttonmailcreate button[id*="mailcreate"]:focus { @@ -738,17 +738,33 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00f0f0f0', endColorstr='#a6bfbfbf', GradientType=0); /* IE6-9 */ } +#mail-compose .mail-compose_toolbar { + height: 32px; +} +#mail-compose .mail-compose_toolbar button.et2_button { + height: 24px; + /* &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;} + &:focus {.box_shadow_standard_light_inset; .background_color_15_gray;}*/ +} #mail-compose .mail-compose_toolbar img { - width: 22px; + height: 16px; } #mail-compose .mail-compose_toolbar .mail-compose_button { - margin-right: 15px; + margin-right: 15px !important; padding: 0 3px 0 0; + text-align: left; + font-weight: bold; + padding-left: 30px; + width: 7em; + background-image: url(images/mail_send.png) !important; + background-position: left; + background-repeat: no-repeat; + background-size: 16px 16px; } -#mail-compose .mail-compose_toolbar img#mail-compose_button[saveAsDraft], -#mail-compose .mail-compose_toolbar .et2_button_icon { +#mail-compose .mail-compose_toolbar img[id="mail-compose_button[saveAsDraftAndPrint]"], +#mail-compose .mail-compose_toolbar img[id="mail-compose_button[saveAsDraft]"] { vertical-align: middle; - padding: 2px; + padding: 3px; background-color: #f0f0f0; -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -758,15 +774,33 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje -moz-border-radius: 3px; border-radius: 3px; } -#mail-compose .mail-compose_toolbar img#mail-compose_button[saveAsDraft]:hover, -#mail-compose .mail-compose_toolbar .et2_button_icon:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - background-color: #d9d9d9; +#mail-compose .mail-compose_toolbar img[id="mail-compose_button[saveAsDraftAndPrint]"]:hover, +#mail-compose .mail-compose_toolbar img[id="mail-compose_button[saveAsDraft]"]: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; } -#mail-compose .mail-compose_toolbar img#mail-compose_button[saveAsDraft]:focus, -#mail-compose .mail-compose_toolbar .et2_button_icon:focus { +#mail-compose .mail-compose_toolbar img[id="mail-compose_selectFromVFSForCompose"] { + margin-left: 15px !important; + vertical-align: middle; + padding: 3px; + background-color: #f0f0f0; + -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); + border: 1px solid rgba(0, 0, 0, 0.15); + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; +} +#mail-compose .mail-compose_toolbar img[id="mail-compose_selectFromVFSForCompose"]: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; +} +#mail-compose .mail-compose_toolbar img[id="mail-compose_selectFromVFSForCompose"]:focus { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -776,8 +810,8 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje #mail-compose .mail-compose_toolbar .mail-compose_fileselector { vertical-align: middle; } -#mail-compose .mail-compose_toolbar .et2_file #mail-compose_uploadForCompose, -#mail-compose .mail-compose_toolbar .mail-compose_fileselector #mail-compose_uploadForCompose { +#mail-compose .mail-compose_toolbar .et2_file input#mail-compose_uploadForCompose, +#mail-compose .mail-compose_toolbar .mail-compose_fileselector input#mail-compose_uploadForCompose { font-size: 0.7em; border: 1px solid rgba(0, 0, 0, 0.15); -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); @@ -787,6 +821,18 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje -moz-border-radius: 3px; border-radius: 3px; color: #000000; + -webkit-transition-property: background; + -moz-transition-property: background; + -o-transition-property: background; + transition-property: background; + -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; padding-left: 30px !important; background-position: 6px center !important; background-repeat: no-repeat !important; @@ -798,15 +844,15 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje height: 20px; margin-left: 5px; } -#mail-compose .mail-compose_toolbar .et2_file #mail-compose_uploadForCompose:hover, -#mail-compose .mail-compose_toolbar .mail-compose_fileselector #mail-compose_uploadForCompose:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - background-color: #d9d9d9; +#mail-compose .mail-compose_toolbar .et2_file input#mail-compose_uploadForCompose:hover, +#mail-compose .mail-compose_toolbar .mail-compose_fileselector input#mail-compose_uploadForCompose: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; } -#mail-compose .mail-compose_toolbar .et2_file #mail-compose_uploadForCompose:focus, -#mail-compose .mail-compose_toolbar .mail-compose_fileselector #mail-compose_uploadForCompose:focus { +#mail-compose .mail-compose_toolbar .et2_file input#mail-compose_uploadForCompose:focus, +#mail-compose .mail-compose_toolbar .mail-compose_fileselector input#mail-compose_uploadForCompose:focus { -webkit-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); -moz-box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); box-shadow: inset 1px 2px 1px rgba(0, 0, 0, 0.5); @@ -814,90 +860,51 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje } #mail-compose .mail-compose_toolbar .et2_file div.progress, #mail-compose .mail-compose_toolbar .mail-compose_fileselector div.progress { - width: 247px; + width: 230px; } #mail-compose .mail-compose_toolbar span.et2_label { font-size: 0.7em; } -#mail-compose .mail-compose_toolbar .mail-compose_infolog { - vertical-align: middle; - height: 20px; - padding: 3px 2px; - background-color: #f0f0f0; - -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; +#mail-compose .mail-compose_toolbar #mail-compose_to_infolog { + margin-right: 15px !important; +} +#mail-compose .mail-compose_toolbar #mail-compose_to_infolog:hover { + -webkit-transform: scale(1.5); + -moz-transform: scale(1.5); + -o-transform: scale(1.5); + -ms-transform: scale(1.5); + transform: scale(1.5); +} +#mail-compose .mail-compose_toolbar input[id="mail-compose_to_tracker"] { + margin-right: 10px !important; +} +#mail-compose .mail-compose_toolbar input[id="mail-compose_to_tracker"]:hover { + -webkit-transform: scale(1.5); + -moz-transform: scale(1.5); + -o-transform: scale(1.5); + -ms-transform: scale(1.5); + transform: scale(1.5); +} +#mail-compose .mail-compose_toolbar #mail-compose_disposition { + margin-right: 10px !important; +} +#mail-compose .mail-compose_toolbar #mail-compose_disposition:hover { + -webkit-transform: scale(1.5); + -moz-transform: scale(1.5); + -o-transform: scale(1.5); + -ms-transform: scale(1.5); + transform: scale(1.5); +} +#mail-compose .mail-compose_toolbar #mail-compose_priority { + /* vertical-align: middle; + height: 20px; + padding: 3px 2px; + .Complete_Button_Icon_normal;*/ margin-right: 3px; -} -#mail-compose .mail-compose_toolbar .mail-compose_infolog .et2_button_icon { - border: none; - box-shadow: none; - border-radius: 0px; - background-color: transparent; -} -#mail-compose .mail-compose_toolbar .mail-compose_tracker { - vertical-align: middle; - height: 20px; - padding: 3px 2px; - background-color: #f0f0f0; - -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - margin-right: 3px; -} -#mail-compose .mail-compose_toolbar .mail-compose_tracker span.et2_label { - font-size: 0.7em; - height: 20px; -} -#mail-compose .mail-compose_toolbar .mail-compose_tracker .et2_button_icon { - border: none; - box-shadow: none; - border-radius: 0px; - background-color: transparent; -} -#mail-compose .mail-compose_toolbar .mail-compose_notification { - vertical-align: middle; - height: 20px; - padding: 3px 2px; - background-color: #f0f0f0; - -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - margin-right: 3px; -} -#mail-compose .mail-compose_toolbar .mail-compose_priority { - vertical-align: middle; - height: 20px; - padding: 3px 2px; - background-color: #f0f0f0; - -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.5); - border: 1px solid rgba(0, 0, 0, 0.15); - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - margin-right: 3px; -} -#mail-compose .mail-compose_toolbar .mail-compose_priority span.et2_label { - margin-right: 3px; -} -#mail-compose .mail-compose_toolbar .mail-compose_priority select#mail-compose_priority { - box-shadow: none; font-size: 0.8em; - border: none; +} +#mail-compose .mail-compose_toolbar #mail-compose_priority span.et2_label { + margin-right: 3px; } #mail-compose .mailComposeHeaders, #mail-compose .mailComposeHeadersSection { @@ -917,7 +924,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje } #mail-compose .mailComposeHeaders span.ui-state-error, #mail-compose .mailComposeHeadersSection span.ui-state-error { - color: #043a6b; + color: #ae1d00; } #mail-compose .mailComposeHeaders div.ms-res-item-active, #mail-compose .mailComposeHeadersSection div.ms-res-item-active { @@ -933,9 +940,17 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje } #mail-compose fieldset.mailSignature { font-size: 0.8em; + border: none; + margin: 8px 0; } #mail-compose fieldset.mailSignature span { - margin-left: 8px; + margin: 0px 8px; +} +#mail-compose fieldset.mailUploadSection { + font-size: 0.8em; + border: none; + margin: 8px 0; + background-color: #d9d9d9; } /* ################################################################################## * E-Mail Dialog "Ansehen" @@ -969,9 +984,9 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje height: 20px; } #mail-display .mailDisplayHeaderSection #mail-display_toolbar button:hover { - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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: #d9d9d9; } #mail-display .mailDisplayHeaderSection #mail-display_toolbar button:focus { @@ -1515,9 +1530,9 @@ input[type=button] { } #mail-index_toolbar button:hover { background-color: #cccccc; - -webkit-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - -moz-box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); - box-shadow: 1px 2px 1px rgba(0, 0, 0, 0.9); + -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); border: 1px solid rgba(0, 0, 0, 0.5); -webkit-border-radius: 3px; -moz-border-radius: 3px; diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index 2534134122..48cadd2d97 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -127,7 +127,7 @@ div#mail-index{ div#mail-index_mailPreview{ // padding: 3px; margin: 0; - .background-color-25-gray; + .background_color_25_gray; // From div#mail-index_mailPreviewHeadersFrom{ width: 50%; @@ -290,7 +290,7 @@ div#mail-index{ .mailComposeHeaders:first-child{ /*background-color: @gray-0;*/ - .gradient-thead; + .gradient_thead; } @@ -299,97 +299,129 @@ div#mail-index{ // Toolbar .mail-compose_toolbar{ - img{width: 22px;} + + .dimension_height_l; + + button.et2_button { + .dimension_height_m; +/* &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;} + &:focus {.box_shadow_standard_light_inset; .background_color_15_gray;}*/ + } + + img{ + .dimension_height_s; + + } + + // Button senden -> dev_buttons.less .mail-compose_button{ - margin-right: 15px; + margin-right: 15px !important; padding: 0 3px 0 0; + text-align: left; + font-weight: bold; + padding-left: 30px; + width: 7em; + + background-image: url(images/mail_send.png) !important; + background-position: left; + background-repeat: no-repeat; + background-size: 16px 16px; } - // Save - img#mail-compose_button[saveAsDraft], - .et2_button_icon { + // Save + Print + img[id="mail-compose_button[saveAsDraftAndPrint]"], + img[id="mail-compose_button[saveAsDraft]"]{ vertical-align: middle; - padding: 2px; + padding: 3px; .Complete_Button_Icon_normal; - &:hover {.box_shadow_standard_light_hover; .background-color-15-gray;} - &:focus {.box_shadow_standard_light_inset; .background-color-15-gray;} + &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;} + } + + + + // Dateimanager + img[id="mail-compose_selectFromVFSForCompose"] { + margin-left: 15px !important; + vertical-align: middle; + padding: 3px; + .Complete_Button_Icon_normal; + &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;} + &:focus {.box_shadow_standard_light_inset; .background_color_15_gray;} + } + + // Dateien Upload .et2_file, .mail-compose_fileselector{ + + vertical-align: middle; - #mail-compose_uploadForCompose{ + + input#mail-compose_uploadForCompose{ - font-size: 0.7em; - .Complete_Button_text_icon_before; - background-image: url(images/attach.png) !important; - .background-color-5-gray; - height: 20px; - margin-left: 5px; - &:hover {.box_shadow_standard_light_hover; .background-color-15-gray;} + font-size: 0.7em; + .Complete_Button_text_icon_before; + background-image: url(images/attach.png) !important; + .background_color_5_gray; + height: 20px; + margin-left: 5px; + &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;} - &:focus {.box_shadow_standard_light_inset; .background-color-15-gray;} + &:focus {.box_shadow_standard_light_inset; .background_color_15_gray;} - } + } - div.progress {width: 247px;} + div.progress {width: 230px;} } // Speichern als span.et2_label {font-size: 0.7em;} - //als INfolog - .mail-compose_infolog{ - vertical-align: middle; - height: 20px; - padding: 3px 2px; - .Complete_Button_Icon_normal; - margin-right: 3px; - .et2_button_icon {border: none; box-shadow: none; border-radius: 0px; background-color: transparent;} + //als Infolog + #mail-compose_to_infolog{ + margin-right: 15px !important; + &:hover{ + .scale; + } } //als Ticket - .mail-compose_tracker{ - vertical-align: middle; - height: 20px; - padding: 3px 2px; - .Complete_Button_Icon_normal; - margin-right: 3px; - span.et2_label {font-size: 0.7em; height: 20px;} - .et2_button_icon {border: none; box-shadow: none; border-radius: 0px; background-color: transparent;} + input[id="mail-compose_to_tracker"]{ + + margin-right: 10px !important; + &:hover { + .scale; + + } } // Empfangsbenachrichtigung - .mail-compose_notification{ - vertical-align: middle; - height: 20px; - padding: 3px 2px; - .Complete_Button_Icon_normal; - margin-right: 3px; + #mail-compose_disposition{ + + margin-right: 10px !important; + &:hover { + .scale; + } } // Priorität - .mail-compose_priority{ - vertical-align: middle; + #mail-compose_priority{ +/* vertical-align: middle; height: 20px; padding: 3px 2px; - .Complete_Button_Icon_normal; + .Complete_Button_Icon_normal;*/ margin-right: 3px; + font-size: 0.8em; span.et2_label {margin-right: 3px;} - select#mail-compose_priority{ - box-shadow: none; - font-size: 0.8em; - border: none; - - } } @@ -410,7 +442,7 @@ div#mail-index{ div{ max-width: 770px; } // Automatische Auwahlliste - span.ui-state-error {color: @egw_color_2_c;} + span.ui-state-error {color: @color_error;} div.ms-res-item-active { background: @egw_color_2_a; span {color: #FFFFFF;} @@ -429,12 +461,23 @@ div#mail-index{ // Signature fieldset.mailSignature { font-size: 0.8em; + border: none; + margin: 8px 0; select {} - span {margin-left: 8px;} + span {margin:0px 8px;} } + // Anhang + fieldset.mailUploadSection{ + + font-size: 0.8em; + border: none; + margin: 8px 0; + .background_color_15_gray; + } + } // Ende Dialog @@ -461,8 +504,8 @@ div#mail-index{ // float: left; .Complete_Button_Icon_normal; height: 20px; - &:hover {.box_shadow_standard_light_hover; .background-color-15-gray;} - &:focus {.box_shadow_standard_light_inset; .background-color-15-gray;} + &:hover {.box_shadow_standard_light_hover; .background_color_15_gray;} + &:focus {.box_shadow_standard_light_inset; .background_color_15_gray;} } span.ui-state-default{ float: left; @@ -579,7 +622,7 @@ div#mail-index{ .mailDisplayAttachments { // background-color:#efefdf; - .background-color-10-gray; + .background_color_10_gray; max-height: 10%; position: fixed; @@ -1146,8 +1189,8 @@ input[type=button] { #mail-index_previewAttachmentArea { // background-color:#efefdf; - .background-color-10-gray; - border-color: @gray-10; + .background_color_10_gray; + border-color: @gray_10; .border_normal; // filter: Alpha(opacity=100);