+ popper-class="dialog-wrapper-read-poptip"
+ placement="left-end">
+
- {{ readList.length }}{{ $L('已读') }}
-
diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss
index 3839b4cde..049bc489c 100755
--- a/resources/assets/sass/pages/common.scss
+++ b/resources/assets/sass/pages/common.scss
@@ -245,9 +245,9 @@ body {
.ivu-modal-body {
padding: 16px 32px 2px;
- overscroll-behavior: none;
- * {
+ .ivu-table-body,
+ .project-log {
overscroll-behavior: none;
}
}
diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss
index 80bb7ea8e..3d73223e6 100644
--- a/resources/assets/sass/pages/components/dialog-wrapper.scss
+++ b/resources/assets/sass/pages/components/dialog-wrapper.scss
@@ -735,56 +735,67 @@
}
}
-.dialog-wrapper-read-poptip-content {
- display: flex;
- position: relative;
+.dialog-wrapper-read-poptip {
+ width: 360px;
+ max-width: 72%;
- .read,
- .unread {
- flex: 1;
- max-height: 300px;
- overflow: auto;
+ .read-poptip-content {
+ display: flex;
+ position: relative;
- > li {
- list-style: none;
- margin-bottom: 12px;
+ .read,
+ .unread {
+ flex: 1;
+ max-height: 300px;
+ overflow: auto;
- .common-avatar {
- width: 100%;
- }
+ > li {
+ min-height: 26px;
+ list-style: none;
+ margin-bottom: 12px;
- &:last-child {
- margin-bottom: 6px;
- }
+ .common-avatar {
+ width: 100%;
+ .avatar-name {
+ padding-right: 6px;
+ }
+ }
- &.read-title {
- > em {
- font-size: 18px;
- font-weight: 600;
- font-style: normal;
- padding-right: 6px;
+ &:last-child {
+ margin-bottom: 6px;
+ }
+
+ &.read-title {
+ min-height: auto;
+ > em {
+ font-size: 18px;
+ font-weight: 600;
+ font-style: normal;
+ padding-right: 6px;
+ }
}
}
}
- }
- .unread {
- > li {
- padding-left: 16px;
+ .unread {
+ > li {
+ padding-left: 16px;
+ }
+ }
+
+ &:before {
+ content: "";
+ position: absolute;
+ left: 50%;
+ top: 0;
+ bottom: 0;
+ width: 1px;
+ background-color: #F4F4F5;
}
}
-
- &:before {
- content: "";
- position: absolute;
- left: 50%;
- top: 0;
- bottom: 0;
- width: 1px;
- background-color: #F4F4F5;
- }
}
+
.dialog-wrapper-paste {
display: flex;
flex-direction: column;
diff --git a/resources/assets/sass/pages/page-manage.scss b/resources/assets/sass/pages/page-manage.scss
index 60ab1505d..3f4c62f96 100644
--- a/resources/assets/sass/pages/page-manage.scss
+++ b/resources/assets/sass/pages/page-manage.scss
@@ -343,8 +343,46 @@
.task-title {
max-width: 600px;
- overflow: hidden;
- text-overflow: ellipsis;
+ display: flex;
+ align-items: center;
+ > span {
+ flex-shrink: 0;
+ font-size: 12px;
+ height: 18px;
+ min-width: 20px;
+ line-height: 16px;
+ padding: 0 2px;
+ border-radius: 3px;
+ color: #8bcf70;
+ border: 1px solid #8bcf70;
+ margin-right: 6px;
+ &.start {
+ background-color: rgba($flow-status-start-color, 0.1);
+ border-color: rgba($flow-status-start-color, 0.1);
+ color: $flow-status-start-color;
+ }
+ &.progress {
+ background-color: rgba($flow-status-progress-color, 0.1);;
+ border-color: rgba($flow-status-progress-color, 0.1);;
+ color: $flow-status-progress-color;
+ }
+ &.test {
+ background-color: rgba($flow-status-test-color, 0.1);;
+ border-color: rgba($flow-status-test-color, 0.1);;
+ color: $flow-status-test-color;
+ }
+ &.end {
+ background-color: rgba($flow-status-end-color, 0.1);;
+ border-color: rgba($flow-status-end-color, 0.1);;
+ color: $flow-status-end-color;
+ }
+ }
+ .task-title-text {
+ flex: 1;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
}
}
diff --git a/resources/assets/sass/pages/page-project.scss b/resources/assets/sass/pages/page-project.scss
index 1dc54705f..28c1632d6 100644
--- a/resources/assets/sass/pages/page-project.scss
+++ b/resources/assets/sass/pages/page-project.scss
@@ -20,13 +20,6 @@
@media (max-width: 768px) {
.page-project {
- .project-panel {
- height: auto;
- min-height: 100%;
- &.gantt {
- height: 100%;
- }
- }
.project-dialog {
position: fixed;
top: 0;
@@ -37,3 +30,14 @@
}
}
}
+@media (max-height: 700px) {
+ .page-project {
+ .project-panel {
+ height: auto;
+ min-height: 100%;
+ &.gantt {
+ height: 100%;
+ }
+ }
+ }
+}