diff --git a/addressbook/templates/pixelegg/app.css b/addressbook/templates/pixelegg/app.css index 39085ba3c9..b6a2526825 100755 --- a/addressbook/templates/pixelegg/app.css +++ b/addressbook/templates/pixelegg/app.css @@ -581,8 +581,8 @@ fieldset.emailGroup { top: 0px !important; } button[id="addressbook-edit_button[delete]"] { - float: right; - margin-top: 4px; + position: absolute; + right: 0.5em; } /*#######################################################*/ /*State: Address selected*/ diff --git a/addressbook/templates/pixelegg/app.less b/addressbook/templates/pixelegg/app.less index 2aab4103aa..fe716f0f27 100755 --- a/addressbook/templates/pixelegg/app.less +++ b/addressbook/templates/pixelegg/app.less @@ -394,8 +394,8 @@ div#addressbook-index{ // Button delete button[id="addressbook-edit_button[delete]"]{ - float: right; - margin-top: 4px; + position: absolute; + right: 0.5em; } diff --git a/infolog/templates/pixelegg/app.css b/infolog/templates/pixelegg/app.css index 94359e9d2c..9a6be1f6d0 100755 --- a/infolog/templates/pixelegg/app.css +++ b/infolog/templates/pixelegg/app.css @@ -1,6 +1,8 @@ /** * EGroupware: CSS with less preprocessor * + * INFOLOG + * * Please do NOT change app.css directly, instead change app.less and compile it! * Pixleegg Template app.css * @link http://www.egroupware.org @@ -121,6 +123,7 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { } #infolog-index #infolog-index_nm { /*min-height: 900px;*/ + /*ID Infolog*/ } #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-clearfix div.et2_hbox_right, #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right { @@ -154,7 +157,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 img, #infolog-index #infolog-index_nm .nextmatch_header div.ui-helper-reset div.et2_hbox_right div.et2_box_widget img { - background-color: #f0f0f0; + background-color: #0c5da5; + background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); + background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5)); + background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5); + background-image: -o-linear-gradient(top, #0c5da5, #0c5da5); + background-image: linear-gradient(top, #0c5da5, #0c5da5); + background-repeat: repeat-x; + /*.background_color_10_gray;*/ -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); @@ -168,19 +180,10 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { padding: 0px; margin-top: 0px; vertical-align: middle; - background-color: #0c5da5; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjMGM1ZGE1IiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=); - background-image: -moz-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -ms-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0c5da5), to(#0c5da5)); - background-image: -webkit-linear-gradient(top, #0c5da5, #0c5da5); - background-image: -o-linear-gradient(top, #0c5da5, #0c5da5); - background-image: linear-gradient(top, #0c5da5, #0c5da5); - background-repeat: repeat-x; } #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; + /*.background_color_20_gray;*/ -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); @@ -292,8 +295,8 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { margin-top: 1.5%; } #infolog-index #infolog-index_nm .frame { - min-height: 500px; - height: 500px; + min-height: 100%; + height: 60em; } #infolog-index #infolog-index_nm .egwGridView_scrollarea { height: auto; @@ -301,6 +304,9 @@ span#favorite_sidebox_infolog .favorites li img.sideboxstar { #infolog-index #infolog-index_nm .egwGridView_scrollarea table.egwGridView_grid img { height: 16px; } +#infolog-index #infolog-index_nm span.infolog_infoId { + background-color: inherit; +} /*########################################### # # # dialog-header # diff --git a/infolog/templates/pixelegg/app.less b/infolog/templates/pixelegg/app.less index e581f888d7..eea3335e76 100755 --- a/infolog/templates/pixelegg/app.less +++ b/infolog/templates/pixelegg/app.less @@ -1,6 +1,8 @@ /** * EGroupware: CSS with less preprocessor * + * INFOLOG + * * Please do NOT change app.css directly, instead change app.less and compile it! * Pixleegg Template app.css * @link http://www.egroupware.org @@ -114,13 +116,14 @@ span#favorite_sidebox_infolog{ // IMG img { + .gradient-vertical (@egw_color_2_a, @egw_color_2_a); .Complete_Button_Icon_normal; .dimension_width_height_s; margin-left: 0.5em; padding: 0px; margin-top: 0px; vertical-align: middle; - .gradient-vertical (@egw_color_2_a, @egw_color_2_a); + &:hover{.Complete_Button_Icon_hover ;} @@ -224,11 +227,15 @@ span#favorite_sidebox_infolog{ // ################################## // Listendarstellung .egwGridView_outer {} + table.egwGridView_outer thead tr th.optcol .selectcols{ margin-top: 1.5%; } - .frame {min-height: 500px; height: 500px;} + .frame { + min-height: 100%; + height: 60em; + } .egwGridView_scrollarea{ height: auto; @@ -242,6 +249,8 @@ span#favorite_sidebox_infolog{ } + /*ID Infolog*/ + span.infolog_infoId {background-color: inherit;} } // #infolog-index_nm diff --git a/infolog/templates/pixelegg/images/done.svg b/infolog/templates/pixelegg/images/done.svg new file mode 100755 index 0000000000..ca864c63f6 --- /dev/null +++ b/infolog/templates/pixelegg/images/done.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/infolog/templates/pixelegg/images/email.svg b/infolog/templates/pixelegg/images/email.svg new file mode 100755 index 0000000000..8ad64c5bee --- /dev/null +++ b/infolog/templates/pixelegg/images/email.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/infolog/templates/pixelegg/images/not-started.svg b/infolog/templates/pixelegg/images/not-started.svg new file mode 100755 index 0000000000..f66ed9acd8 --- /dev/null +++ b/infolog/templates/pixelegg/images/not-started.svg @@ -0,0 +1,9 @@ + + + + + + diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css index 8d09ff9a58..dfaa6672b5 100755 --- a/mail/templates/pixelegg/app.css +++ b/mail/templates/pixelegg/app.css @@ -633,10 +633,8 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje .egw_fw_ui_category_content { /*new mail in FOlder span.standartTreeRow b {color: @egw_color_2_a;} - - - -*/ + */ + /*move Mail*/ } .egw_fw_ui_category_content #mail-index_buttonmailcreate { margin-left: 0px; @@ -686,7 +684,11 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje max-height: 50%; } .egw_fw_ui_category_content .dtree { - font-family: "Lucida Grande", "Lucida Sans Unicode", Helvetica, Arial, Verdana, sans-serif; + font-family: Verdana, Helvetica, Sans-Serif; + /* font-family: "Lucida Grande","Lucida Sans Unicode",Helvetica,Arial,Verdana,sans-serif;*/ +} +.egw_fw_ui_category_content .draggedOver { + background-color: #679fd2; } /* ################################################################################## * E-Mail Dialog "Compose" diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less index c5e544aa52..da03c5db79 100755 --- a/mail/templates/pixelegg/app.less +++ b/mail/templates/pixelegg/app.less @@ -246,10 +246,13 @@ div#mail-index{ /*new mail in FOlder span.standartTreeRow b {color: @egw_color_2_a;} - - + */ + /*move Mail*/ + .draggedOver { + background-color: @color_hint; + } -*/ + } // Ende Sidebox /* ##################################################################################