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
..
advanced-settings.less	[dark theme] changed some components	2021-02-02 14:59:45 +03:00
app.less	[stylesheets] added dark theme colors definition	2020-12-17 12:32:52 +03:00
filemenu.less	[stylesheets] repaired some components according to colors table	2020-12-30 13:37:44 +03:00
layout.less	[stylesheets] changed less variables	2020-12-19 22:44:34 +03:00
leftmenu.less	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
navigation.less	[stylesheets] changed less variables	2020-12-19 22:44:34 +03:00
rightmenu.less	[stylesheets] repaired stylesheets	2021-01-04 00:58:06 +03:00
statusbar.less	[stylesheets] changed less variables	2020-12-19 22:44:34 +03:00
toolbar.less	Merge branch 'develop' into feature/colors-table	2021-02-06 14:42:56 +03:00
variables.less	[SSE, DE] debug	2020-12-19 22:49:09 +03:00