From 1489a01071bfa22ed8298931af512d33181709c7 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 14 Sep 2015 18:44:36 +0200 Subject: [PATCH 1/4] shrink label letter-spacing --- app/assets/stylesheets/zammad.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index c71cb1180..30581eae4 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -779,7 +779,7 @@ label, display: block; font-size: 12px; font-weight: normal; - letter-spacing: 0.1em; + letter-spacing: 0.05em; margin-bottom: 4px; text-align: left; padding: 0; From 10ab45e4fde4f66acd81c234ec462e5646a8893d Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 14 Sep 2015 18:47:42 +0200 Subject: [PATCH 2/4] modal: add large mode set attribute large to true when creating a modal. It's 740px wide (default width is 660px). 740px because the minimum supported width is 1024px (1280px recommended). The sidebar is 260px wide, leaving 764px for a local modal. 740px results in a minimum padding of 12px around the modal window inside the content window. --- .../app/controllers/_application_controller.js.coffee | 3 +++ app/assets/stylesheets/zammad.css.scss | 3 +++ 2 files changed, 6 insertions(+) diff --git a/app/assets/javascripts/app/controllers/_application_controller.js.coffee b/app/assets/javascripts/app/controllers/_application_controller.js.coffee index 1483b5ab0..300c98377 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.js.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.js.coffee @@ -554,6 +554,7 @@ class App.ControllerModal extends App.Controller backdrop: true keyboard: true close: true + large: false head: '?' buttonClass: 'btn--success' centerButtons: [] @@ -562,6 +563,8 @@ class App.ControllerModal extends App.Controller options = _.extend( defaults, options ) + @className += ' modal--large' if options.large + super(options) if @shown diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 30581eae4..ce6df973a 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -4514,6 +4514,9 @@ footer { margin-top: 35px; margin-bottom: 35px; } +.modal--large .modal-dialog { + max-width: 740px; +} .modal-dialog.wizard { max-width: 460px; } From 4550d976aa6c8bc39b77a0982083412211099a33 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 14 Sep 2015 18:48:07 +0200 Subject: [PATCH 3/4] add close icon to primary email layout ref --- app/assets/javascripts/app/controllers/layout_ref.js.coffee | 2 +- .../javascripts/app/views/layout_ref/primary_email.jst.eco | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/layout_ref.js.coffee b/app/assets/javascripts/app/controllers/layout_ref.js.coffee index 09aaab3d1..03f3851c9 100644 --- a/app/assets/javascripts/app/controllers/layout_ref.js.coffee +++ b/app/assets/javascripts/app/controllers/layout_ref.js.coffee @@ -1600,7 +1600,7 @@ class PrimaryEmailRef extends App.ControllerContent @render() render: -> - @html App.view('layout_ref/primary_email') + @html App.view('layout_ref/primary_email')() App.Config.set( 'layout_ref/primary_email', PrimaryEmailRef, 'Routes' ) diff --git a/app/assets/javascripts/app/views/layout_ref/primary_email.jst.eco b/app/assets/javascripts/app/views/layout_ref/primary_email.jst.eco index 10b577b84..43b8faed7 100644 --- a/app/assets/javascripts/app/views/layout_ref/primary_email.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/primary_email.jst.eco @@ -5,7 +5,7 @@
-
+
<%- @Icon('diagonal-cross') %>

New: User

From d3db084630dcbb1d5ea7600cd13d50e24286eb6a Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Mon, 14 Sep 2015 18:48:46 +0200 Subject: [PATCH 4/4] calendars: style business hours --- .../app/controllers/calendar.js.coffee | 1 + .../app/views/calendar/new.jst.eco | 147 ++++++++---------- app/assets/stylesheets/zammad.css.scss | 42 ++++- 3 files changed, 109 insertions(+), 81 deletions(-) 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;