Commit Graph

26 Commits

Author SHA1 Message Date
TatianaLopaeva
3440ae9bb4 Web: Common: NavMenu/PageLayout: Fixed incorrect display of the modal dialog, as a result of which the appeared problems with z-index in the Navigation Menu were fixed & Refactoring. 2021-01-14 20:44:59 +03:00
TatianaLopaeva
9bcb922c1a Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	web/ASC.Web.Common/src/components/Layout/index.js
#	web/ASC.Web.Common/src/components/NavMenu/index.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
#	web/ASC.Web.Common/src/store/auth/actions.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2021-01-13 13:27:55 +03:00
7b4dc42620 Fix displaying header pre-loader on Desktop 2020-12-29 17:19:02 +03:00
Vladislav Makhov
c9a5dd2ba8 hide header nav in desktop 2020-12-24 13:27:57 +03:00
Vladislav Makhov
3cbf601f8d Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
#	products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
#	products/ASC.Files/Client/src/store/files/selectors.js
#	web/ASC.Web.Common/src/store/auth/actions.js
2020-12-23 12:58:11 +03:00
Artem Tarasov
91bce60705 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Components/src/components/drop-down/index.js
2020-12-15 16:33:01 +03:00
TatianaLopaeva
c9a8027ddf Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	products/ASC.Files/Client/src/store/files/actions.js
#	web/ASC.Web.Common/package.json
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-body.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
#	web/ASC.Web.Common/src/store/auth/actions.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Components/package.json
2020-12-11 11:12:28 +03:00
Artem Tarasov
48f782b6bc Web: Common/Components: removed unnecessary DOM requests 2020-12-10 20:06:04 +03:00
Vladislav Makhov
2c1c8dedb0 Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/actions.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
2020-12-07 16:03:47 +03:00
Ilya Oleshko
d03584fcdd Web: Fixed isAuthenticated logic 2020-12-04 11:38:15 +03:00
Vladislav Makhov
813c9c4b1d Merge branch 'develop' into feature/desktop-view
# Conflicts:
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
#	web/ASC.Web.Common/src/components/NavMenu/index.js
#	web/ASC.Web.Common/src/pages/login/index.js
#	web/ASC.Web.Common/src/store/auth/actions.js
2020-11-30 15:16:49 +03:00
TatianaLopaeva
aa9db75c77 Web: Common: Changed the logic of displaying downloads for tablet / mobile (removed jumps when downloading) 2020-11-27 18:05:06 +03:00
TatianaLopaeva
e64b93da30 Merge branch 'develop' into feature/fix-hide/show-header 2020-11-27 11:22:50 +03:00
TatianaLopaeva
673756dbe1 Web: Common: Added a comment for style 2020-11-23 22:22:23 +03:00
Artem Tarasov
a82d20767f Web: Comnon: NavMenu: fixed history passing in header-nav 2020-11-23 13:06:09 +03:00
TatianaLopaeva
75162a20c2 Web: Common: Fixed the problem of the appearance of a white bar in the header when the page is loaded 2020-11-20 14:54:34 +03:00
Vladislav Makhov
9f4aecfee8 Fix HeaderNav dropdown when desktop 2020-11-13 21:39:49 +03:00
Vladislav Makhov
a6339582a5 Made header visible on desktop (temporary) 2020-11-12 19:00:43 +03:00
Viktor Fomin
4d34d8c964 Web: Common: fix header loader in nav menu 2020-11-12 02:26:21 +03:00
Vladislav Makhov
f4e5ada7af Hide header nav, when desktop 2020-10-30 16:43:51 +03:00
1a484f1805 Web: Common: Applied prettier style fix 2020-10-16 15:38:04 +03:00
a6bc650da6 Web: Common: NavMenu refactoring 2020-10-05 18:25:01 +03:00
ccd1aef9f8 Web: Re-written NavMenu with selectors and reselect 2020-10-01 01:25:08 +03:00
056fefcd40 Web: Common: Added ProfileMenu actions to NavMenu 2020-09-28 11:26:21 +03:00
a6180afa35 Web: Normalize routing + refactoring 2020-09-25 19:14:50 +03:00
86bcde60b1 Web: Common: Extracted Main and NavMenu as separated components from Layout 2020-09-21 18:27:22 +03:00