Skip to content

Commit

Permalink
perf: 优化工作量配色
Browse files Browse the repository at this point in the history
  • Loading branch information
@kuaifan
kuaifan committed Mar 23, 2022
1 parent 98729cf commit 590b76a
Show file tree
Hide file tree
Showing 6 changed files with 180 additions and 130 deletions.
91 changes: 44 additions & 47 deletions resources/assets/sass/pages/components/project-list.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,24 +165,24 @@
justify-content: center;
cursor: pointer;
&.start {
background-color: rgba(38, 38, 38, 0.05);
border-color: rgba(38, 38, 38, 0.05);
color: #595959;
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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(21, 173, 49, 0.1);
border-color: rgba(21, 173, 49, 0.1);
color: #038a24;
background-color: rgba($flow-status-end-color, 0.1);;
border-color: rgba($flow-status-end-color, 0.1);;
color: $flow-status-end-color;
}
}
}
Expand Down Expand Up @@ -407,24 +407,24 @@
margin-right: 4px;
text-align: center;
&.start {
background-color: rgba(38, 38, 38, 0.05);
border-color: rgba(38, 38, 38, 0.05);
color: #595959;
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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(21, 173, 49, 0.1);
border-color: rgba(21, 173, 49, 0.1);
color: #038a24;
background-color: rgba($flow-status-end-color, 0.1);;
border-color: rgba($flow-status-end-color, 0.1);;
color: $flow-status-end-color;
}
}
> pre {
Expand Down Expand Up @@ -775,24 +775,24 @@
margin-right: 3px;
text-align: center;
&.start {
background-color: rgba(38, 38, 38, 0.05);
border-color: rgba(38, 38, 38, 0.05);
color: #595959;
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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(21, 173, 49, 0.1);
border-color: rgba(21, 173, 49, 0.1);
color: #038a24;
background-color: rgba($flow-status-end-color, 0.1);;
border-color: rgba($flow-status-end-color, 0.1);;
color: $flow-status-end-color;
}
}
}
Expand Down Expand Up @@ -979,35 +979,32 @@
color: $primary-text-color !important;

&.start {
color: #595959 !important;
color: $flow-status-start-color !important;
}

&.progress {
color: #0171c2 !important;
color: $flow-status-progress-color !important;
}
&.test {
color: #0171c2 !important;
color: $flow-status-test-color !important;
}
&.end {
color: #038a24 !important;
color: $flow-status-end-color !important;
}

&:hover,
&.ivu-cascader-menu-item-active {
&.project-list-flow-cascader-item {

&.start {
background-color: rgba(38, 38, 38, 0.05);
background-color: rgba($flow-status-start-color, 0.1);
}

&.progress {
background-color: rgba(27, 154, 238, 0.1);
background-color: rgba($flow-status-progress-color, 0.1);;
}
&.test {
background-color: rgba(27, 154, 238, 0.1);
background-color: rgba($flow-status-test-color, 0.1);;
}
&.end {
background-color: rgba(21, 173, 49, 0.1);
background-color: rgba($flow-status-end-color, 0.1);;
}
}
}
Expand Down
108 changes: 77 additions & 31 deletions resources/assets/sass/pages/components/project-workflow.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,24 +61,24 @@
vertical-align: middle;
overflow: hidden;
&.start {
background-color: rgba(38, 38, 38, 0.05);
border-color: rgba(38, 38, 38, 0.05);
color: #595959;
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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(21, 173, 49, 0.1);
border-color: rgba(21, 173, 49, 0.1);
color: #038a24;
background-color: rgba($flow-status-end-color, 0.1);;
border-color: rgba($flow-status-end-color, 0.1);;
color: $flow-status-end-color;
}
}
}
Expand Down Expand Up @@ -321,32 +321,81 @@
}

&.start {
border-color: #e5e5e5;
border-color:rgba($flow-status-start-color, 0.2);
&:hover {
border-color: #bfbfbf
border-color: rgba($flow-status-start-color, 0.7);
}
.ivu-radio-checked .ivu-radio-inner {
border-color: $flow-status-start-color;
box-shadow: none;
}
.ivu-radio-inner::after {
background-color: $flow-status-start-color;
}
.ivu-checkbox-checked .ivu-checkbox-inner {
border-color: $flow-status-start-color;
background-color: $flow-status-start-color;
}
}

