diff --git a/apps/common/embed/resources/img/icon-menu-sprite.svg b/apps/common/embed/resources/img/icon-menu-sprite.svg index c04600809..cad475b9e 100644 --- a/apps/common/embed/resources/img/icon-menu-sprite.svg +++ b/apps/common/embed/resources/img/icon-menu-sprite.svg @@ -1,170 +1,220 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/apps/common/embed/resources/less/common.less b/apps/common/embed/resources/less/common.less index 5d588ee1d..de08df890 100644 --- a/apps/common/embed/resources/less/common.less +++ b/apps/common/embed/resources/less/common.less @@ -503,7 +503,7 @@ @icon-height: 20px; .svg-icon { background: data-uri('../../../../common/embed/resources/img/icon-menu-sprite.svg') no-repeat; - background-size: @icon-width*22 @icon-height*2; + background-size: @icon-width*29 @icon-height*2; &.download { background-position: -@icon-width 0; @@ -561,13 +561,13 @@ background-position: -@icon-width*18 0; } &.search { - background-position: -@icon-width*19 0; + background-position: -@icon-width*24 0; } &.search-arrow-up { - background-position: -@icon-width*20 0; + background-position: -@icon-width*27 0; } &.search-arrow-down { - background-position: -@icon-width*21 0; + background-position: -@icon-width*28 0; } } diff --git a/apps/common/forms/resources/img/icon-menu-sprite.svg b/apps/common/forms/resources/img/icon-menu-sprite.svg index ffd9929f8..8bf81f4a7 100644 --- a/apps/common/forms/resources/img/icon-menu-sprite.svg +++ b/apps/common/forms/resources/img/icon-menu-sprite.svg @@ -1,4 +1,4 @@ - + @@ -204,5 +204,17 @@ + + + + + + + + + + + + diff --git a/apps/common/forms/resources/less/common.less b/apps/common/forms/resources/less/common.less index c49c2dfc8..f303d3142 100644 --- a/apps/common/forms/resources/less/common.less +++ b/apps/common/forms/resources/less/common.less @@ -81,6 +81,7 @@ @import "../../../../common/main/resources/less/checkbox.less"; @import "../../../../common/main/resources/less/opendialog.less"; @import "../../../../common/main/resources/less/advanced-settings-window.less"; +@import "../../../../common/main/resources/less/searchdialog.less"; @toolbarBorderColor: @border-toolbar-ie; @toolbarBorderColor: @border-toolbar; @@ -439,7 +440,7 @@ .svg-icon { background: data-uri('../../../../common/forms/resources/img/icon-menu-sprite.svg') no-repeat; - background-size: @icon-width*27 @icon-height*2; + background-size: @icon-width*29 @icon-height*2; &.download { background-position: -@icon-width 0; @@ -543,6 +544,18 @@ background-position: -@icon-width*26 0; background-position: -@icon-width*26 @icon-normal-top; } + &.search-close { + background-position: -@icon-width*18 0; + } + &.search { + background-position: -@icon-width*24 0; + } + &.search-arrow-up { + background-position: -@icon-width*27 0; + } + &.search-arrow-down { + background-position: -@icon-width*28 0; + } } .btn { @@ -681,4 +694,8 @@ .font-size-large { .fontsize(@font-size-large); +} + +.search-bar { + z-index: 50; } \ No newline at end of file diff --git a/apps/common/main/lib/view/SearchBar.js b/apps/common/main/lib/view/SearchBar.js index ec1fe6c6d..7942c985c 100644 --- a/apps/common/main/lib/view/SearchBar.js +++ b/apps/common/main/lib/view/SearchBar.js @@ -39,7 +39,8 @@ */ define([ - 'common/main/lib/component/Window' + 'common/main/lib/component/Window', + 'common/main/lib/component/Button' ], function () { 'use strict'; @@ -70,6 +71,7 @@ define([ ].join(''); this.options.tpl = _.template(this.template)(this.options); + this.iconType = this.options.iconType; Common.UI.Window.prototype.initialize.call(this, this.options); @@ -91,7 +93,7 @@ define([ this.btnBack = new Common.UI.Button({ parentEl: $('#search-bar-back'), cls: 'btn-toolbar', - iconCls: 'toolbar__icon btn-arrow-up', + iconCls: this.iconType === 'svg' ? 'svg-icon search-arrow-up' : 'toolbar__icon btn-arrow-up', hint: this.tipPreviousResult }); this.btnBack.on('click', _.bind(this.onBtnNextClick, this, 'back')); @@ -99,7 +101,7 @@ define([ this.btnNext = new Common.UI.Button({ parentEl: $('#search-bar-next'), cls: 'btn-toolbar', - iconCls: 'toolbar__icon btn-arrow-down', + iconCls: this.iconType === 'svg' ? 'svg-icon search-arrow-down' : 'toolbar__icon btn-arrow-down', hint: this.tipNextResult }); this.btnNext.on('click', _.bind(this.onBtnNextClick, this, 'next')); @@ -117,7 +119,7 @@ define([ this.btnClose = new Common.UI.Button({ parentEl: $('#search-bar-close'), cls: 'btn-toolbar', - iconCls: 'toolbar__icon btn-close', + iconCls: this.iconType === 'svg' ? 'svg-icon search-close' : 'toolbar__icon btn-close', hint: this.tipCloseSearch }); this.btnClose.on('click', _.bind(function () { @@ -132,7 +134,7 @@ define([ }, show: function(text) { - var top = $('#app-title').height() + $('#toolbar').height() + 2, + var top = ($('#app-title').length > 0 ? $('#app-title').height() : 0) + $('#toolbar').height() + 2, left = Common.Utils.innerWidth() - ($('#right-menu').is(':visible') ? $('#right-menu').width() : 0) - this.options.width - 32; Common.UI.Window.prototype.show.call(this, left, top); diff --git a/apps/common/main/resources/less/searchdialog.less b/apps/common/main/resources/less/searchdialog.less index 8e0ec2cab..7904cd623 100644 --- a/apps/common/main/resources/less/searchdialog.less +++ b/apps/common/main/resources/less/searchdialog.less @@ -85,7 +85,7 @@ .search-bar { z-index: 950; .box { - padding: 16px; + padding: 15px; display: flex; input[type=text] { width: 192px; diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index c6b115212..da514210f 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -198,7 +198,6 @@
-
of 0
-
of 0
-
of 0
-
of 0