Commit Graph

98 Commits

Author SHA1 Message Date
Viktor Fomin
07e80ece4e Components: Themes: add nav bg 2022-10-19 23:52:48 +05:00
Viktor Fomin
e3f786b255 Components: FormWrapper: add dark theme 2022-10-18 00:56:07 +05:00
199e3faa65 Web: Components: Fixed styles. 2022-10-11 17:11:27 +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
mushka
7de3650533 Merge branch 'develop' into feature/doc-space-info-panel 2022-10-07 16:21:59 +03:00
TimofeyBoyko
df17649b19 Web:Components:ContextMenu: fix header styles 2022-10-06 17:39:15 +03:00
37f8589603 Web: Components: fixed combobox styles 2022-10-06 12:41:30 +03:00
Elyor Djalilov
62f5945efd Web: InputPhone: bug with style fixed 2022-10-05 18:24:17 +05:00
412e7298cf Merge branch 'develop' into feature/stripe 2022-10-05 14:00:39 +03:00
b56a90e917 Web: Components: ToggleButton: fixed colors for dark theme 2022-10-04 17:19:20 +03:00
Elyor Djalilov
e2cf41096f dark theme fixed 2022-10-03 21:02:00 +05:00
Elyor Djalilov
41261e64b9 Merge branch 'develop' into feature/phone-input
# Conflicts:
#	packages/components/index.js
2022-10-03 12:20:33 +05:00
mushka
4a701676ae updated dark theme for infoPanel 2022-10-02 03:42:40 +03:00
mushka
113d832b29 transfered colors for history to dark theme 2022-10-02 02:46:16 +03:00
mushka
af16f21d4a Merge branch 'develop' into feature/doc-space-info-panel 2022-09-26 11:00:34 +03:00
7f1d946269 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/Shell.jsx
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
#	packages/client/src/pages/PortalSettings/index.js
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.People/Server/Api/UserController.cs
#	products/ASC.People/Server/GlobalUsings.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
2022-09-23 16:11:23 +03:00
c2ab59c2ff
Merge branch 'develop' into feature/new-profile 2022-09-23 15:17:22 +03:00
389298dfd6 Web: Client: added theme to logo 2022-09-23 13:32:43 +03:00
2b2aeea246 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-21 12:48:03 +03:00
f904dd730c Web:Components:Delete secondaryButton theme. 2022-09-21 10:26:05 +03:00
c3f2d3542c Components: Themes: add style 2022-09-20 22:01:48 +03:00
1cc72b52da Web: Fixed dark theme. 2022-09-20 12:03:28 +03:00
f251632987 Web: Components: Separated styles. 2022-09-20 10:40:30 +03:00
e5d5d6aebe Components: Themes: fix height 2022-09-19 23:18:21 +03:00
8a380d24f5 Web: Added dark theme. 2022-09-19 16:31:00 +03:00
6b3ebed8b9 Web: Fixed bugs. 2022-09-19 11:59:47 +03:00
1fa2dc05cb Components: Themes: fix 2022-09-16 17:01:29 +03:00
mushka
9c8fa64983 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-16 15:33:29 +03:00
83791ef405 Components: Combobox: fix styles 2022-09-16 10:57:01 +03:00
f959d81e1f Components: Themes: fix 2022-09-16 03:05:19 +03:00
bec4f11dcd Merge branch 'develop' into feature/stripe
# Conflicts:
#	common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/Program.cs
#	packages/common/components/Loaders/index.js
#	packages/common/store/AuthStore.js
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	packages/login/webpack.config.js
#	products/ASC.Files/Service/Program.cs
#	web/ASC.Web.Api/Program.cs
2022-09-15 17:16:04 +03:00
c20e01e351 Web: Added information about storage size, added checks. 2022-09-15 14:59:55 +03:00
a04f6887b2 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-15 03:01:02 +03:00
1f76f8b058 Web: Components: fixed settings-icon color 2022-09-14 14:05:38 +03:00
8e78498856 Wed: Added new stores. 2022-09-14 09:55:22 +03:00
e7e4a004d8 Components: Themes: fix avatar sizes for dark theme 2022-09-13 17:33:53 +03:00
6bc2be26cd Components: Themes: fix 2022-09-13 17:19:12 +03:00
4b3f9f7e29 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
#	packages/client/src/components/dialogs/index.js
2022-09-09 17:34:19 +03:00
1595c6bed4 Web: Portal-Settings: Fix category separator 2022-09-09 15:08:48 +03:00
mushka
ab7ace5af6 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-09 13:22:36 +03:00
TimofeyBoyko
58e545a002 Web:Components:Avatar: fix role wrapper position for min size 2022-09-09 09:24:23 +03:00
TimofeyBoyko
5b7d911852 Web:Components:Avatar: update styles and svg 2022-09-08 19:34:44 +03:00
TimofeyBoyko
752af48a4f Web:Components:SelectorAddButton: fix styles 2022-09-08 18:33:42 +03:00
02961b0b77 Components: SocialButton: redesign 2022-09-08 15:37:38 +03:00
mushka
20f2fde176 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-08 15:28:38 +03:00
024826b64a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-08 13:09:25 +03:00
4c949e6c1a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile 2022-09-07 23:21:46 +03:00