Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
7956 commits 47 branches 5000 tags 623 MiB
Commit graph

258 commits

Author SHA1 Message Date
Maxim Kadushkin 44210f7a5a [all] prepare sprites for 1.25x and 1.75x scaling 2021-05-21 11:19:26 +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 1e878cd085 [SSE] fixed cell editors style for 150% scaling 2021-04-27 22:44:01 +03:00
Maxim Kadushkin 59182cfd6b [common] changed combobox caret style 2021-04-27 22:42:41 +03:00
Maxim Kadushkin acaeec776f [SSE] fix bug 50024 2021-04-27 20:21:45 +03:00
Maxim Kadushkin f57486d376 [themes] fix bug 50002 2021-04-26 14:31:58 +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 21ae480d3e [common] refactoring 2021-04-19 23:58:59 +03:00
Maxim Kadushkin ba31d2f163 [common] fix bug 49731 2021-04-19 23:57:54 +03:00
Maxim Kadushkin 978d892456 [all] fix bug 49398 2021-04-18 18:09:49 +03:00
Maxim Kadushkin 57c9c6268e [common] extended theme's object 2021-04-18 17:32:39 +03:00
Julia Radzhabova 1677cbfedd Merge branch 'release/v6.3.0' into develop 2021-04-15 17:54:30 +03:00
Julia Radzhabova 785cfb49e5 [SSE] Fix button styles 2021-04-15 16:40:49 +03:00
Julia Radzhabova da687f3e78 [SSE] Fix up/down buttons 2021-04-15 16:32:09 +03:00
Julia Radzhabova 57b6acfd67 Merge branch 'feature/de-preview-bullets' into develop 2021-04-10 00:37:17 +03:00
Julia Radzhabova 926a3c436d [SSE] Draw list preview in sdk 2021-04-03 10:44:20 +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
Maxim Kadushkin b109057b01 [SSE PE] fix disabled state's icon 2021-04-01 11:15:52 +03:00
Julia Radzhabova b1d3ba3fc0 Merge branch 'release/v6.3.0' into develop 2021-03-29 16:33:45 +03:00
Maxim Kadushkin db3aafeb33 [SSE] fixed spreadsheet tab disabled stylesheet 2021-03-23 22:25:57 +03:00
Maxim Kadushkin bda2dd7873 [all] some changes for components stylesheet 2021-03-06 00:52:06 +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
Julia Radzhabova 0075983c9f Merge branch 'develop' into feature/sse-conditional-formatting 2021-02-20 19:15:44 +03:00
Maxim Kadushkin 64dfc35569 [all] fix bug 448774 2021-02-17 19:00:28 +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 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
Maxim Kadushkin acb17c9e08 [multiscaling] correct some elements 2021-01-31 22:35:09 +03:00
Julia Radzhabova c240e0e89e [SSE] Fix Bug 48247 2021-01-22 00:45:44 +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 551ffb48c6 [stylesheets] changed styleshteets according to colors table 2021-01-20 22:32:46 +03:00
Julia Radzhabova ff43f0dc71 [SSE] Bug 48248: Add auto color for cell borders 2021-01-20 18:38:07 +03:00
Maxim Kadushkin d7a2a47979 [stylesheets] repaired components according to colors table 2021-01-18 23:27:47 +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 5f6956ac0f [stylesheets] repaired stylesheets 2021-01-04 00:58:06 +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 163272b4d3 [stylesheets] changed some components 2020-12-21 13:33:16 +03:00
Maxim Kadushkin d0b8151d35 [SSE, DE] debug 2020-12-19 22:49:09 +03:00
Maxim Kadushkin a60b6e4934 [SSE] repaired stylesheets 2020-12-19 22:45:36 +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 89f733ae30 [all] unlocked adapt to 150% system scaling 2020-11-20 22:57:20 +03:00
Julia Radzhabova d57f57692f Merge branch 'release/v6.1.0' into develop 2020-11-19 23:36:48 +03:00