From 13a36fc4719a574898532fe218f030e08813d647 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 30 May 2022 17:52:22 +0800 Subject: [PATCH] no message --- .../pages/manage/components/ProjectList.vue | 4 +- .../assets/js/pages/manage/messenger.vue | 2 +- resources/assets/sass/components/mobile.scss | 2 +- .../sass/pages/components/project-list.scss | 32 ++++++++++---- resources/assets/sass/pages/page-file.scss | 4 ++ .../assets/sass/pages/page-messenger.scss | 43 +++++++++++++------ 6 files changed, 61 insertions(+), 26 deletions(-) diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue index 04294abb3..42a664d28 100644 --- a/resources/assets/js/pages/manage/components/ProjectList.vue +++ b/resources/assets/js/pages/manage/components/ProjectList.vue @@ -40,9 +40,9 @@ diff --git a/resources/assets/js/pages/manage/messenger.vue b/resources/assets/js/pages/manage/messenger.vue index a4ce5863e..99218ae5a 100644 --- a/resources/assets/js/pages/manage/messenger.vue +++ b/resources/assets/js/pages/manage/messenger.vue @@ -78,7 +78,7 @@ -
+
    diff --git a/resources/assets/sass/components/mobile.scss b/resources/assets/sass/components/mobile.scss index 1d3226148..cd5032241 100644 --- a/resources/assets/sass/components/mobile.scss +++ b/resources/assets/sass/components/mobile.scss @@ -116,7 +116,7 @@ .tabbar-title { padding-top: 6px; - font-size: 14px; + font-size: 13px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss index 67d4fe03b..b6a97deb2 100644 --- a/resources/assets/sass/pages/components/project-list.scss +++ b/resources/assets/sass/pages/components/project-list.scss @@ -56,12 +56,25 @@ background-color: #f8f8f8; user-select: none; > li { - padding: 14px; + padding: 16px; margin: 16px; border-radius: 12px; background-color: #ffffff; - border: 2px solid transparent; list-style: none; + position: relative; + &:before { + display: none; + position: absolute; + content: ""; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 1; + border: 2px solid $primary-color; + pointer-events: none; + border-radius: 12px; + } &.nothing, &.loading { text-align: center; @@ -82,7 +95,9 @@ } } &.operate { - border-color: $primary-color; + &:before { + display: block; + } } .project-item { display: flex; @@ -94,9 +109,9 @@ display: flex; align-items: flex-start; .project-name { - font-size: 16px; + font-size: 14px; line-height: 22px; - font-weight: 600; + color: #333333; word-break: break-all; text-overflow: ellipsis; overflow: hidden; @@ -134,8 +149,9 @@ } } .project-h2 { - margin-top: 8px; - line-height: 22px; + margin-top: 4px; + line-height: 20px; + font-size: 12px; word-break: break-all; text-overflow: ellipsis; overflow: hidden; @@ -158,7 +174,7 @@ } .percent-text { color: $primary-color; - font-weight: 600; + font-weight: 500; } } } diff --git a/resources/assets/sass/pages/page-file.scss b/resources/assets/sass/pages/page-file.scss index d28d865c4..eabbd04a4 100644 --- a/resources/assets/sass/pages/page-file.scss +++ b/resources/assets/sass/pages/page-file.scss @@ -664,7 +664,11 @@ .file-list { user-select: none; > ul { + grid-template-columns: repeat(auto-fill, 80px); grid-gap: 4px; + > li { + width: 80px; + } } } .file-table { diff --git a/resources/assets/sass/pages/page-messenger.scss b/resources/assets/sass/pages/page-messenger.scss index cffa2b348..fb89e0026 100644 --- a/resources/assets/sass/pages/page-messenger.scss +++ b/resources/assets/sass/pages/page-messenger.scss @@ -95,12 +95,10 @@ display: flex; flex-direction: row; align-items: flex-start; - padding: 14px 10px; + padding: 16px 12px; position: relative; cursor: pointer; list-style: none; - margin-right: 1px; - border: 2px solid transparent; .user-avatar, .icon-avatar { width: 42px; @@ -218,8 +216,27 @@ left: 42px; transform: scale(0.8); } - .dialog-split { + .dialog-line { display: none; + position: absolute; + bottom: 0; + right: 0; + left: 68px; + height: 1px; + background-color: #f2f2f2; + transform: scaleY(0.5); + } + &:before { + display: none; + position: absolute; + content: ""; + top: 0; + left: 0; + right: 0; + bottom: 0; + z-index: 1; + border: 2px solid $primary-color; + pointer-events: none; } &.top { background-color: #EEEFF1; @@ -228,7 +245,9 @@ background-color: #F4F5F7; } &.operate { - border-color: $primary-color; + &:before { + display: block; + } } &.loading { margin: 0; @@ -433,6 +452,9 @@ max-width: none; background-color: #ffffff; z-index: 48; + &:after { + display: none; + } .messenger-search { background-color: #f8f8f8; .search-wrapper { @@ -465,18 +487,11 @@ } } } - .dialog-split { + .dialog-line { display: block; - position: absolute; - bottom: 0; - right: 0; - left: 68px; - height: 1px; - background-color: #f2f2f2; - transform: scaleY(0.5); } &:last-child { - .dialog-split { + .dialog-line { display: none; } }