diff --git a/Step/wwwroot/assets/styles/base/card.less b/Step/wwwroot/assets/styles/base/card.less index ce0ed3b2..3795f5d2 100644 --- a/Step/wwwroot/assets/styles/base/card.less +++ b/Step/wwwroot/assets/styles/base/card.less @@ -845,6 +845,7 @@ border-radius: 2px; box-shadow: 0 1px 2px 0 @color-black-40; display: flex; + flex-flow: column; .tabs{ height: 64px; width:100%; @@ -870,12 +871,51 @@ .tab:last-child{ border: none; } - .content-box{ - height: calc(~'100% - 30px'); - background-color: red; - width: 100%; - display: flex; - } + } + .content-box{ + height: calc(~'100% - 64px'); + width: 100%; + display: flex; + flex-flow: column; + .row{ + width: 464px; + height: 32px; + display: flex; + align-items: center; + color: @color-greyish-brown; + line-height: 1.78px; + text-align: justify; + cursor: pointer; + label{ + cursor: pointer; + font-size: 18px; + margin-left: 24px; + } + } + .row:nth-child(odd){ + background-color: @color-clear-blue-30; + } + .row:nth-child(even){ + background-color: @color-white4; + } + .row:first-child{ + margin-top: 16px; + } + .row.selected{ + .triangle{ + margin-left: 16px; + width: 0; + height: 0; + border-top: 6px solid transparent; + border-left: 8px solid @color-white; + border-bottom: 6px solid transparent; + } + background-color: @color-clear-blue-75; + color: @color-white; + label{ + margin: 12px; + } + } } } } diff --git a/Step/wwwroot/assets/styles/base/colors.less b/Step/wwwroot/assets/styles/base/colors.less index 60649969..a4796812 100644 --- a/Step/wwwroot/assets/styles/base/colors.less +++ b/Step/wwwroot/assets/styles/base/colors.less @@ -32,6 +32,8 @@ @color-darkish-blue: #002680; @color-darkish-blue-two: #004990; @color-clear-blue: #1791ff; +@color-clear-blue-30: rgba(23,145,255,0.3); +@color-clear-blue-75: rgba(23,145,255,0.75); @color-perrywinkle: #8eb5e2; @color-white: #fff; @color-input-light: #4b4b4b; diff --git a/Step/wwwroot/assets/styles/base/production.less b/Step/wwwroot/assets/styles/base/production.less index 7315b7ff..4d87322e 100644 --- a/Step/wwwroot/assets/styles/base/production.less +++ b/Step/wwwroot/assets/styles/base/production.less @@ -185,6 +185,10 @@ font-weight: 600; cursor: default; } + &.error{ + color: @color-white; + background-color: @color-scarlet; + } } } diff --git a/Step/wwwroot/assets/styles/style.css b/Step/wwwroot/assets/styles/style.css index d8323e5a..0582fde7 100644 --- a/Step/wwwroot/assets/styles/style.css +++ b/Step/wwwroot/assets/styles/style.css @@ -4125,6 +4125,7 @@ footer .container button.big:before { border-radius: 2px; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.4); display: flex; + flex-flow: column; } .card-job-production .card-job-production-body .card-job-production-body-bottom .tabs { height: 64px; @@ -4152,11 +4153,50 @@ footer .container button.big:before { .card-job-production .card-job-production-body .card-job-production-body-bottom .tabs .tab:last-child { border: none; } -.card-job-production .card-job-production-body .card-job-production-body-bottom .tabs .content-box { - height: calc(100% - 30px); - background-color: red; +.card-job-production .card-job-production-body .card-job-production-body-bottom .content-box { + height: calc(100% - 64px); width: 100%; display: flex; + flex-flow: column; +} +.card-job-production .card-job-production-body .card-job-production-body-bottom .content-box .row { + width: 464px; + height: 32px; + display: flex; + align-items: center; + color: #4b4b4b; + line-height: 1.78px; + text-align: justify; + cursor: pointer; +} +.card-job-production .card-job-production-body .card-job-production-body-bottom .content-box .row label { + cursor: pointer; + font-size: 18px; + margin-left: 24px; +} +.card-job-production .card-job-production-body .card-job-production-body-bottom .content-box .row:nth-child(odd) { + background-color: rgba(23, 145, 255, 0.3); +} +.card-job-production .card-job-production-body .card-job-production-body-bottom .content-box .row:nth-child(even) { + background-color: #f3f3f3; +} +.card-job-production .card-job-production-body .card-job-production-body-bottom .content-box .row:first-child { + margin-top: 16px; +} +.card-job-production .card-job-production-body .card-job-production-body-bottom .content-box .row.selected { + background-color: rgba(23, 145, 255, 0.75); + color: #fff; +} +.card-job-production .card-job-production-body .card-job-production-body-bottom .content-box .row.selected .triangle { + margin-left: 16px; + width: 0; + height: 0; + border-top: 6px solid transparent; + border-left: 8px solid #fff; + border-bottom: 6px solid transparent; +} +.card-job-production .card-job-production-body .card-job-production-body-bottom .content-box .row.selected label { + margin: 12px; } @keyframes selectedanimation { 0% { @@ -9812,6 +9852,10 @@ footer .container button.big:before { font-weight: 600; cursor: default; } +.process-selection-maintenance .process.error { + color: #fff; + background-color: #d0021b; +} .create-queue-container { height: 100%; width: 100%; diff --git a/Step/wwwroot/src/modules/base-components/cards/card-job-production.vue b/Step/wwwroot/src/modules/base-components/cards/card-job-production.vue index 0503671d..ebdd9e06 100644 --- a/Step/wwwroot/src/modules/base-components/cards/card-job-production.vue +++ b/Step/wwwroot/src/modules/base-components/cards/card-job-production.vue @@ -1,5 +1,5 @@