Commit graph

204 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 9e36276e3e [dark theme] changed some elements 2021-02-07 00:31:35 +03:00
Maxim Kadushkin 3f228da263 [stylesheets] refactoring 2021-02-07 00:30:24 +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 00382dd815 [dark theme] changed some components 2021-02-02 14:59:45 +03:00
Maxim Kadushkin 5cd3145d73 [multiscaling] changed "wrapping" and "table borders" icons in DE 2021-01-26 23:52:43 +03:00
Maxim Kadushkin 8e81a7b0e1 [scaling] repaired some elements 2021-01-22 00:18:15 +03:00
Julia Radzhabova c295698704 Refactoring color buttons 2021-01-21 22:48:27 +03:00
Julia Radzhabova 25fb714042
Merge pull request #666 from ONLYOFFICE/feature/bug-48248
Feature/bug 48248
2021-01-21 16:00:35 +03:00
Maxim Kadushkin 4412524e82 [multiscaling] repaired some components 2021-01-21 13:14:36 +03:00
Julia Radzhabova ff43f0dc71 [SSE] Bug 48248: Add auto color for cell borders 2021-01-20 18:38:07 +03:00
Julia Radzhabova 53868564d9 For Bug 48248: add auto color to ColorButton component 2021-01-20 12:26:20 +03:00
Julia Radzhabova 9b561aab66 [DE] Bug 42912 2021-01-18 16:41:49 +03:00
Maxim Kadushkin 29951e266e [stylesheets] repired some components according to colors table 2021-01-18 12:19:38 +03:00
Maxim Kadushkin ed7f30f957 [scaling] repaired style for some components 2021-01-15 18:58:54 +03:00
Maxim Kadushkin bd6c34b66d [stylesheets] repaired some components 2021-01-06 20:33:01 +03:00
Maxim Kadushkin 5f6956ac0f [stylesheets] repaired stylesheets 2021-01-04 00:58:06 +03:00
Maxim Kadushkin 1c12f4ce06 [stylesheets] changed stylesheet for large button icon 2020-12-30 19:07:14 +03:00
Maxim Kadushkin c3744fb173 [stylesheets] repaired some components according to colors table 2020-12-30 13:37:44 +03:00
Maxim Kadushkin c81778a5a6 [stylesheets] repaired some components 2020-12-26 17:44:36 +03:00
Julia Radzhabova 1474c14019 Change styles for toolbar 2020-12-22 14:45:08 +03:00
Maxim Kadushkin 163272b4d3 [stylesheets] changed some components 2020-12-21 13:33:16 +03:00
Maxim Kadushkin d0b8151d35 [SSE, DE] debug 2020-12-19 22:49:09 +03:00
Maxim Kadushkin 3f7e982b79 [stylesheets] changed less variables 2020-12-19 22:44:34 +03:00
Maxim Kadushkin e25e4a4cad [stylesheets] repaired some elements fonts color 2020-12-18 23:11:33 +03:00
Maxim Kadushkin 3dbd2eb411 [stylesheets] added dark theme colors definition 2020-12-17 12:32:52 +03:00
Maxim Kadushkin 71a44f7044 [stylesheets] added canvas colors vars, brand colors vars 2020-12-17 12:31:21 +03:00
Maxim Kadushkin 86273f4959 [stylesheets] change colors to variables 2020-12-17 11:16:45 +03:00
Maxim Kadushkin 2cdf923372 [DE] removed unused stylesheets 2020-12-16 22:41:12 +03:00
Maxim Kadushkin 72a9a84fb5 [DE] colors changed according to colors table 2020-12-16 22:39:42 +03:00
Maxim Kadushkin 5202ba939c [DE] correct elements border 2020-12-11 21:26:40 +03:00
Maxim Kadushkin 89f733ae30 [all] unlocked adapt to 150% system scaling 2020-11-20 22:57:20 +03:00
Julia Radzhabova d57f57692f Merge branch 'release/v6.1.0' into develop 2020-11-19 23:36:48 +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 6f20a5b958 [dark theme] @gray-deep to @text-normal, @gray to @border-regular-control 2020-11-17 15:27:32 +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 878aea27b2 [DE] Change empty text for navigation 2020-11-06 00:16:06 +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
Julia Radzhabova 50dec94149 [DE] Shift text in menu items with icons ( + all context menu). 2020-08-18 14:50:10 +03:00
Julia Radzhabova 1b5abe0aa9 [DE][PE] File menu refactoring 2020-08-07 13:51:26 +03:00
Julia Radzhabova 230f9d4d88 [DE] Refactoring document info: apply button is always visible 2020-08-06 21:08:07 +03:00
Julia Radzhabova 382fb528e6 [DE] Refactoring advanced settings: apply button is always visible 2020-08-06 17:03:17 +03:00
Julia Radzhabova 1c80bea9fd Change new file panel 2020-06-18 14:43:26 +03:00
Julia Radzhabova 6e8bdc5e6b Fix recent icons 2020-06-15 12:49:11 +03:00
Julia Radzhabova 5303389420 Change recent files 2020-06-11 19:36:37 +03:00
Julia Radzhabova 9b1aa597c4 Change api for new and recent files 2020-04-30 18:35:30 +03:00