diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js index a8555bd6ff..3819a650bf 100644 --- a/api/js/etemplate/et2_extension_nextmatch.js +++ b/api/js/etemplate/et2_extension_nextmatch.js @@ -2457,8 +2457,8 @@ var et2_nextmatch_header_bar = (function(){ "use strict"; return et2_DOMWidget.e .text(egw.lang(egw.app_name())) .appendTo(this.search_box); - this.select_counter = jQuery(document.createElement('div')) - .addClass('nm_select_counter') + this.delete_action = jQuery(document.createElement('div')) + .addClass('nm_delete_action') .prependTo(this.search_box); // toggle header // add new button @@ -2769,7 +2769,7 @@ var et2_nextmatch_header_bar = (function(){ "use strict"; return et2_DOMWidget.e this.favorites = et2_createWidget('favorites', widget_options, this); // Add into header - jQuery(this.favorites.getDOMNode(this.favorites)).prependTo(egwIsMobile()?this.search_box.find('.nm_favorites_div'):this.right_div); + jQuery(this.favorites.getDOMNode(this.favorites)).prependTo(egwIsMobile()?this.search_box.find('.nm_favorites_div').show():this.right_div); }, /** diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css index 2b3325eb41..81665d2ad8 100644 --- a/mail/templates/mobile/app.css +++ b/mail/templates/mobile/app.css @@ -2713,6 +2713,9 @@ div.mailComposeHeaderSection > table { #mail-index .mail-index_vacation div { text-align: center; } + #mail-index #mail-index_nm div.search { + margin-top: 3px; + } #mail-index_buttonmailcreate { display: none; } diff --git a/mail/templates/mobile/app.less b/mail/templates/mobile/app.less index 9756532430..2bb8c734ea 100644 --- a/mail/templates/mobile/app.less +++ b/mail/templates/mobile/app.less @@ -344,6 +344,10 @@ } } + #mail-index_nm div.search{ + margin-top:3px; + } + } #mail-index_buttonmailcreate {display:none;} div.aclDetails {display:none;} diff --git a/pixelegg/js/fw_mobile.js b/pixelegg/js/fw_mobile.js index 451ab56a10..002ed62364 100644 --- a/pixelegg/js/fw_mobile.js +++ b/pixelegg/js/fw_mobile.js @@ -1010,9 +1010,8 @@ } if (delete_action) { - _widget.header.select_counter + _widget.header.delete_action .show() - .text(_widget.getSelection().ids.length) .click(function(){ if (delete_action) delete_action.actionObj.execute([sender]); }); @@ -1021,7 +1020,7 @@ } else { - _widget.header.select_counter.hide(); + _widget.header.delete_action.hide(); } } }); diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index 21c680ef9b..ecbcb16650 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -7581,20 +7581,25 @@ form[id^="tracker-"] .dialogHeadbar { -webkit-filter: none!important; background-color: white !important; } - body .et2_nextmatch .nm-mob-header div.nm_select_counter { + body .et2_nextmatch .nm-mob-header div.nm_delete_action { + background-image: url(../images/delete.svg); + -webkit-filter: brightness(0) invert(1) !important; + filter: brightness(0) invert(1) !important; + background-color: transparent !important; + background-size: 24px 24px !important; + border: none; background-position: center; background-repeat: no-repeat; margin-right: 5px; border-left: 1px solid silver; border: 0; - color: white; + color: black; width: 50px; height: 50px; - display: block; + display: inline-block; float: right; text-align: center; - font-size: 20pt; - line-height: 40pt; + display: none; } body .et2_nextmatch .nm-mob-header div.nm_favorites_div { background-position: center; @@ -7605,7 +7610,7 @@ form[id^="tracker-"] .dialogHeadbar { color: white; width: 50px; height: 50px; - display: block; + display: none; float: right; } body .et2_nextmatch .nm-mob-header div.nm_favorites_div:focus { diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less index 031a8eaac8..632834d271 100644 --- a/pixelegg/mobile/fw_mobile.less +++ b/pixelegg/mobile/fw_mobile.less @@ -701,20 +701,21 @@ -webkit-filter: none!important; background-color: white !important; } - div.nm_select_counter { + div.nm_delete_action { + background-image: url(../images/delete.svg); + .white-svg; background-position: center; background-repeat: no-repeat; margin-right: 5px; border-left: 1px solid silver; border: 0; - color: white; + color: black; width: 50px; height: 50px; - display: block; + display: inline-block; float: right; text-align: center; - font-size: 20pt; - line-height: 40pt; + display:none; } div.nm_favorites_div { background-position: center; @@ -725,8 +726,9 @@ color: white; width:50px; height:50px; - display:block; + display:none; float:right; + &:focus{ outline:none; }