diff --git a/resources/assets/js/components/DropdownMenu.vue b/resources/assets/js/components/DropdownMenu.vue index 0c11c316c..26e63a7a1 100644 --- a/resources/assets/js/components/DropdownMenu.vue +++ b/resources/assets/js/components/DropdownMenu.vue @@ -2,15 +2,15 @@ -
- -
  • +
    + +
    • { + this.$refs.dropdownMenu.updatePopper(); + }, 0); }, setupEventListeners(event) { diff --git a/resources/assets/js/components/ImgUpload.vue b/resources/assets/js/components/ImgUpload.vue index 4f904e01a..f55855ab1 100755 --- a/resources/assets/js/components/ImgUpload.vue +++ b/resources/assets/js/components/ImgUpload.vue @@ -2,7 +2,7 @@
      -
      +
      @@ -77,314 +77,361 @@ diff --git a/resources/assets/js/pages/manage/components/TaskOperation.vue b/resources/assets/js/pages/manage/components/TaskOperation.vue index 66c49643f..1fd0917e0 100644 --- a/resources/assets/js/pages/manage/components/TaskOperation.vue +++ b/resources/assets/js/pages/manage/components/TaskOperation.vue @@ -6,13 +6,13 @@ :disabled="disabled" :size="size" :style="styles" - class="task-operation-dropdown" + class="general-operation-dropdown" placement="bottom" @command="dropTask" @visible-change="visibleChange"> -
      - -
    • +
      + +
      • diff --git a/resources/assets/sass/components/img-update.scss b/resources/assets/sass/components/img-update.scss index f96ae5050..6295c33f9 100644 --- a/resources/assets/sass/components/img-update.scss +++ b/resources/assets/sass/components/img-update.scss @@ -45,6 +45,9 @@ left: 0; right: 0; background: rgba(0, 0, 0, .6); + flex-direction: row; + align-items: center; + justify-content: center; } .imgcomp-upload-list-cover i { @@ -74,7 +77,7 @@ } .imgcomp-upload-list:hover .imgcomp-upload-list-cover { - display: block; + display: flex; } .img-upload-foot { @@ -111,10 +114,11 @@ vertical-align: top; .add-box-icon { - i { - vertical-align: middle; - padding-bottom: 2px; - } + display: flex; + align-items: center; + justify-content: center; + width: 100%; + height: 100%; } .add-box-upload { @@ -132,8 +136,12 @@ height: 22px; line-height: 22px; cursor: pointer; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; - .ivu-upload-drag, .ivu-upload-drag:hover { + .ivu-upload-drag, + .ivu-upload-drag:hover { background: transparent; border: 0; border-radius: 0; @@ -260,3 +268,17 @@ background-color: rgba(255, 255, 255, 0.9); z-index: 1; } + +// 移动端不显示 +body.window-touch { + .imgcomp-upload-list:hover .imgcomp-upload-list-cover { + display: none; + } + .add-box:hover { + border-color: #dddee1; + + .add-box-upload { + display: none; + } + } +} diff --git a/resources/assets/sass/pages/components/_.scss b/resources/assets/sass/pages/components/_.scss index ae5238686..5de0c1572 100755 --- a/resources/assets/sass/pages/components/_.scss +++ b/resources/assets/sass/pages/components/_.scss @@ -4,6 +4,7 @@ @import "dialog-select"; @import "dialog-wrapper"; @import "file-content"; +@import "general-operation"; @import "meeting-manager"; @import "project-archived"; @import "project-dialog"; @@ -20,7 +21,6 @@ @import "task-deleted"; @import "task-detail"; @import "task-menu"; -@import "task-operation"; @import "task-priority"; @import "task-move"; @import "team-management"; diff --git a/resources/assets/sass/pages/components/task-operation.scss b/resources/assets/sass/pages/components/general-operation.scss similarity index 97% rename from resources/assets/sass/pages/components/task-operation.scss rename to resources/assets/sass/pages/components/general-operation.scss index 9382b844d..8fa8a935d 100644 --- a/resources/assets/sass/pages/components/task-operation.scss +++ b/resources/assets/sass/pages/components/general-operation.scss @@ -1,4 +1,4 @@ -.task-operation-dropdown { +.general-operation-dropdown { position: absolute; top: 0; left: 0; @@ -18,9 +18,9 @@ } } -.task-operation-more-dropdown { +.general-operation-more-dropdown { > li { - &.task-operation-more-warp { + &.general-operation-more-warp { list-style: none; > ul { @@ -89,16 +89,19 @@ 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);