Mushka Nikita
|
bfda270277
|
added dark theme support for tagList tags
|
2022-12-01 01:04:43 +03: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 |
|
|
|
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
|
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 |
|
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 |
|
