diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index 0729d50d6..04294abb3 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -22,6 +22,7 @@
v-for="(item, key) in projectLists"
:key="key"
:data-id="item.id"
+ :class="{operate: item.id == operateItem.id && operateVisible}"
v-longpress="handleLongpress"
@click="toggleRoute('project', {projectId: item.id})">
@@ -147,8 +148,10 @@ export default {
},
toggleRoute(path, params) {
- let location = {name: 'manage-' + path, params: params || {}};
- this.goForward(location);
+ if (this.operateVisible) {
+ return
+ }
+ this.goForward({name: 'manage-' + path, params: params || {}});
},
modalPercent(item) {
diff --git a/resources/assets/sass/pages/components/project-list.scss b/resources/assets/sass/pages/components/project-list.scss
index 18f18fa9c..67d4fe03b 100644
--- a/resources/assets/sass/pages/components/project-list.scss
+++ b/resources/assets/sass/pages/components/project-list.scss
@@ -56,10 +56,11 @@
background-color: #f8f8f8;
user-select: none;
> li {
- padding: 16px;
+ padding: 14px;
margin: 16px;
border-radius: 12px;
background-color: #ffffff;
+ border: 2px solid transparent;
list-style: none;
&.nothing,
&.loading {
@@ -80,6 +81,9 @@
margin: 1px;
}
}
+ &.operate {
+ border-color: $primary-color;
+ }
.project-item {
display: flex;
align-items: center;
diff --git a/resources/assets/sass/pages/page-calendar.scss b/resources/assets/sass/pages/page-calendar.scss
index f6962e783..d583251c9 100644
--- a/resources/assets/sass/pages/page-calendar.scss
+++ b/resources/assets/sass/pages/page-calendar.scss
@@ -210,6 +210,23 @@
.calendar-box {
padding: 0 24px 5px;
user-select: none;
+ .calendar-wrapper {
+ .tui-full-calendar-popup {
+ font-weight: normal;
+ }
+ .tui-full-calendar-section-button {
+ > button {
+ .tui-full-calendar-icon {
+ width: 14px;
+ height: 14px;
+ background-size: 14px;
+ }
+ .tui-full-calendar-content {
+ font-size: 14px;
+ }
+ }
+ }
+ }
}
}
}
diff --git a/resources/assets/sass/scrollbar.scss b/resources/assets/sass/scrollbar.scss
index 952c390e2..e4cdb13f9 100644
--- a/resources/assets/sass/scrollbar.scss
+++ b/resources/assets/sass/scrollbar.scss
@@ -1,43 +1,55 @@
.scrollbar-overlay {
overflow-y: auto;
overflow-y: overlay;
+ -webkit-overflow-scrolling: touch;
/* 滚动条美化 */
&::-webkit-scrollbar {
- width: 10px;
- height: 10px;
+ width: 12px;
+ height: 12px;
}
/*滚动条滑块隐藏*/
&::-webkit-scrollbar-thumb {
- border-radius: 10px;
+ border-radius: 12px;
background: rgba(0, 0, 0, 0);
}
/*按下滚动条,颜色加深*/
&::-webkit-scrollbar-thumb:active {
- border-radius: 10px;
+ border-radius: 12px;
background: rgba(0, 0, 0, .5);
}
- /*鼠标浮到容器上,让该容器的滚动条滑块显示*/
- &:hover::-webkit-scrollbar-thumb {
- border: 2px solid transparent;
- background: rgba(0, 0, 0, .2);
- background-clip: content-box;
- }
-
- /*鼠标浮到容器上,让该容器的滚动条滑块显示*/
- &:hover::-webkit-scrollbar-thumb:hover {
- border-top-width: 0;
- border-bottom-width: 0;
- }
-
/*滚动条轨道*/
&::-webkit-scrollbar-track {
- border-radius: 10px;
+ border-radius: 12px;
background: rgba(0, 0, 0, 0);
}
+
+ /*鼠标浮到容器上*/
+ &:hover {
+ /*让该容器的滚动条滑块显示*/
+ &::-webkit-scrollbar-thumb {
+ border: 3px solid transparent;
+ background: rgba(0, 0, 0, .2);
+ background-clip: content-box;
+ }
+
+ /*让该容器的滚动条滑块显示*/
+ &::-webkit-scrollbar-thumb:hover {
+ border: 2px solid transparent;
+ background: rgba(0, 0, 0, .2);
+ background-clip: content-box;
+ }
+
+ /*按下滚动条,颜色加深*/
+ &::-webkit-scrollbar-thumb:active {
+ border: 2px solid transparent;
+ background: rgba(0, 0, 0, .5);
+ background-clip: content-box;
+ }
+ }
}
.scrollbar-hidden {