diff --git a/api/js/etemplate/et2_widget_toolbar.ts b/api/js/etemplate/et2_widget_toolbar.ts index e7e797d8b0..f2b6430b3f 100644 --- a/api/js/etemplate/et2_widget_toolbar.ts +++ b/api/js/etemplate/et2_widget_toolbar.ts @@ -248,14 +248,13 @@ export class et2_toolbar extends et2_DOMWidget implements et2_IInput this.actionbox.empty(); this.actionlist.empty(); let admin_setting = this.options.is_admin ? '': ''; - const header_list = this.options.header_list == 'more'?true:false; - this.actionbox.append(''+(header_list?egw.lang('more')+' ...':'')+admin_setting+''); + const list_header = this.options.list_header == 'more'?true:false; + this.actionbox.append(''+(list_header?egw.lang('more')+' ...':'')+admin_setting+''); this.actionbox.append('
'); let that = this; if (this.options.is_admin) { this.actionbox.find('.toolbar-admin-pref').click(function(e){ - e.stopImmediatePropagation(); egw.json('EGroupware\\Api\\Etemplate\\Widget\\Toolbar::ajax_get_default_prefs', [that.options.preference_app, that.options.preference_id], function(_prefs){ let prefs = []; for (let p in _prefs) @@ -264,7 +263,9 @@ export class et2_toolbar extends et2_DOMWidget implements et2_IInput } that._admin_settings_dialog.call(that, actions, prefs); }).sendRequest(true); + return false; }); + this.actionbox.addClass('admin'); } let pref = (!egwIsMobile())? egw.preference(this.options.preference_id, this.options.preference_app): undefined; diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css index 21193a33e8..e45bd55aa3 100644 --- a/api/templates/default/etemplate2.css +++ b/api/templates/default/etemplate2.css @@ -2721,35 +2721,32 @@ div.ui-dialog div.ui-dialog-content > div { div.et2_toolbar.ui-widget-header { background: none; } -.et2_toolbar_more summary.ui-toolbar-menulistHeader.header_list-short { - background-image: url(pixelegg/images/dots.svg); +.et2_toolbar_more summary.ui-toolbar-menulistHeader.list_header-short { + background-image: url(../../../pixelegg/images/dots.svg); background-size: 16px; height: 24px; width: 20px; margin-top: 0px; background-repeat: no-repeat; + background-position: center; } -.et2_toolbar_more summary.ui-toolbar-menulistHeader.header_list-short { +.et2_toolbar_more summary.ui-toolbar-menulistHeader.list_header-short { padding: 0px !important; width: 40px; height: 24px; margin-top: 0px; } -.et2_toolbar_more summary.ui-toolbar-menulistHeader.header_list-short::marker { +.et2_toolbar_more summary.ui-toolbar-menulistHeader.list_header-short::marker { top: 0px; left: auto; content: ''; } -.et2_toolbar details[open].et2_toolbar_more .ui-toolbar-menulistHeader.header_list-short{ - background-position: bottom !important; - margin-top: 2px; - left: 0; - top: 0; +.et2_toolbar details.et2_toolbar_more.admin .ui-toolbar-menulistHeader.list_header-short { + background-position: left; } - .et2_toolbar .et2_toolbar_more summary .toolbar-admin-pref { background-image: url(../../../pixelegg/images/setup.svg); background-repeat: no-repeat; @@ -2757,10 +2754,8 @@ div.et2_toolbar.ui-widget-header { width: 20px; height: 100%; display: inline-block; - position: absolute; - right: 0px; - top: 0px; background-position: center; + float: right; } .et2_toolbar .et2_toolbar_more summary .toolbar-admin-pref:hover { @@ -2768,19 +2763,29 @@ div.et2_toolbar.ui-widget-header { } .et2_toolbar .et2_toolbar_more .ui-toolbar-menulistHeader { - background-image: url(../../../pixelegg/images/arrow_right.svg); - background-position: center; - background-size: 12px; - background-repeat: no-repeat; + border: 1px solid silver; + border-radius: 3px; + background-color: #fafafa; + font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif; + font-size: 9pt; + font-weight: normal; + height: 17px; + margin-top: 1px; + padding-left: 5px; + padding-right: 5px; + align-items: end; + padding-top: 5px; } -.et2_toolbar details[open].et2_toolbar_more .ui-toolbar-menulistHeader { +.et2_toolbar details[open].et2_toolbar_more .ui-toolbar-menulistHeader.list_header-short { background-image: url(../../../pixelegg/images/arrow_down.svg); background-size: 12px; background-position: center; background-repeat: no-repeat; } - +.et2_toolbar details[open].et2_toolbar_more.admin .ui-toolbar-menulistHeader.list_header-short { + background-position: left; +} .et2_toolbar .et2_toolbar_actionlist span[data-group]:not(:first-child) > button.et2_button:first-child { margin-left: 7px; } @@ -3073,7 +3078,7 @@ div.ui-toolbar-menulist { .ui-toolbar-menulistHeader { font-size: xx-small; height: 100%; - margin-top: 2px; + margin-top: 1px; direction: ltr; } diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index b7da79dad3..312280a415 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -178,31 +178,29 @@ /** * Top level */ - .et2_container { - padding: 0px; - background-color: transparent; - } - - .et2_container > div:not([class]) { - height: 100%; - } - - /** - * Basic rules - */ - /** - * img gray filter - */ - img.et2_appicon, - .et2_appicon img, - table.egwGridView_grid img.et2_appicon { - /*filter grey*/ - filter: url("data:image/svg+xml;utf8,#grayscale"); - -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); - -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); - -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); - -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); - filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + .et2_container { + padding: 0px; + background-color: transparent; + } + .et2_container > div:not([class]) { + height: 100%; + } + /** + * Basic rules + */ + /** + * img gray filter + */ + img.et2_appicon, + .et2_appicon img, + table.egwGridView_grid img.et2_appicon { + /*filter grey*/ + filter: url("data:image/svg+xml;utf8,#grayscale"); + -webkit-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -moz-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -ms-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + -o-filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); + filter: grayscale(100%) brightness(100%) contrast(1%) saturate(0%); /*filter: url(grayscale.svg); Firefox 4+ */ filter: gray; /* IE 6-9 */ @@ -1067,7 +1065,7 @@ .ui-toolbar-menulistHeader { font-size: xx-small; height: 100%; - margin-top: 2px; + margin-top: 1px; direction: ltr; } .et2_toolbar_more { @@ -3078,14 +3076,14 @@ div.selectbox-wrapper ul li { cursor: pointer; } select { - position: relative; - padding-right: 20px !important; - -webkit-appearance: none; - -moz-appearance: none; - margin: 0; - background: url(../images/arrow_down.svg) no-repeat center right; - background-size: 8px auto; - background-position-x: calc(100% - 8px); + position: relative; + padding-right: 20px !important; + -webkit-appearance: none; + -moz-appearance: none; + margin: 0; + background: url(../images/arrow_down.svg) no-repeat center right; + background-size: 8px auto; + background-position-x: calc(100% - 8px); } select:active { background: #ffffff url(../images/arrow_up.svg) no-repeat center right; diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less index b262b526ac..15d22a2397 100755 --- a/pixelegg/less/etemplate2.less +++ b/pixelegg/less/etemplate2.less @@ -917,7 +917,7 @@ div.ui-toolbar-menulist{ .ui-toolbar-menulistHeader{ font-size: xx-small; height:100%; - margin-top: 2px; + margin-top: 1px; direction: ltr; } .et2_toolbar_more{ diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less index 865f9e9ba3..c256c23dd3 100644 --- a/pixelegg/mobile/fw_mobile.less +++ b/pixelegg/mobile/fw_mobile.less @@ -1281,10 +1281,10 @@ } div.et2_toolbar_more { position:inherit; - h.ui-state-hover { + .ui-state-hover { background:none; } - h.ui-toolbar-menulistHeader { + .ui-toolbar-menulistHeader { color:transparent; border: none; height: 46px;