Commit graph

76 commits

Author SHA1 Message Date
Julia Radzhabova 86f10c9133 Merge branch 'release/v7.0.0' into develop 2021-12-07 18:49:59 +03:00
OVSharova 6835199df7 Bug 53886 2021-11-24 08:03:12 +03:00
OVSharova 112fa9f977 Refactoring 2021-10-06 13:21:06 +03:00
OVSharova 3f3f7b2de7 Bug 52187 2021-09-30 03:48:54 +03:00
OVSharova 501043f04c Fix Bug 52187 2021-09-28 17:35:52 +03:00
OVSharova 3d60527f99 SSE and PE 2021-09-28 04:14:30 +03:00
Julia Radzhabova fc95cbe2e6 [SSE] Fix Bug 52428 2021-09-08 20:07:51 +03:00
Maxim Kadushkin 0b1168b64e [scaling] apply icons for 125% and 175% 2021-08-23 00:15:51 +03:00
Julia Radzhabova 379c97835a Fix Bug 51845, use 1.25, 1.75 icons 2021-08-18 15:18:58 +03:00
Maxim Kadushkin c0c4766574 [SSE PE] fix bug 50724 2021-06-04 10:34:56 +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
Maxim Kadushkin 134001162c [web-apps] fix bug 50030 2021-04-28 14:10:39 +03:00
Maxim Kadushkin ba31d2f163 [common] fix bug 49731 2021-04-19 23:57:54 +03:00
Julia Radzhabova 2d188d6688 [SSE] Show icons settings in conditional formatting 2021-03-03 20:58:06 +03:00
Julia Radzhabova 0f1288e198 [SSE] Fix icons sets presets 2021-03-03 14:05:31 +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 3f228da263 [stylesheets] refactoring 2021-02-07 00:30:24 +03:00
Maxim Kadushkin acb17c9e08 [multiscaling] correct some elements 2021-01-31 22:35:09 +03:00
Maxim Kadushkin 8e81a7b0e1 [scaling] repaired some elements 2021-01-22 00:18:15 +03:00
Maxim Kadushkin 4412524e82 [multiscaling] repaired some components 2021-01-21 13:14:36 +03:00
Maxim Kadushkin 5f6956ac0f [stylesheets] repaired stylesheets 2021-01-04 00:58:06 +03:00
Maxim Kadushkin 163272b4d3 [stylesheets] changed some components 2020-12-21 13:33:16 +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 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 8ea4360f6e [SSE, PE] changed @gray-dark to @border-toolbar 2020-11-17 15:04:42 +03:00
Julia Radzhabova 69042abd2b Merge branch 'develop' into feature/sse-slicer 2020-06-04 18:27:08 +03:00
Julia Radzhabova dabb2cea37 [SSE] Refactoring pivot settings 2020-06-02 16:35:29 +03:00
Julia Radzhabova ebe0f338cf [SSE] Set slicer style settings 2020-05-27 18:34:15 +03:00
Julia Radzhabova 1988f9d0df Refactoring 2020-04-08 14:12:23 +03:00
Julia Radzhabova 5e38c59787 Fix Bug 43986 2020-04-03 20:21:00 +03:00
Julia Radzhabova 5f283b11ce Merge branch 'feature/sse-pivot-settings' into develop 2020-03-11 17:46:21 +03:00
Julia Radzhabova ba3cf768e3 Fix Bug 43987 2020-02-28 14:58:51 +03:00
Julia Radzhabova a4a18e06a0 Fix Bug 43987 2019-12-25 17:39:23 +03:00
Julia Radzhabova 1ace993ea8 Merge branch 'develop' into feature/sse-pivot-settings 2019-12-06 15:28:39 +03:00
Maxim Kadushkin 670b6cf2c6 merge with develop 2019-11-28 17:11:18 +03:00
Maxim Kadushkin aa48aca058 [SSE] build icons sprite from source images 2019-11-21 19:15:47 +03:00
Julia Radzhabova f3d9759883 Move chart styles to common 2019-11-18 14:08:17 +03:00
Julia Svinareva 23817335de [SSE] Pivot settings: drag and drop (fix style of insert) 2019-11-07 12:51:11 +03:00
Maxim Kadushkin a79b404c37 [all] doesn't inject images in css 2019-10-21 17:05:50 +03:00
Julia Radzhabova 0b94998959 [SSE] Change icons 2019-08-06 13:18:15 +03:00
Julia Radzhabova 52bd0e873c [SSE] Update icons 2018-07-17 14:04:50 +03:00
Julia Radzhabova 298cc601c1 [SSE] Change icons for cell settings 2018-06-19 16:05:50 +03:00
Julia Radzhabova 1264ceb07a [SSE] Fix cell border types 2018-06-14 16:36:27 +03:00
Julia Radzhabova ff89d888dc [SSE] Add cell settings to the right panel 2018-06-09 14:11:56 +03:00
Julia Radzhabova 0f68851493 Signature settings: hide menu arrow for non-selected signatures 2018-05-08 15:15:40 +03:00
Julia Radzhabova 5ec790f85e Move common icons. 2018-02-20 15:29:01 +03:00
Julia Radzhabova 5318038158 [SSE] Update icon for pivot table settings. 2018-01-25 15:07:48 +03:00