Commit graph

233 commits

Author SHA1 Message Date
Julia Radzhabova adedc692cd Fix Bug 51562 2021-07-28 14:47:49 +03:00
Julia Radzhabova 69d4c7f064 Fix merge release 2021-05-21 12:40:54 +03:00
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Maxim Kadushkin 44210f7a5a [all] prepare sprites for 1.25x and 1.75x scaling 2021-05-21 11:19:26 +03:00
Maxim Kadushkin cd588618e6 [all] fix bug 50327, 50328, 50329 2021-05-10 22:39:44 +03:00
Maxim Kadushkin d23c869622 [DE] fix bug 50284 2021-05-09 00:34:53 +03:00
Maxim Kadushkin 4b99303859 [DE] fix bug 50273 2021-05-08 23:21:07 +03:00
Maxim Kadushkin 4c4c3f6c51 [DE] fix css images relative path for Safari 2021-05-08 01:05:22 +03:00
Maxim Kadushkin 4fb015bd30 [DE] fix bug 50238 2021-05-05 22:14:39 +03:00
Julia Radzhabova 661b937a74 Fix Bug 50031 2021-05-04 18:34:52 +03:00
Maxim Kadushkin 97474af94d Merge branch 'release/v6.3.0' into develop
# Conflicts:
#	apps/common/main/lib/controller/Plugins.js
#	apps/common/main/lib/view/Header.js
#	apps/documenteditor/main/app/controller/Main.js
#	apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/documenteditor/main/app/view/Toolbar.js
#	apps/documenteditor/main/locale/sl.json
#	apps/presentationeditor/main/app/view/ParagraphSettingsAdvanced.js
#	apps/presentationeditor/main/locale/ja.json
#	apps/spreadsheeteditor/main/app/controller/Main.js
#	apps/spreadsheeteditor/main/app/template/Toolbar.template
#	apps/spreadsheeteditor/main/app/view/ParagraphSettingsAdvanced.js
2021-04-29 23:31:07 +03:00
Julia Radzhabova 5a0161b352 [DE] Show current level of list 2021-04-23 17:59:55 +03:00
maxkadushkin 0caa949644
Merge pull request #827 from ONLYOFFICE/feature/classic-light-theme
Feature/classic light theme
2021-04-22 12:54:33 +03:00
Maxim Kadushkin f3b6156ec8 [DE] fix bug 49706 2021-04-20 16:37:46 +03:00
Maxim Kadushkin 0cec65caae [themes] added new theme 2021-04-17 16:10:35 +03:00
Julia Radzhabova c2e0ffb2be Merge branch 'release/v6.3.0' into develop 2021-04-15 11:18:07 +03:00
Julia Radzhabova 02b7d14b03 FIx toc preview 2021-04-13 14:18:59 +03:00
Julia Radzhabova 1799fb270c [DE] Preview for TOC menu 2021-04-13 12:14:15 +03:00
Julia Radzhabova 2b547dc8c5 [DE] Change preview for list types 2021-04-01 18:57:00 +03:00
Julia Radzhabova 90cfe5c364 [DE] Draw list preview in sdk 2021-03-30 19:39:12 +03:00
Maxim Kadushkin 1da3ef45f3 [DE] fixed form's elements style according to colors table 2021-03-17 13:10:55 +03:00
Maxim Kadushkin bda2dd7873 [all] some changes for components stylesheet 2021-03-06 00:52:06 +03:00
Maxim Kadushkin d02dea7ca5 [common] repaired disabled components stylesheets 2021-03-01 00:29:00 +03:00
Julia Radzhabova f76b650704 Merge branch 'feature/list-levels' into develop 2021-02-26 13:46:28 +03:00
Maxim Kadushkin 64dfc35569 [all] fix bug 448774 2021-02-17 19:00:28 +03:00
Maxim Kadushkin 2ba6fdd351 [DE] fixed some components for x1.5 scaling 2021-02-17 13:46:21 +03:00
Maxim Kadushkin 9756209cb8 [common] stylesheets refactoring 2021-02-17 13:41:33 +03:00
Maxim Kadushkin f9c52cb252 [dark theme] fix DE styles for IE 2021-02-16 10:22:48 +03:00
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
Julia Radzhabova f667823e07 [DE] Show preview for list levels 2021-02-03 10:32:18 +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