diff --git a/app/assets/javascripts/app/views/calendar/index.jst.eco b/app/assets/javascripts/app/views/calendar/index.jst.eco index 0a8fb0c70..192803a05 100644 --- a/app/assets/javascripts/app/views/calendar/index.jst.eco +++ b/app/assets/javascripts/app/views/calendar/index.jst.eco @@ -17,14 +17,14 @@ <% for calendar in @calendars: %>
-
+

<%- @Icon('status', 'ok inline') %> <%= calendar.name %>

<%- @T('Timezone') %>
<%= calendar.timezone %>
-
+
<%- @T('Business Hours') %>
@@ -50,7 +50,7 @@
-
+
<%- @T('Public Holidays') %>
<% for holiday, meta of calendar.public_holidays_preview: %> diff --git a/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco index 485ed2b06..36491d473 100644 --- a/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/sla_modal.jst.eco @@ -797,6 +797,61 @@
+

+ Holidays +

+
+ +
+ + <%- @Icon('arrow-down', 'dropdown-arrow') %> +
+ + Powered by Google +
+
+ + +
+ +
+ +
+ +
+
+ <%- @Icon('reload') %> Sync Now +
+
+

Response Times in Business Hours

diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index c9b90da17..77e46209b 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -41,6 +41,14 @@ p { } } +.text-muted { + color: hsl(60,1%,74%); +} + +.text-small { + font-size: 12px; +} + .u-highlight { color: #0F94D6; } @@ -101,6 +109,10 @@ blockquote { position: relative; } +.u-inlineBlock { + display: inline-block; +} + .zIndex-1, .zIndex-2, .zIndex-3, @@ -343,6 +355,11 @@ span[data-tooltip]:hover:before { display: inline-flex; align-items: center; + .icon { + margin: -2px 5px 0 -2px; + fill: hsl(0,0%,60%); + } + &.btn--slim { padding-left: 7px !important; padding-right: 7px !important; @@ -633,6 +650,7 @@ table { .checkbox-replacement.checkbox-replacement--inline, .radio-replacement.radio-replacement--inline { display: inline-flex; + margin-right: 3px; } .checkbox-replacement input, @@ -1040,6 +1058,7 @@ input[type=text], input[type=password], input[type=email], input[type=date], +input[type=url], textarea, .form-control, .checkbox.form-group .checkbox { @@ -1063,6 +1082,11 @@ textarea, padding: 0 8px; height: 31px; } + + &.form-control--inline { + display: inline-block; + width: auto; + } } input[type=time] { @@ -5824,6 +5848,10 @@ output { } } +.settings-row { + margin-bottom: 10px; +} + .settings-list { border-collapse: separate; color: hsl(60,1%,34%); @@ -6112,6 +6140,10 @@ output { .action-flow { display: flex; flex-wrap: wrap; + + &.action-flow--row { + flex-basis: 100%; + } } .action-separator { @@ -6141,6 +6173,12 @@ output { } } + .action-block { + &.action-block--flex { + flex: 1; + } + } + .action-row { flex-basis: 100%; }