Commit graph

127 commits

Author SHA1 Message Date
Julia Radzhabova 1c17f8bd99 Merge branch 'feature/de-lock-refactoring' into develop 2022-01-13 22:13:24 +03:00
Julia Radzhabova e7e077c76d [DE] Lock toolbar on changing review display mode 2021-12-30 01:01:53 +03:00
Julia Radzhabova 96d2d081ed [DE] Fix toolbar resize 2021-12-22 00:27:30 +03:00
Julia Radzhabova ef47b1dbd5 [DE] Fix toolbar resizing 2021-12-16 19:49:24 +03:00
Julia Radzhabova b97eb30141 [DE] Refactoring more button in toolbar 2021-12-16 16:50:25 +03:00
Julia Radzhabova bd51c09bc3 [DE] Try to combine different types of toolbar collapse 2021-12-15 12:19:41 +03:00
Julia Radzhabova 2a1ecec65d Merge branch 'hotfix/v6.4.1' into develop 2021-09-30 17:30:38 +03:00
Julia Radzhabova 75fa8c5c10 [DE] Fix style for disabled item Add new style 2021-09-20 19:51:32 +03:00
Julia Radzhabova c7ae9fbbf6 Fix Bug 52672, Fix Bug 52486 2021-09-20 17:59:33 +03:00
Maxim Kadushkin aa62d6b8d9 [DE] fix bug 52486 2021-09-16 18:42:24 +03:00
Julia Radzhabova b50bff460e [DE] Change add style menu item 2021-09-16 12:36:12 +03:00
Maxim Kadushkin d8eb811b74 [DE] fix bug 52486 2021-09-13 16:44:47 +03:00
Julia Radzhabova 563291b195 Fix Bug 52205 2021-08-26 17:33:13 +03:00
Julia Radzhabova e7cfb129c2 Fix Bug 51838 2021-08-23 17:47:10 +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
Maxim Kadushkin f3b6156ec8 [DE] fix bug 49706 2021-04-20 16:37:46 +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 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 2ba6fdd351 [DE] fixed some components for x1.5 scaling 2021-02-17 13:46:21 +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 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
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
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 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 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 72a9a84fb5 [DE] colors changed according to colors table 2020-12-16 22:39:42 +03:00
Maxim Kadushkin 25f56d381a [dark theme] changed @primary and @primary-hover 2020-11-18 20:08:12 +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
Julia Radzhabova 50dec94149 [DE] Shift text in menu items with icons ( + all context menu). 2020-08-18 14:50:10 +03:00
Maxim Kadushkin ca417fa675 [DE] fix stylesheet deployment with less 2019-12-18 18:54:30 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00
Maxim Kadushkin 8a7aa454ac [DE] build icon sprite from source images 2019-11-21 10:58:05 +03:00
Julia Radzhabova f3d9759883 Move chart styles to common 2019-11-18 14:08:17 +03:00