diff --git a/resources/assets/js/components/Mobile/Back.vue b/resources/assets/js/components/Mobile/Back.vue index d520fb65a..4f9d9344d 100644 --- a/resources/assets/js/components/Mobile/Back.vue +++ b/resources/assets/js/components/Mobile/Back.vue @@ -3,10 +3,12 @@ diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 3445cac83..bc5b782af 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -355,7 +355,7 @@ - + diff --git a/resources/assets/js/pages/manage/components/ProjectPanel.vue b/resources/assets/js/pages/manage/components/ProjectPanel.vue index b0432e1e3..192b13b61 100644 --- a/resources/assets/js/pages/manage/components/ProjectPanel.vue +++ b/resources/assets/js/pages/manage/components/ProjectPanel.vue @@ -4,6 +4,9 @@
+
+ +

{{projectData.name}}

diff --git a/resources/assets/sass/components/mobile.scss b/resources/assets/sass/components/mobile.scss index ae004b7e1..f95b88955 100644 --- a/resources/assets/sass/components/mobile.scss +++ b/resources/assets/sass/components/mobile.scss @@ -4,9 +4,9 @@ left: 0; bottom: 0; right: 0; - background-color: #f3f6fe; + background-color: #f8f8f8; box-shadow: 0 0 2px rgba(28, 34, 43, 0.15); - z-index: 98; + z-index: 9998; > ul { display: flex; align-items: center; @@ -47,7 +47,7 @@ width: 500px; height: 500px; background-color: rgba(0, 0, 0, 0.1); - z-index: 99; + z-index: 9999; border-radius: 50%; transform: translate(-460px, -50%); transition: left 0.2s; diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 473aefb36..f67ed0425 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -826,9 +826,10 @@ @media (max-width: 768px) { .dialog-wrapper { .dialog-nav { - height: 60px; + height: 52px; padding: 0; justify-content: center; + background-color: #f8f8f8; &.completed { &:after { @@ -846,7 +847,7 @@ bottom: 0; right: 0; margin: 0; - width: 60px; + width: 52px; display: flex; align-items: center; justify-content: center; @@ -859,7 +860,7 @@ } } .dialog-block { - margin: 0 60px; + margin: 0 52px; justify-content: center; .dialog-avatar { display: none; @@ -879,8 +880,16 @@ padding: 0 14px; } .dialog-footer { - padding: 0 20px; - margin-bottom: 16px; + background-color: #f8f8f8; + padding: 8px 10px; + margin-bottom: 0; + .dialog-input { + .chat-input-wrapper { + padding-left: 6px; + padding-right: 8px; + background-color: #ffffff; + } + } } } } diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss index 277bac6f7..c65d2aebe 100644 --- a/resources/assets/sass/pages/components/project-list.scss +++ b/resources/assets/sass/pages/components/project-list.scss @@ -1,13 +1,11 @@ .project-list { flex: 1; + height: 100%; display: flex; flex-direction: column; align-items: flex-start; .list-search { - position: sticky; - top: 0; - z-index: 1; width: 100%; flex-shrink: 0; display: flex; @@ -15,11 +13,11 @@ justify-content: center; height: 54px; padding: 0 12px; - background-color: #ffffff; + background-color: #f8f8f8; .search-wrapper { flex: 1; - background-color: #F7F7F7; + background-color: #ffffff; padding: 0 8px; margin: 0 4px; border-radius: 12px; @@ -39,12 +37,14 @@ > ul { flex: 1; + height: 0; + overflow: auto; + background-color: #f8f8f8; > li { - margin: 16px; padding: 16px; - background: #F9FAFB; - box-shadow: 0 0 4px rgba(28, 34, 43, 0.1); + margin: 16px; border-radius: 12px; + background-color: #ffffff; list-style: none; .project-h1 { font-size: 16px; diff --git a/resources/assets/sass/pages/components/project-panel.scss b/resources/assets/sass/pages/components/project-panel.scss index 7eb33dd05..6ad76955a 100644 --- a/resources/assets/sass/pages/components/project-panel.scss +++ b/resources/assets/sass/pages/components/project-panel.scss @@ -15,6 +15,9 @@ .project-title { display: flex; align-items: center; + .project-back { + display: none; + } > h1 { color: #333333; font-size: 28px; @@ -1024,14 +1027,25 @@ @media (max-width: 768px) { .project-panel { .project-head { - margin: 24px 24px 0; + margin: 12px 16px 0; .project-titbox { display: block; + margin-bottom: 16px; .project-title { float: left; padding-bottom: 8px; + .project-back { + display: flex; + align-items: center; + justify-content: center; + margin-left: -16px; + width: 52px; + > i { + font-size: 26px; + } + } > h1 { - font-size: 24px; + font-size: 22px; } } .project-icons { diff --git a/resources/assets/sass/pages/page-login.scss b/resources/assets/sass/pages/page-login.scss index 58b4d41f5..c9a4bd68a 100644 --- a/resources/assets/sass/pages/page-login.scss +++ b/resources/assets/sass/pages/page-login.scss @@ -7,7 +7,7 @@ display: flex; align-items: center; justify-content: center; - background-color: #F3F6FE; + background-color: #f8f8f8; .login-body { display: flex; flex-direction: column; diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss index e0262fd2a..e7f59dc65 100644 --- a/resources/assets/sass/pages/page-messenger.scss +++ b/resources/assets/sass/pages/page-messenger.scss @@ -410,6 +410,15 @@ .page-messenger { .messenger-wrapper { .messenger-select { + .messenger-search { + background-color: #f8f8f8; + .search-wrapper { + background-color: #ffffff; + } + } + .messenger-nav { + background-color: #f8f8f8; + } .messenger-menu { border-top: 0; height: 60px;