Commit Graph

256 Commits

Author SHA1 Message Date
Timofey Boyko
8abbb0f250 Web:Common:Article: fix show text button color 2022-12-08 16:24:34 +03:00
Akmal Isomadinov
1228ff5026 Web:Client:Components: Fixed empty container 2022-12-08 11:43:18 +05:00
Akmal Isomadinov
67a994171d Web:Components:Empty-Screen-Container Fixed description color 2022-12-07 17:32:52 +05:00
Akmal Isomadinov
af37879c18 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 16:13:47 +05:00
Akmal Isomadinov
d8fc76e789 Web:Components:Selector-Add-Button Fixed the color theme 2022-12-07 16:13:36 +05:00
Elyor Djalilov
a687cd3152 fix color 2022-12-07 13:57:22 +05:00
Elyor Djalilov
6cd251efe0 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-07 13:48:11 +05:00
Elyor Djalilov
56eff4a55b fix color 2022-12-07 13:47:58 +05:00
35f694e722 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-07 11:39:50 +03:00
918bd1cc0b Web: Added color for filter tags on hover, change color for dark theme. 2022-12-07 11:38:26 +03:00
Viktor Fomin
eb37008dd4 Components: Themes: add colors 2022-12-07 11:38:09 +03:00
Viktor Fomin
cb42aeef3c Components: Themes: add colors 2022-12-06 18:41:54 +03:00
fa863d3055 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-06 17:29:26 +03:00
a976c1523a Web: Components: Scroll: fixed theme colors 2022-12-06 17:29:20 +03:00
Viktor Fomin
89ef1ab18b Components: Themes: fix colors 2022-12-06 16:55:21 +03:00
Viktor Fomin
2b784607ee Components: Themes: fix color 2022-12-06 16:53:46 +03:00
eac08833bb Web: PortalSettings: Restore: Fixed text color. 2022-12-06 16:33:10 +03:00
Viktor Fomin
49bb0be1de Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-06 14:05:06 +03:00
Viktor Fomin
40f199211d Components: Themes: add colors 2022-12-06 14:04:26 +03:00
2b2927f40d Web: Components: ComboBox: fixed dark theme 2022-12-06 14:04:15 +03:00
7afd2775d5 Web: Components: AccessRightSelect: Fixed description color 2022-12-05 17:09:58 +03:00
39d4e2bd4d Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 16:57:46 +03:00
6a3fb0717d Web: Components: Checkbox: Fixed theme usage 2022-12-05 16:57:38 +03:00
3a6b699a96 Web: Files: fixed tiles theme 2022-12-05 16:31:25 +03:00
337a1969e4 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 16:07:49 +03:00
49d8146cfd Web: Files: fixed rooms tile 2022-12-05 16:07:40 +03:00
Viktor Fomin
a352fc76b8 Components: Themes: fix color 2022-12-05 14:26:40 +03:00
Viktor Fomin
6174c37676 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 14:13:26 +03:00
Viktor Fomin
9317960d17 Components: Themes: add colors 2022-12-05 14:12:38 +03:00
bd040302c7 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 14:07:59 +03:00
1a60d4ed39 Web: PortalSettings: Backup: Fixed styles. 2022-12-05 14:07:35 +03:00
Viktor Fomin
39f03f1d5f Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-05 14:07:09 +03:00
Viktor Fomin
596fdeaac5 Components: Themes: add colors 2022-12-05 14:06:42 +03:00
26ca74b440 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-12-05 13:47:01 +03:00
d01a3b8af9 Web: PortalSettings: Payments: Fixed styles. 2022-12-05 13:34:14 +03:00
Viktor Fomin
6f426b4642 Components: Themes: fix color 2022-12-05 13:23:11 +03:00
Viktor Fomin
fb5a8fde5d Components: Themes: add color 2022-12-05 13:22:42 +03:00
01dca8c21c Web: Components: Input: fixed error color 2022-12-05 12:06:58 +03:00
af22ce1b55 Web: Components: fixed badges theme 2022-12-05 11:12:47 +03:00
eb3e6a226d Web: Files: fixed submenu text color 2022-12-05 10:34:29 +03:00
Viktor Fomin
b8b0fe9139 Merge branch 'develop' into feature/fix-whitelable 2022-12-02 14:55:23 +03:00
c84faa2bc0 Merge branch 'develop' into release/rc-v1.2.0 2022-12-01 17:57:55 +03:00
Mushka Nikita
bfda270277 added dark theme support for tagList tags 2022-12-01 01:04:43 +03:00
a944f9bd55 Web: Files: fixed context-menu styles 2022-11-29 16:09:03 +03:00
7fc5da14e3 Web: Files: fixed context-menu styles 2022-11-29 13:52:12 +03:00
Viktor Fomin
aebeb0baeb Components: Themes: add color 2022-11-24 13:00:55 +05:00
Viktor Fomin
1fb1228dbd Merge branch 'develop' into feature/fix-whitelable 2022-11-24 02:33:13 +05:00
Viktor Fomin
c2fb9f583e Merge branch 'develop' into feature/fix-whitelable 2022-11-23 04:36:46 +05:00
ff53dc882e Merge branch 'develop' into feature/custom-theme 2022-11-22 17:03:12 +03:00
Akmal Isomadinov
4ec25a14da Web:Components:Themes: Added themes for romb loader 2022-11-22 17:59:49 +05:00
Vlada Gazizova
5884fa7acd
Merge branch 'develop' into feature/custom-theme 2022-11-21 11:15:55 +03:00
Viktor Fomin
d406f711c7 Components: Themes: add colors 2022-11-18 03:29:44 +05:00
5ced8a9533 Web:Components:Delete unnecessary style. 2022-11-17 22:33:43 +03:00
999e892b7e Merge branch 'develop' into feature/custom-theme 2022-11-17 17:30:46 +03:00
6cc2c5aca1 Web:Components:Add theme base and dark for preparationPortalProgress. 2022-11-17 12:26:57 +03:00
Viktor Fomin
aef763aef3 Component: Themes: add colors 2022-11-13 05:08:45 +05:00
Viktor Fomin
b8df7f8b6a Merge branch 'develop' into bugfix/login 2022-11-13 03:59:57 +05:00
Akmal Isomadinov
5505d16895 Web:Components:Themes: Removed all loader color 2022-11-11 15:19:30 +05:00
Viktor Fomin
1768e7fe8d Components: Themes: add colors 2022-11-11 04:41:30 +05:00
Viktor Fomin
c187c07591 Components: Themes: fix input font size 2022-11-11 04:35:55 +05:00
b11eca7c95 Web:Components:Fix styles toggleButton, 2022-11-10 15:32:21 +03:00
Akmal Isomadinov
8195b01ab4 Web:Components:Button Removed letter-spacing and rollback Themes 2022-11-07 18:41:06 +05:00
Akmal Isomadinov
4555f023ad Web:Components:Button: Fix: font weight and padding 2022-11-07 16:57:54 +05:00
Akmal Isomadinov
81f698f305 Merge branch 'feature/new-ui-button' of github.com:ONLYOFFICE/DocSpace into feature/new-ui-button 2022-11-07 13:53:37 +05:00
39311cf724 Merge branch 'develop' into feature/new-ui-button 2022-11-07 11:37:43 +03:00
Akmal Isomadinov
7eee21d74e Web:Components: Refactoring button size, removed normalDesktop and normalTouchScreen 2022-11-07 13:27:00 +05:00
Akmal Isomadinov
c81351fed2 Web:Components:Theme:Fix Changed the background color and border color 2022-11-04 17:36:23 +05:00
Akmal Isomadinov
ac76354f6e Web:Components:Utils Color name changed 2022-11-04 17:28:10 +05:00
Akmal Isomadinov
74c00d2226 Web:Componemts:Themes:Update Colors button in Themes 2022-11-04 12:44:47 +05:00
d7abe3b9da
Merge pull request #963 from ONLYOFFICE/feature/whitelabel
Feature/whitelabel
2022-11-03 20:10:06 +03:00
mushka
bb16de4ed9 Merge branch 'develop' into feature/info-panel-update and solved merge conflict 2022-11-03 14:52:11 +03:00
Akmal Isomadinov
d6a0019763 Web:Components:Themes: Update size height button theme 2022-11-03 14:56:54 +05:00
Viktor Fomin
2afea89545 Merge branch 'develop' into feature/whitelabel 2022-11-01 15:25:52 +05:00
mushka
5ef235bf8c Merge branch 'develop' into feature/info-panel-update 2022-10-31 13:55:44 +03:00
Viktor Fomin
109cf3e74e Components: Themes: fix 2022-10-31 13:24:10 +05:00
Elyor Djalilov
c4ff1d057c Merge branch 'develop' into feature/active-sessions 2022-10-31 11:24:05 +05:00
Viktor Fomin
c8f598f9d1 Components: Themes: fix 2022-10-31 04:23:56 +05:00
TimofeyBoyko
3baf50db59 Web:Common:Article: add theme support for vertical line 2022-10-28 12:54:06 +05:00
Viktor Fomin
e234f1c619 Components: Themes: add help button colors 2022-10-27 17:09:55 +05:00
Elyor Djalilov
ccf0da781c Web:Client:ActiveSessions: fix style 2022-10-25 14:08:13 +05:00
Elyor Djalilov
42471135ba Merge branch 'develop' into feature/active-sessions
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
2022-10-25 13:41:42 +05:00
mushka
bc10920372 Merge branch 'develop' into feature/info-panel-update 2022-10-24 20:52:01 +03:00
Viktor Fomin
76ba5fdf98 Merge branch 'develop' into bugfix/login 2022-10-20 14:22:22 +05:00
Viktor Fomin
abc85081c0 Components: Themes: add header color 2022-10-20 14:00:21 +05:00
Viktor Fomin
07e80ece4e Components: Themes: add nav bg 2022-10-19 23:52:48 +05:00
mushka
864eb6b15c updated base and dark themes 2022-10-19 19:35:04 +03:00
7569a741d8 Merge branch 'develop' into feature/company-info-settings 2022-10-19 15:21:18 +03:00
f32e02bff0 Web:Client:Add styles focus in checkbox. 2022-10-19 14:45:20 +03:00
59997d1d2c Web: Files: fixed selector-add-button theme styles 2022-10-19 12:29:01 +03:00
Viktor Fomin
e3f786b255 Components: FormWrapper: add dark theme 2022-10-18 00:56:07 +05:00
Elyor Djalilov
fe11164286 Merge branch 'develop' into feature/active-sessions 2022-10-14 12:38:55 +05:00
Elyor Djalilov
9bde9af673 Web: Client: add active sessions 2022-10-14 12:21:42 +05:00
3ef14d6f22 Merge branch 'develop' into feature/invite-panel 2022-10-12 10:00:10 +03:00
199e3faa65 Web: Components: Fixed styles. 2022-10-11 17:11:27 +03:00
a47ce3d8c0 Merge branch 'develop' into feature/invite-panel 2022-10-11 11:58:25 +03:00
cf2547e030 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/common/constants/index.js
2022-10-11 10:20:42 +03:00
4dbf1e70b7 Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.ActiveDirectory/GlobalUsings.cs
#	common/ASC.Data.Storage/StorageFactory.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
#	packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Core/PublicResources/Resource.resx
#	web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
2022-10-10 19:16:03 +03:00
mushka
415c620574 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-10 17:27:16 +03:00
734a03019a
Merge pull request #877 from ONLYOFFICE/feature/phone-input
Feature/phone input
2022-10-10 12:04:59 +03:00
1ea1cedb3b Merge branch 'develop' into feature/invite-panel 2022-10-10 09:32:13 +03:00