Commit graph

66 commits

Author SHA1 Message Date
Julia Radzhabova 0075983c9f Merge branch 'develop' into feature/sse-conditional-formatting 2021-02-20 19:15:44 +03:00
Maxim Kadushkin 66ff7cf201 [dark theme] fix SSE stylesheets for IE support 2021-02-16 11:37:33 +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
Julia Radzhabova c240e0e89e [SSE] Fix Bug 48247 2021-01-22 00:45:44 +03:00
Julia Radzhabova ff43f0dc71 [SSE] Bug 48248: Add auto color for cell borders 2021-01-20 18:38:07 +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 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 7af396a5b2 [SSE] Fix VewTab icons 2020-07-17 19:46:51 +03:00
Julia Radzhabova 0acbad6fa0 [SSE] Add View tab 2020-07-09 14:53:22 +03:00
Julia Radzhabova bdb79f3b48 [SSE] Add format settings to conditional formatting 2020-05-19 19:57:24 +03:00
Julia Radzhabova 5e38c59787 Fix Bug 43986 2020-04-03 20:21:00 +03:00
Maxim Kadushkin aa48aca058 [SSE] build icons sprite from source images 2019-11-21 19:15:47 +03:00
Maxim Kadushkin a79b404c37 [all] doesn't inject images in css 2019-10-21 17:05:50 +03:00
Julia Radzhabova 11933d0204 [PE] Fix color scheme loading 2019-08-21 13:04:49 +03:00
Julia Radzhabova 61ed3059e2 Show current color scheme 2019-08-20 15:56:29 +03:00
Julia Svinareva 5a42e745f3 [SSE] Spelling (add layout) 2019-08-02 13:56:21 +03:00
Julia Radzhabova 154c061ddb [SSE] Change button styles 2019-07-16 10:36:15 +03:00
Julia Radzhabova 18d37fc50a [SSE] Data tab: show/hide details 2019-05-31 10:59:38 +03:00
Julia Radzhabova 492671642c [SSE] Distribute objects 2019-02-14 17:50:36 +03:00
Julia Radzhabova 9d177228df Fix toolbar disable in two-line header mode 2019-02-05 14:46:26 +03:00
Julia Radzhabova f671569c88 Merge branch 'release/v5.2.0' into develop 2018-09-28 13:47:04 +03:00
Julia Radzhabova f5cb0fcc2b [PE][SSE] Fix rotate icons 2018-09-04 16:25:53 +03:00
Julia Radzhabova 3455b57289 [SSE] Add rotation to image and shape settings in the right panel 2018-08-30 17:11:49 +03:00
Julia Radzhabova a222f31036 [SSE] Change icons for objects align 2018-07-18 14:45:17 +03:00
Julia Radzhabova 43bad93bb1 Merge branch 'develop' into feature/sse-layout 2018-07-18 14:08:43 +03:00
Julia Radzhabova 52bd0e873c [SSE] Update icons 2018-07-17 14:04:50 +03:00
Julia Radzhabova 2ff4e6ae97 [SSE] Debug grouping objects 2018-06-28 15:42:01 +03:00
Julia Radzhabova 902f5d2f5f Merge branch 'hotfix/v5.1.4' into develop 2018-05-14 14:21:55 +03:00
Julia Radzhabova adfe416c88 Fix Bug 37660 2018-05-10 14:23:02 +03:00
Julia Radzhabova 152ec13514 Fix position for zoom buttons in the toolbar 2018-05-04 14:56:33 +03:00
Maxim Kadushkin 8e29326db7 [All] fix bug 37587 2018-05-03 19:02:09 +03:00
Maxim Kadushkin 326e5bfa98 [All] correction z-order for synchronize tooltip 2018-04-24 20:07:04 +03:00
Julia Radzhabova 35542d4ee5 Change colors and layout. 2018-02-27 16:17:15 +03:00
Julia Radzhabova 5ec790f85e Move common icons. 2018-02-20 15:29:01 +03:00
Julia Radzhabova 833f9fc1b1 Merge branch 'hotfix/v5.0.7' into develop 2018-01-15 16:11:11 +03:00
Julia Radzhabova a8a7a4f917 [SSE] Fix Bug 26581. 2017-12-05 16:58:01 +03:00
Julia Radzhabova 54231ebed3 [SSE] Autoexpansion undo/redo feature (Bug 18054). 2017-11-28 13:22:25 +03:00
Julia Radzhabova 304e08e23c Fix Bug 36120. 2017-10-23 13:46:37 +03:00
Julia Radzhabova 9bcc68f01f [SSE] Fix Bug 35552. 2017-08-09 14:08:19 +03:00
Julia Radzhabova 4996ac32c2 Fix Bug 35547. 2017-08-08 14:29:43 +03:00
Maxim Kadushkin 1167d13814 styles: adjusted distance between buttons 2017-07-04 17:24:15 +03:00