web-apps/apps/common/main/resources/img
Maxim Kadushkin f62aa45b18 Merge branch 'develop' into feature/multiZoom5.5
# Conflicts:
#	apps/common/main/resources/img/toolbar/1x/big/.css.handlebars
#	apps/common/main/resources/less/asc-mixins.less
#	apps/common/main/resources/less/buttons.less
#	apps/common/main/resources/less/checkbox.less
#	apps/common/main/resources/less/combo-dataview.less
#	apps/common/main/resources/less/comments.less
#	apps/common/main/resources/less/common.less
#	apps/common/main/resources/less/dataview.less
#	apps/common/main/resources/less/dropdown-menu.less
#	apps/common/main/resources/less/listview.less
#	apps/common/main/resources/less/multislider-gradient.less
#	apps/common/main/resources/less/radiobox.less
#	apps/common/main/resources/less/scroller.less
#	apps/common/main/resources/less/separator.less
#	apps/common/main/resources/less/theme-colorpalette.less
#	apps/common/main/resources/less/toolbar.less
#	apps/common/main/resources/less/window.less
#	apps/documenteditor/main/resources/less/advanced-settings.less
#	apps/documenteditor/main/resources/less/filemenu.less
#	apps/documenteditor/main/resources/less/leftmenu.less
#	apps/documenteditor/main/resources/less/rightmenu.less
#	apps/documenteditor/main/resources/less/statusbar.less
#	apps/documenteditor/main/resources/less/toolbar.less
#	apps/presentationeditor/main/resources/less/leftmenu.less
#	apps/presentationeditor/main/resources/less/rightmenu.less
#	apps/presentationeditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/celleditor.less
#	apps/spreadsheeteditor/main/resources/less/leftmenu.less
#	apps/spreadsheeteditor/main/resources/less/rightmenu.less
#	apps/spreadsheeteditor/main/resources/less/statusbar.less
#	apps/spreadsheeteditor/main/resources/less/toolbar.less
2021-02-10 15:40:30 +03:00
..
about [common] changed markup for logo on 'about' page 2018-10-25 17:44:06 +03:00
combo-border-size Fix Bug 43986 2020-04-03 20:21:00 +03:00
controls [SSE] Fix Bug 48118 2020-12-25 14:50:01 +03:00
dimension-picker [common] added some 1.5x icons 2019-12-06 18:19:43 +03:00
doc-formats [DE] Add new formats for downloading: fb2, html, epub 2021-02-08 21:22:14 +03:00
header [common] removed 'undock' button from header 2020-07-29 23:06:01 +03:00
hsbcolorpicker [common] added some 1.5x icons 2019-12-06 18:19:43 +03:00
load-mask [common] removed svg animation in loading mask image 2020-11-10 23:48:00 +03:00
plugin [DE] Панель плагинов изменена в соответствии с макетами. 2016-06-29 10:58:10 +03:00
right-panels [common] added some 1.5x icons 2019-12-06 18:19:43 +03:00
toolbar Merge branch 'develop' into feature/multiZoom5.5 2021-02-10 15:40:30 +03:00