Commit graph

30 commits

Author SHA1 Message Date
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
Maxim Kadushkin 5b57ee760b Merge branch 'develop' into feature/colors-table
# Conflicts:
#	apps/common/main/resources/less/loadmask.less
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/FileMenuPanels.js
#	apps/documenteditor/main/resources/less/toolbar.less
#	apps/presentationeditor/main/app/controller/Main.js
#	apps/presentationeditor/main/app/controller/RightMenu.js
#	apps/presentationeditor/main/app/view/FileMenuPanels.js
#	apps/presentationeditor/main/app/view/SlideSettings.js
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
#	apps/spreadsheeteditor/main/resources/less/toolbar.less
2021-02-06 14:42:56 +03:00
Maxim Kadushkin 4412524e82 [multiscaling] repaired some components 2021-01-21 13:14:36 +03:00
Maxim Kadushkin 3f7e982b79 [stylesheets] changed less variables 2020-12-19 22:44:34 +03:00
Maxim Kadushkin 86273f4959 [stylesheets] change colors to variables 2020-12-17 11:16:45 +03:00
Maxim Kadushkin 5202ba939c [DE] correct elements border 2020-12-11 21:26:40 +03:00
Julia Radzhabova d57f57692f Merge branch 'release/v6.1.0' into develop 2020-11-19 23:36:48 +03:00
Maxim Kadushkin 5e29e5e9d2 [dark theme] changed @gray-light and @gray-lighter 2020-11-17 18:54:43 +03:00
Maxim Kadushkin 3d44274c2c [dark theme] @gray-dark to @border-toolbar 2020-11-16 20:26:04 +03:00
Julia Radzhabova 27c9bf1413 Add limited license 2020-11-09 14:52:21 +03:00
Julia Radzhabova 58fd71e163 Change label for trial/developer mode 2020-11-03 13:41:26 +03:00
Julia Radzhabova 92d4fec022 Show beta version label 2020-11-02 23:26:17 +03:00
Maxim Kadushkin 8a7aa454ac [DE] build icon sprite from source images 2019-11-21 10:58:05 +03:00
Julia Radzhabova 294473f5f8 Set default cursor for developer mode 2019-01-16 13:51:34 +03:00
Julia Radzhabova ac78e89a58 [DE] Update left menu icon for table of contents. 2018-01-10 13:23:11 +03:00
Julia Radzhabova 1bcb080cf7 [DE] Refactoring signature settings in the right and left panels. 2017-11-15 15:52:37 +03:00
Julia Radzhabova c02389ab21
Merge branch 'develop' into hotfix/v5.0.3 2017-10-31 20:15:07 +03:00
Julia Radzhabova a3b22d0ca2 Fix Bug 36076. 2017-10-13 17:36:52 +03:00
Julia Radzhabova bdb28e5dbb [DE] Add list of signatures. 2017-09-13 11:14:25 +03:00
Julia Radzhabova 6034531a2d [DE] Adding signature from the left menu. 2017-09-13 11:01:30 +03:00
Julia Radzhabova 2af6250dae [DE] Remove line on the right border of right menu. 2017-05-30 12:41:23 +03:00
Julia Radzhabova 58ead9e451 Change hint for developer mode. 2017-04-12 10:54:47 +03:00
Maxim Kadushkin 3784eb0717 [DE] national's flags were moved to separate sprite 2017-04-04 17:47:21 +03:00
Maxim Kadushkin d7caf23d65 [DE] changed layout for panel 'FileMenu' 2017-03-21 17:16:27 +03:00
Maxim Kadushkin eed89a5c5b [DE] refactoring 2017-03-06 12:30:18 +03:00
Maxim Kadushkin 52e1610b1d [DE] debug styles 2017-03-01 16:38:20 +03:00
Maxim Kadushkin b0935bca7a [DE] show FileMenu from the toolbar 2017-02-20 17:54:12 +03:00
Julia Radzhabova 3fe8ee259f Changed layout for chart/sparkline type menu.
[SSE] Select chart/sparkline type from toolbar.
2016-12-16 11:37:57 +03:00
Julia Radzhabova 42932dc55b [DE] Добавлена поддержка плагинов 2016-05-17 18:38:54 +03:00
Maxim Kadushkin 741b10515d webapps added 2016-03-10 21:48:53 -03:00