diff --git a/resources/assets/js/components/UserAvatar.vue b/resources/assets/js/components/UserAvatar.vue
index e74c5664..138fe7ee 100755
--- a/resources/assets/js/components/UserAvatar.vue
+++ b/resources/assets/js/components/UserAvatar.vue
@@ -12,9 +12,9 @@
-
-
-
{{nickname}}
+
+
+ {{nickname}}
{{user.nickname}}
@@ -48,6 +48,14 @@
type: Boolean,
default: false
},
+ borderWitdh: {
+ type: Number,
+ default: 0
+ },
+ borderColor: {
+ type: String,
+ default: ''
+ },
},
data() {
return {
@@ -60,6 +68,24 @@
computed: {
...mapState(["userId", "userOnline"]),
+ boxStyle() {
+ const style = {};
+ const {borderWitdh, borderColor} = this
+ if (borderWitdh > 0) {
+ style.border = borderWitdh + "px solid " + (borderColor || "#ffffff");
+ }
+ return style;
+ },
+
+ avatarSize() {
+ const {borderWitdh, size} = this
+ if (borderWitdh > 0) {
+ return size - borderWitdh * 2;
+ } else {
+ return size;
+ }
+ },
+
showImg() {
const {userimg} = this.user
if (!userimg) {
diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue
index ea805b40..439e82d8 100644
--- a/resources/assets/js/pages/manage.vue
+++ b/resources/assets/js/pages/manage.vue
@@ -42,13 +42,9 @@
diff --git a/resources/assets/js/pages/manage/components/ProjectList.vue b/resources/assets/js/pages/manage/components/ProjectList.vue
index 16037cce..8f7ba941 100644
--- a/resources/assets/js/pages/manage/components/ProjectList.vue
+++ b/resources/assets/js/pages/manage/components/ProjectList.vue
@@ -169,7 +169,7 @@
{{item.file_num}}
diff --git a/resources/assets/js/pages/manage/components/TaskRow.vue b/resources/assets/js/pages/manage/components/TaskRow.vue
index 3d4c1963..56252467 100644
--- a/resources/assets/js/pages/manage/components/TaskRow.vue
+++ b/resources/assets/js/pages/manage/components/TaskRow.vue
@@ -69,7 +69,7 @@
diff --git a/resources/assets/sass/common-avatar.scss b/resources/assets/sass/common-avatar.scss
index 9c3b8974..3c5846a1 100755
--- a/resources/assets/sass/common-avatar.scss
+++ b/resources/assets/sass/common-avatar.scss
@@ -5,6 +5,7 @@
align-items: center;
.avatar-box {
position: relative;
+ border-radius: 50%;
.avatar-text {
background-color: #87d068;
}
diff --git a/resources/assets/sass/main.scss b/resources/assets/sass/main.scss
index d6c57404..d91b7de2 100755
--- a/resources/assets/sass/main.scss
+++ b/resources/assets/sass/main.scss
@@ -1,3 +1,11 @@
+body {
+ overflow: hidden;
+ .ivu-input,
+ .ivu-select-selection {
+ border-color: #e8e8e8;
+ }
+}
+
*[hidden="hidden"] {
display: none !important;
}
@@ -15,13 +23,6 @@
}
}
-body {
- .ivu-input,
- .ivu-select-selection {
- border-color: #e8e8e8;
- }
-}
-
.ivu-modal-wrap {
&.simple-modal {
.ivu-modal {
diff --git a/resources/assets/sass/manage-wrapper.scss b/resources/assets/sass/manage-wrapper.scss
index 81c861db..80e212ca 100644
--- a/resources/assets/sass/manage-wrapper.scss
+++ b/resources/assets/sass/manage-wrapper.scss
@@ -156,29 +156,14 @@
}
.manage-box-main {
flex: 1;
- height: 100%;
- display: flex;
- flex-direction: column;
- background: white;
- .manage-box-body {
- width: 100%;
- flex: 1;
- position: relative;
+ position: relative;
+ .manage-box-view {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
overflow: auto;
- display: flex;
- flex-direction: column;
- .manage-box-body-content {
- flex: 1;
- position: relative;
- .manage-box-view {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- overflow: auto;
- }
- }
}
}
}
diff --git a/resources/assets/sass/project-list.scss b/resources/assets/sass/project-list.scss
index ad60b3a9..4d111957 100644
--- a/resources/assets/sass/project-list.scss
+++ b/resources/assets/sass/project-list.scss
@@ -370,9 +370,6 @@
&:first-child {
margin-left: 0;
}
- .common-avatar {
- padding: 2px;
- }
}
}
.task-icon {
@@ -663,19 +660,16 @@
}
}
&.row-member {
+ padding: 8px;
> ul {
- display: flex;
- align-items: center;
- margin-left: -4px;
+ height: 32px;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
> li {
list-style: none;
+ display: inline-block;
margin-left: -6px;
- overflow: hidden;
- text-overflow:ellipsis;
- white-space: nowrap;
&:first-child {
margin-left: 0;
}