Commit graph

129 commits

Author SHA1 Message Date
Julia Radzhabova 0542c3610e
Merge branch 'develop' into feature/forms-editor 2021-08-27 12:50:11 +03:00
Maxim Kadushkin 5a7421e35d merge release 6.4.0 to develop 2021-08-25 19:02:44 +03:00
Maxim Kadushkin 43fee71a25 [uithemes] fix bug 50448 2021-08-20 01:04:54 +03:00
Julia Radzhabova 833530756a [DE forms] Use button component 2021-08-07 11:44:58 +03:00
Julia Radzhabova f13673653f Merge branch 'release/v6.4.0' into develop 2021-07-22 17:44:51 +03:00
Maxim Kadushkin f9b7e162b3 [common] fix bug 50727 2021-07-19 18:09:34 +03:00
Julia Radzhabova 54e23daafd Refactoring 2021-07-09 13:24:24 +03:00
Julia Radzhabova 1ca9c3d6a1 [DE] Support focus in paragraph settings (preset and color buttons, border combobox) 2021-07-09 11:43:54 +03:00
Julia Radzhabova a520792c55 Move with arrows in ThemeColorPalette 2021-07-09 11:42:19 +03:00
Maxim Kadushkin 6641e9419c Merge branch 'hotfix/v6.3.1' into release/v6.4.0 2021-07-04 23:44:01 +03:00
Maxim Kadushkin c93bfb68cb Merge branch 'hotfix/v6.3.1' into develop 2021-07-04 23:39:04 +03:00
maxkadushkin a68c38f83c
Merge pull request #895 from ONLYOFFICE/feature/hotfix-6-3-1
Feature/hotfix 6 3 1
2021-05-23 21:36:43 +03:00
Julia Radzhabova 45d7980212 Merge branch 'release/v6.3.0' into develop 2021-05-21 12:28:54 +03:00
Maxim Kadushkin d7a3891bcf [common] fix bug 50416 2021-05-20 00:41:11 +03:00
Julia Radzhabova 745231f3b7 [SSE] Fix disabled buttons in statusbar 2021-05-17 17:52:29 +03:00
Julia Radzhabova 35e132ce68 [SSE] Fix Bug 50285 2021-05-11 15:00:34 +03:00
Maxim Kadushkin 5582176247 [common] fix icon in 'options' button 2021-05-05 17:30:40 +03:00
Maxim Kadushkin 8f3f10180c [scaling] fix bug 50203 2021-05-04 22:09:17 +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 cc41080814 Change paddings for huge buttons 2021-04-27 22:27:47 +03:00
Maxim Kadushkin 2a75e05bfa [common] fix bug 50026 2021-04-27 00:04:44 +03:00
Maxim Kadushkin ba5c1ba4ab [themes] fixed some colors for "classic" theme 2021-04-21 17:09:29 +03:00
Maxim Kadushkin 0cec65caae [themes] added new theme 2021-04-17 16:10:35 +03:00
Julia Radzhabova da687f3e78 [SSE] Fix up/down buttons 2021-04-15 16:32:09 +03:00
Julia Radzhabova f3a75b724d [SSE] Add focus for up/down buttons 2021-04-15 02:19:18 +03:00
Julia Radzhabova d0a4de80ec Fix up/down buttons 2021-04-15 02:03:33 +03:00
Julia Radzhabova 4d7dc3bb65 Add focus for buttons in dialogs 2021-04-15 01:02:11 +03:00
Julia Radzhabova 9b6ec674de
Merge pull request #779 from ONLYOFFICE/release/v6.3.0
Release/v6.3.0
2021-04-02 11:53:39 +03:00
Julia Radzhabova 583fcc8cad Fix plugins icons 2021-03-30 11:49:11 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
Maxim Kadushkin 8507349ea1 [common] fixed component style 2021-03-29 00:20:37 +03:00
maxkadushkin 6f17cc507a
Merge pull request #763 from ONLYOFFICE/fix/fix-styles
Refactoring control styles
2021-03-29 00:08:45 +03:00
maxkadushkin 96633060b2
Merge pull request #761 from ONLYOFFICE/feature/gray-icons-black
Feature/gray icons black
2021-03-28 21:10:10 +03:00
Julia Radzhabova 1425959a77 Refactoring control styles 2021-03-28 20:55:59 +03:00
Maxim Kadushkin c6436bc59a [common] changed button carret width 2021-03-23 22:24:55 +03:00
Maxim Kadushkin 23333c8720 [common] fixed combobox disabled stylesheet 2021-03-22 20:04:39 +03:00
Maxim Kadushkin 807fa505aa [common] changed button's icon stylesheet 2021-03-19 14:31:05 +03:00
Maxim Kadushkin ffe8a062e1 [common] added opacity in stylesheets for button 2021-03-19 12:06:35 +03:00
Julia Radzhabova efd6886abc Fix colors 2021-03-15 17:59:29 +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
Maxim Kadushkin 9756209cb8 [common] stylesheets refactoring 2021-02-17 13:41:33 +03:00
Maxim Kadushkin fcdb2ee898 [dark theme] fix common styles for IE 2021-02-16 10:21:22 +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 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 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