Commit graph

26 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
Julia Radzhabova 014e07fe03 Fix layout for plugins tab 2020-12-22 14:39:26 +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 25f56d381a [dark theme] changed @primary and @primary-hover 2020-11-18 20:08:12 +03:00
Maxim Kadushkin 0b43033456 [dark theme] changed @secondary and @secondary-hover 2020-11-18 18:58:41 +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
Maxim Kadushkin a79b404c37 [all] doesn't inject images in css 2019-10-21 17:05:50 +03:00
Julia Radzhabova 041dca188f [SSE] Fix for rev.fcecb0c62a491f028b8fc40a6678398ae417ce7c ( 5 Jul 2016) 2019-02-20 11:12:29 +03:00
Julia Radzhabova 33a08d6df0 Change size for plugin icon. 2017-08-16 17:59:06 +03:00
Maxim Kadushkin dad9b2127d unlocked plugins in toolbar 2017-08-11 14:01:27 +03:00
Julia Radzhabova cf8d4be793 Merge from Hotfix/v4.3.2 2017-04-21 11:44:23 +03:00
Maxim Kadushkin 71595d781c [Common] changed plugin's button 2017-03-23 16:02:19 +03:00
Maxim Kadushkin 10cb608a2c [Common] plugin's launch, updated styles 2017-03-16 13:21:36 +03:00
Maxim Kadushkin a75065ecd6 [Common] cherrypicked changes for plugins (6c427e9, 3b82dab, aceb1fe) 2017-03-01 19:19:42 +03:00
Maxim Kadushkin 84832c6fe1 fix bug 33000 2016-08-26 13:49:42 +03:00
Julia Radzhabova 58c3fd33c0 Select non-visual plugin when it starts. 2016-08-03 12:41:36 +03:00
Julia Radzhabova fcecb0c62a [SSE] Disable plugins panel when selecting cells range or editing formulas. 2016-07-05 17:12:45 +03:00
Julia Radzhabova 33de23b420 [DE] Update add-ons style. 2016-07-05 11:11:13 +03:00
Julia Radzhabova 113bf86add [DE] Изменена иконка кнопки для вызова меню плагина. 2016-06-29 14:14:04 +03:00
Julia Radzhabova 5779aea322 [DE] Реализована возможность открытия плагина в левой панели. 2016-06-29 11:00:46 +03:00
Julia Radzhabova 984fb163c8 [DE] Панель плагинов изменена в соответствии с макетами. 2016-06-29 10:58:10 +03:00
Julia Radzhabova 229d7110c0 [DE] Отладка панели с плагинами. 2016-05-18 14:41:30 +03:00
Julia Radzhabova 42932dc55b [DE] Добавлена поддержка плагинов 2016-05-17 18:38:54 +03:00