diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 040def5c9..02b1f3edc 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -1303,7 +1303,9 @@ class slaRef extends App.ControllerContent isInactive = sla.hasClass('is-inactive') sla.toggleClass('is-inactive') isInactive = !isInactive - sla.find('.js-toggle').text(if isInactive then 'Enable' else 'Disable') + sla.find('.js-toggle') + .toggleClass('btn--danger btn--secondary') + .text(if isInactive then 'Enable' else 'Disable') activateColumn: (event) => checkbox = @$(event.currentTarget) diff --git a/app/assets/javascripts/app/views/layout_ref/sla.jst.eco b/app/assets/javascripts/app/views/layout_ref/sla.jst.eco index b770c07be..39c5cf4cb 100644 --- a/app/assets/javascripts/app/views/layout_ref/sla.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/sla.jst.eco @@ -87,36 +87,16 @@

Repsonse Times

-
-
-
00:30 Stunden
-
- - First Response Time -
-
-
-
01:00 Stunden
-
- - Update Time -
-
-
-
48:00 Stunden
-
- - Solution Time -
-
-
+ 00:30 Stunden First Response Time
+ 02:00 Stunden Update Time
+ 48:00 Stunden Solution Time

Business Hours in European Central Time

Mo-Tu 7am - 5pm, Fr 7am - 1pm
-
Disable
+
Disable
Edit
@@ -132,33 +112,12 @@

Repsonse Times

-
-
-
00:30 Stunden
-
- - First Response Time -
-
-
-
01:00 Stunden
-
- - Update Time -
-
-
-
48:00 Stunden
-
- - Solution Time -
-
-
+ 00:30 Stunden First Response Time
+ 01:00 Stunden Update Time

Business Hours in European Central Time

- Mo-Tu 7am - 5pm, Fr 7am - 1pm + Mo-Fr 8 Uhr - 18 Uhr
Enable
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 0be48048a..46dba6f0c 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -337,12 +337,19 @@ span[data-tooltip]:hover:before { } } + &.btn--positive, &.btn--success { color: white; background: hsl(145,51%,45%); &:active { background: hsl(145,51%,35%); } + + &.btn--secondary, + &.btn--secondary:active { + background: white; + color: hsl(145,51%,45%); + } } &.btn--danger { @@ -351,6 +358,12 @@ span[data-tooltip]:hover:before { &:active { background: hsl(0,65%,45%); } + + &.btn--secondary, + &.btn--secondary:active { + background: white; + color: hsl(0,65%,55%); + } } &.btn--text { @@ -5525,10 +5538,15 @@ output { box-shadow: none; position: relative; top: 2px; + background: none; & > *:not(.sla-controls) { opacity: 0.33; } + + .sla-controls .btn { + background: none; + } } h3 { @@ -5538,7 +5556,7 @@ output { .arrow { align-self: center; - margin: 25px 50px 0; + margin: 22px 50px 0; .icon { width: 15px; @@ -5547,27 +5565,6 @@ output { } } - .response-times-entry { - display: flex; - - .icon { - display: none; - vertical-align: middle; - margin-right: 3px; - - &:not(.icon-checkmark) { - } - } - - .response-time { - margin-right: 5px; - } - } - - .response-times-entry:not(:last-child) { - margin: 0 0 2px; - } - .sla-businessHours { flex-basis: 100%; margin: 20px 0;