diff --git a/app/assets/javascripts/app/controllers/calendar.js.coffee b/app/assets/javascripts/app/controllers/calendar.js.coffee index 1f0a496a5..e4e4d1869 100644 --- a/app/assets/javascripts/app/controllers/calendar.js.coffee +++ b/app/assets/javascripts/app/controllers/calendar.js.coffee @@ -52,6 +52,7 @@ class Index extends App.ControllerContent newDialog: => console.log('NEW') @newItemModal = new App.ControllerModal + large: true head: 'New Calendar' content: App.view('calendar/new')() button: 'Create' diff --git a/app/assets/javascripts/app/views/calendar/new.jst.eco b/app/assets/javascripts/app/views/calendar/new.jst.eco index 81a6e37a0..65755f9b1 100644 --- a/app/assets/javascripts/app/views/calendar/new.jst.eco +++ b/app/assets/javascripts/app/views/calendar/new.jst.eco @@ -12,7 +12,7 @@
-
+
Monday - <%- @T('From/Till') %> + - <%- @T('From/Till') %> + + + + + + + + + - <%- @T('Monday') %> - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - <%- @T('Tuesday') %> - - - - - - - - - - - <%- @T('Wednesday') %> - - - - - - - - - - - <%- @T('Thursday') %> - - - - - - - - - - - <%- @T('Friday') %> - - - - - - - - - - - <%- @T('Saturday') %> - - - - - - - - - - - <%- @T('Sunday') %> - - - - - - - - + + <%- @Icon('plus') %> + + <%- @Icon('plus') %> + + <%- @Icon('plus') %> + + <%- @Icon('plus') %> + + <%- @Icon('plus') %> + + <%- @Icon('plus') %> + + <%- @Icon('plus') %> -
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index ce6df973a..62a77f236 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -1054,6 +1054,10 @@ input.time { box-sizing: content-box; padding: 0 6px; line-height: 42px; + + &.form-control--small { + line-height: 31px; + } } input.time.time--12 { @@ -5776,13 +5780,28 @@ output { } .form-group.day-time { - padding: 5px; + padding-bottom: 4px; + + label { + text-align: center; + } + + .form-control { + margin-left: auto; + margin-right: auto; + margin-bottom: 5px; + } } .settings-list { border-collapse: separate; color: hsl(60,1%,34%); background: white; + table-layout: auto; + + &.settings-list--stretch { + width: 100%; + } &:not(:last-child) { margin-bottom: 34px; @@ -5802,7 +5821,7 @@ output { th, td { - padding: 10px; + padding: 5px; border: 1px solid hsl(198,18%,86%); } @@ -5810,6 +5829,8 @@ output { font-weight: normal; text-transform: uppercase; font-size: 12px; + padding-top: 8px; + padding-bottom: 8px; letter-spacing: 1px; background: hsl(197,20%,93%); border-bottom: none; @@ -5856,6 +5877,23 @@ output { } } +.settings-list-action-cell { + @extend .u-clickable; + text-align: center; + background: hsl(197,22%,96%); + + &:hover { + .icon { + fill: hsl(60,1%,34%); + } + } + + .icon { + fill: hsl(198,19%,72%); + vertical-align: top; + } +} + .select-boxes { display: flex;