Maxim Kadushkin
|
751482c515
|
[scaling] fix bug 50146
|
2021-04-30 23:43:53 +03:00 |
|
Julia Radzhabova
|
7e88e04dd2
|
For Bug 47092
|
2021-03-30 16:30:01 +03:00 |
|
|
Maxim Kadushkin
|
efdf9e1bc0
|
[common] repaired combo styles scaled view
|
2021-02-10 16:36:49 +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 |
|
|
Maxim Kadushkin
|
4412524e82
|
[multiscaling] repaired some components
|
2021-01-21 13:14:36 +03:00 |
|
|
Maxim Kadushkin
|
ed7f30f957
|
[scaling] repaired style for some components
|
2021-01-15 18:58:54 +03:00 |
|
|
Julia Radzhabova
|
0d17921b4c
|
[SSE] Fix Bug 48118
|
2020-12-25 14:50:01 +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
|
0b43033456
|
[dark theme] changed @secondary and @secondary-hover
|
2020-11-18 18:58:41 +03:00 |
|
|
Maxim Kadushkin
|
45b18d4f0f
|
[dark theme] changed @gray-soft and @gray-darker
|
2020-11-17 18:56:16 +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 |
|
|
Maxim Kadushkin
|
3d44274c2c
|
[dark theme] @gray-dark to @border-toolbar
|
2020-11-16 20:26:04 +03:00 |
|
|
Maxim Kadushkin
|
dbf16e5733
|
[all] refactoring
|
2019-10-21 16:42:12 +03:00 |
|
|
Julia Radzhabova
|
ec4eb281f6
|
[SSE] Bug with border size in toolbar.
|
2016-11-21 13:51:30 +03:00 |
|
|
Maxim Kadushkin
|
2c93966dd2
|
[common] debug after merging
|
2016-11-11 17:56:16 +03:00 |
|
|
Maxim Kadushkin
|
cde02d1526
|
merge branches [newembed] and [bootstrap-3.3.7]
|
2016-11-11 16:59:11 +03:00 |
|
|
Maxim Kadushkin
|
be54167b60
|
refactoring for css-embedded images
|
2016-11-10 14:57:07 +03:00 |
|
|
Maxim Kadushkin
|
88205825af
|
[embed] repaired deployment
|
2016-11-08 15:22:15 +03:00 |
|
|
Julia Radzhabova
|
6b56aa8c4b
|
Added bootstrap 3.3.7
|
2016-11-03 09:37:52 +03:00 |
|
|
Maxim Kadushkin
|
741b10515d
|
webapps added
|
2016-03-10 21:48:53 -03:00 |
|