diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css index ac28bd3714..ad15fd68dc 100755 --- a/addressbook/templates/pixelegg/app.css +++ b/addressbook/templates/pixelegg/app.css @@ -196,7 +196,7 @@ fieldset.emailGroup { -moz-appearance: none; appearance: none; cursor: pointer; - height: 35px; + height: 32px; margin-top: 0; } div#addressbook-index div.et2_hbox_left select#addressbook-index_org_view:hover { @@ -221,7 +221,7 @@ fieldset.emailGroup { -moz-appearance: none; appearance: none; cursor: pointer; - height: 35px; + height: 32px; margin-left: 5px; } div#addressbook-index div.et2_hbox_right select.et2_selectbox:hover { @@ -334,23 +334,20 @@ fieldset.emailGroup { 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; - color: #FFF; - text-shadow: none; - /* height: auto;*/ - background-image: none !important; - -webkit-border-radius: 3px; - -webkit-border-top-left-radius: 20px; - -moz-border-radius: 3px; - -moz-border-radius-topleft: 20px; - border-radius: 3px; - border-top-left-radius: 20px; + /*.Complete_Button_add;*/ + width: 32px; + height: 32px; + border: 1px solid rgba(0, 0, 0, 0.15); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); + padding: 0.5em; } div#addressbook-index div.et2_hbox_right button#addressbook-index_add:before { content: "+"; - font-size: 1.5em; + font-size: 2em; color: #ffc200; - line-height: 1.1em; + line-height: 0.6em; + padding-left: 0.1em; + padding-right: 4em; } div#addressbook-index div.et2_hbox_right button#addressbook-index_add:hover { background-color: #66a1d2 !important; @@ -504,7 +501,7 @@ fieldset.emailGroup { } button[id="addressbook-edit_button[delete]"] { float: right; - margin-top: 5px; + margin-top: -36px; } /*#######################################################*/ /*State: Address selected*/ diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less index 519be2dfd1..063e53fa20 100755 --- a/addressbook/templates/pixelegg/app.less +++ b/addressbook/templates/pixelegg/app.less @@ -72,7 +72,7 @@ div#addressbook-index{ // Org View select#addressbook-index_org_view{ .Complete_Button_select; - height: 35px; + .dimension_height_l; margin-top: 0; &:hover{ .Complete_Button_select_hover; @@ -95,7 +95,7 @@ div#addressbook-index{ // Typ select.et2_selectbox{ .Complete_Button_select; - height: 35px; + .dimension_height_l; margin-left: 5px; &:hover{.Complete_Button_select_hover;} @@ -118,7 +118,22 @@ div#addressbook-index{ // hinzufügen button#addressbook-index_add{ - .Complete_Button_add; + /*.Complete_Button_add;*/ + .dimension_width_height_l; + border: 1px solid rgba(0, 0, 0, 0.15); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); + padding: 0.5em; + + + &:before { + content: "+"; + font-size: 2em; + color: @egw_color_1; + line-height: 0.6em; + padding-left: 0.1em; + padding-right: 4em; + } + &:hover {.Complete_Button_add_hover;} @@ -326,7 +341,7 @@ div#addressbook-index{ // Button delete button[id="addressbook-edit_button[delete]"]{ float: right; - margin-top: 5px; + margin-top: -36px; } diff --git a/filemanager/templates/pixelegg/app.css b/filemanager/templates/pixelegg/app.css index 4b827ab74d..ac6b155284 100755 --- a/filemanager/templates/pixelegg/app.css +++ b/filemanager/templates/pixelegg/app.css @@ -142,9 +142,9 @@ div.filemanager_navigation img { } 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); + -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; @@ -216,7 +216,7 @@ div.filemanager_navigation > label > input { border-top-left-radius: 20px; color: #fff; height: auto; - width: 20em; + width: 55%; } #filemanager-index .et2_file:before { content: "+"; @@ -224,15 +224,12 @@ div.filemanager_navigation > label > input { color: #ffc200; line-height: 1.1em; } -#filemanager-index .et2_file:before { - font-size: 1em; -} #filemanager-index .et2_file: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; @@ -240,9 +237,14 @@ div.filemanager_navigation > label > input { border-radius: 3px; border-top-left-radius: 20px; } +#filemanager-index .et2_file:before { + font-size: 1.5em; + padding-right: 0.5em; + padding-left: 0.5em; +} #filemanager-index .et2_file #filemanager-index_upload { border: none; - width: 20em; + width: 86%; } #filemanager-index #filemanager-index_tarp { width: 32px !important; diff --git a/filemanager/templates/pixelegg/app.less b/filemanager/templates/pixelegg/app.less index f16ad1a034..8eceede7c5 100644 --- a/filemanager/templates/pixelegg/app.less +++ b/filemanager/templates/pixelegg/app.less @@ -111,15 +111,15 @@ div.filemanager_navigation > label > input { .et2_file{ .Complete_Button_add; - &:before{font-size: 1em;} + color: #fff; height: auto; - width: 20em; - &:hover { - .Complete_Button_add_hover; - } - - #filemanager-index_upload {border: none; width: 20em;} + width: 55%; + &:hover { .Complete_Button_add_hover;} + &:before{ font-size: 1.5em; padding-right: 0.5em; padding-left: 0.5em;} + + + #filemanager-index_upload {border: none; width: 86%;} diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css index 9f306a95e5..445a531cc9 100755 --- a/infolog/templates/pixelegg/app.css +++ b/infolog/templates/pixelegg/app.css @@ -129,20 +129,16 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { } #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget, #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget { - background-color: #0b5fa4 !important; - color: #FFF; + border: 1px solid rgba(0, 0, 0, 0.15); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); text-shadow: none; + height: 32px; background-image: none !important; - -webkit-border-radius: 3px; - -webkit-border-top-left-radius: 20px; - -moz-border-radius: 3px; - -moz-border-radius-topleft: 20px; - border-radius: 3px; - border-top-left-radius: 20px; - -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); - height: 39px; + /*.border_radius_button_lefttop;*/ + /* .border_radius_button_lefttop; + .box_shadow_standard_light; + + height: 39px; // hieght of add-item*/ /*img#infolog-index_add[id="task"] {background-color: @gray-0; }*/ } #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget:before, @@ -151,17 +147,27 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { font-size: 2em; color: #ffc200; } -#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget .infolog_headertext, -#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget .infolog_headertext { - color: #FFF !important; - font-size: 11px; -} #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget:hover, #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_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); - background-color: #66a1d2 !important; + -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: #0c5da5 !important; + -webkit-border-radius: 3px; + -webkit-border-top-left-radius: 20px; + -moz-border-radius: 3px; + -moz-border-radius-topleft: 20px; + border-radius: 3px; + border-top-left-radius: 20px; +} +#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget:hover .infolog_headertext, +#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget:hover .infolog_headertext { + color: #FFF !important; +} +#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget .infolog_headertext, +#infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget .infolog_headertext { + color: #000; + font-size: 11px; } #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget img, #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget img { @@ -177,15 +183,15 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { height: 16px; margin-right: 0.5em; padding: 2px; - margin-top: -2px; + margin-top: -14px; vertical-align: middle; } #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right div.et2_box_widget img:hover, #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_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; diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less index 7561b570bc..80bb04e3e1 100755 --- a/infolog/templates/pixelegg/app.less +++ b/infolog/templates/pixelegg/app.less @@ -28,7 +28,7 @@ span#favorite_sidebox_infolog{ } img.sideboxstar{ - .box-shadow(none); + .box_shadow(none); border: 0px; background-size: contain; } @@ -92,25 +92,31 @@ span#favorite_sidebox_infolog{ margin-right: 0em; div.et2_box_widget{ - background-color: @egw_color_blue_lighter !important; - color: #FFF; - text-shadow: none; -// height: 35px; + border: 1px solid rgba(0, 0, 0, 0.15); + box-shadow: 0 1px 0 rgba(0, 0, 0, 0.5); + + text-shadow: none; + .dimension_height_l; background-image: none !important; - .border_radius_button_lefttop; + /*.border_radius_button_lefttop;*/ &:before {content: "+";font-size: 2em;color: @egw_color_1;} - .border_radius_button_lefttop; +/* .border_radius_button_lefttop; .box_shadow_standard_light; - height: 39px; // hieght of add-item + height: 39px; // hieght of add-item*/ - .infolog_headertext{color: #FFF !important; font-size: 11px;} - - - &:hover {.box_shadow_standard_light_hover; background-color: @egw_color_blue_lightest !important;} - + &:hover { + .box_shadow_standard_light_hover; + background-color: @egw_color_2_a !important; + .border_radius_button_lefttop; + + + .infolog_headertext {color: #FFF !important;} + + } + .infolog_headertext{ color: #000; font-size: 11px; } /*img#infolog-index_add[id="task"] {background-color: @gray-0; }*/ @@ -121,7 +127,7 @@ span#favorite_sidebox_infolog{ .dimension_width_height_s; margin-right: 0.5em; padding: 2px; - margin-top: -2px; + margin-top: -14px; vertical-align: middle; &:hover{.Complete_Button_Icon_hover ;} @@ -145,9 +151,9 @@ span#favorite_sidebox_infolog{ // Liste ul#infolog-index_favorite_menu{ - border-color: @gray-30; - .background-color-0-gray; - .color-100-gray; + border-color: @gray_30; + .background_color_0_gray; + .color_100_gray; li{ a { diff --git a/mail/templates/pixelegg/images/filemanager.png b/mail/templates/pixelegg/images/filemanager.png new file mode 100755 index 0000000000..fe30f9317f Binary files /dev/null and b/mail/templates/pixelegg/images/filemanager.png differ diff --git a/mail/templates/pixelegg/images/mail_send.psd b/mail/templates/pixelegg/images/mail_send.psd new file mode 100755 index 0000000000..b9aa953a8b Binary files /dev/null and b/mail/templates/pixelegg/images/mail_send.psd differ