&.progress {
border-color: #ccecff;
border-color: rgba($flow-status-progress-color, 0.2);
&:hover {
border-color: #87d2ff
border-color: rgba($flow-status-progress-color, 0.7);
}
.ivu-radio-checked .ivu-radio-inner {
border-color: $flow-status-progress-color;
box-shadow: none;
}
.ivu-radio-inner::after {
background-color: $flow-status-progress-color;
}
.ivu-checkbox-checked .ivu-checkbox-inner {
border-color: $flow-status-progress-color;
background-color: $flow-status-progress-color;
}
}

&.test {
border-color: #ccecff;
border-color: rgba($flow-status-test-color, 0.2);
&:hover {
border-color: #87d2ff
border-color: rgba($flow-status-test-color, 0.7);
}
.ivu-radio-checked .ivu-radio-inner {
border-color: $flow-status-test-color;
box-shadow: none;
}
.ivu-radio-inner::after {
background-color: $flow-status-test-color;
}
.ivu-checkbox-checked .ivu-checkbox-inner {
border-color: $flow-status-test-color;
background-color: $flow-status-test-color;
}
}

&.end {
border-color: #cafac8;
border-color: rgba($flow-status-end-color, 0.2);
&:hover {
border-color: #64d16d
border-color: rgba($flow-status-end-color, 0.7);
}
.ivu-radio-checked .ivu-radio-inner {
border-color: $flow-status-end-color;
box-shadow: none;
}
.ivu-radio-inner::after {
background-color: $flow-status-end-color;
}
.ivu-checkbox-checked .ivu-checkbox-inner {
border-color: $flow-status-end-color;
background-color: $flow-status-end-color;
}
}

.ivu-checkbox-disabled.ivu-checkbox-checked .ivu-checkbox-inner {
background-color: #f3f3f3 !important;
border-color: #dcdee2 !important;
}
}

.taskflow-config-table-status-item {
Expand Down Expand Up @@ -380,23 +429,20 @@
}

&.start {
background: rgba(38,38,38,0.05);
color: #595959
background-color: rgba($flow-status-start-color, 0.1);
color: $flow-status-start-color;
}

&.progress {
background: rgba(27,154,238,0.1);
color: #0171c2
background-color: rgba($flow-status-progress-color, 0.1);;
color: $flow-status-progress-color;
}

&.test {
background: rgba(27,154,238,0.1);
color: #0171c2
background-color: rgba($flow-status-test-color, 0.1);;
color: $flow-status-test-color;
}

&.end {
background: rgba(21,173,49,0.1);
color: #038a24
background-color: rgba($flow-status-end-color, 0.1);;
color: $flow-status-end-color;
}

.name {
Expand Down
54 changes: 29 additions & 25 deletions resources/assets/sass/pages/components/task-detail.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,26 +65,30 @@
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
&.start,
&.archived {
background-color: rgba(38, 38, 38, 0.05);
border-color: rgba(38, 38, 38, 0.05);
color: #595959;
background-color: rgba($flow-status-archived-color, 0.1);
border-color: rgba($flow-status-archived-color, 0.1);
color: $flow-status-archived-color;
}
&.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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(21, 173, 49, 0.1);
border-color: rgba(21, 173, 49, 0.1);
color: #038a24;
background-color: rgba($flow-status-end-color, 0.1);;
border-color: rgba($flow-status-end-color, 0.1);;
color: $flow-status-end-color;
}
}
}
Expand Down Expand Up @@ -355,24 +359,24 @@
text-align: center;
cursor: pointer;
&.start {
background-color: rgba(38, 38, 38, 0.05);
border-color: rgba(38, 38, 38, 0.05);
color: #595959;
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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(27, 154, 238, 0.1);
border-color: rgba(27, 154, 238, 0.1);
color: #0171c2;
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(21, 173, 49, 0.1);
border-color: rgba(21, 173, 49, 0.1);
color: #038a24;
background-color: rgba($flow-status-end-color, 0.1);;
border-color: rgba($flow-status-end-color, 0.1);;
color: $flow-status-end-color;
}
}
}
Expand Down
Loading

0 comments on commit 590b76a

Please sign in to comment.