Commit Graph

13 Commits

Author SHA1 Message Date
15acf52ee1 Web: Common: ErrorContainer: delete scroll 2022-03-30 12:17:41 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
2022-03-16 11:03:07 +03:00
mushka
57f75cd8a5 merge with feature/virtual-rooms-1.2 2022-03-14 18:53:15 +03:00
mushka
25ad35ab6a added Normal Touchscreen/Desktop differentiation 2022-03-11 13:41:48 +03:00
mushka
c3c59ceaff changed size names in app buttons 2022-03-10 15:59:04 +03:00
43ad5c1747 Web: Common: add children props for ErrorContainer 2022-02-21 18:42:57 +03:00
Timofey
21cd73a698 Web: restore code format 2022-01-28 21:44:58 +08:00
Timofey
18ed20569d Web:Editor: wrap editor in theme provider and delete theme as props in components 2022-01-27 21:54:58 +08:00
Timofey
4dd1237974 Web:Common:ErrorContainer: add change theme in index.js and fixed height to 100vh 2022-01-24 20:03:19 +08:00
Timofey
57f5caba85 Web:Common:ErrorContainer: add support dark-theme 2022-01-24 18:48:24 +08:00
Artem Tarasov
487fd2affc Web: Components/Common: fix imports 2021-02-26 00:19:45 +03:00
Artem Tarasov
48b3c6b445 Web: Common: fix after merge, fix imports and hierarchy 2021-02-25 17:20:11 +03:00