Commit Graph

3 Commits

Author SHA1 Message Date
Artem Tarasov
7db667108b Web: added font-family Opne-Sans to /public, added import fonts to custom.scss 2021-06-06 23:35:56 +03:00
Artem Tarasov
a38195d506 Merge branch 'develop' into bugfix/fixed-styles
# Conflicts:
#	products/ASC.CRM/Client/src/custom.scss
#	products/ASC.Calendar/Client/src/custom.scss
#	products/ASC.Files/Server/DocStore
#	products/ASC.Mail/Client/src/custom.scss
#	products/ASC.People/Client/src/custom.scss
#	products/ASC.Projects/Client/src/custom.scss
#	web/ASC.Web.Client/src/custom.scss
#	web/ASC.Web.Login/src/custom.scss
2021-06-02 10:23:08 +03:00
536c6c2f5e Web: Moved custom.scss to @appserver/common
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00