From fbcbfd4a55c9f36846f8ffb7ae2391f0201b6fd8 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 17 Sep 2015 14:19:30 +0200 Subject: [PATCH] style calendar list --- .../app/views/calendar/index.jst.eco | 75 ++++++++++--------- app/assets/stylesheets/zammad.css.scss | 39 ++++++++-- 2 files changed, 74 insertions(+), 40 deletions(-) diff --git a/app/assets/javascripts/app/views/calendar/index.jst.eco b/app/assets/javascripts/app/views/calendar/index.jst.eco index a88209d0a..04aa75991 100644 --- a/app/assets/javascripts/app/views/calendar/index.jst.eco +++ b/app/assets/javascripts/app/views/calendar/index.jst.eco @@ -19,42 +19,47 @@
-

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

- <%- @T('Timezone') %>: <%= calendar.timezone %> +

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

-
- <%- @T('Business Hours') %>:
- - - - - - - - - - - - - - - - - - - - - - -
<%- @T('Monday') %><% if _.isEmpty(calendar.business_hours['mon']): %>-<% else: %><% for from, till of calendar.business_hours['mon']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Tuesday') %><% if _.isEmpty(calendar.business_hours['tue']): %>-<% else: %><% for from, till of calendar.business_hours['tue']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Wednesday') %><% if _.isEmpty(calendar.business_hours['wed']): %>-<% else: %><% for from, till of calendar.business_hours['wed']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Thursday') %><% if _.isEmpty(calendar.business_hours['thu']): %>-<% else: %><% for from, till of calendar.business_hours['thu']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Friday') %><% if _.isEmpty(calendar.business_hours['fri']): %>-<% else: %><% for from, till of calendar.business_hours['fri']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Saturday') %><% if _.isEmpty(calendar.business_hours['sat']): %>-<% else: %><% for from, till of calendar.business_hours['sat']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Sunday') %><% if _.isEmpty(calendar.business_hours['sun']): %>-<% else: %><% for from, till of calendar.business_hours['sun']: %><%= from %>-<%= till %> <% end %><% end %>
-
-
- <%- @T('Public Holidays') %>: - - <% for holiday, meta of calendar.public_holidays_preview: %> - class="is-inactive"<% end %>> - <% end %> -
<%- @Tdate(holiday) %><%= meta.summary %>
+
+
+
+
<%- @T('Timezone') %>
<%= calendar.timezone %> +
+
+
<%- @T('Business Hours') %>
+ + + + + + + + + + + + + + + + + + + + + + +
<%- @T('Monday') %><% if _.isEmpty(calendar.business_hours['mon']): %>-<% else: %><% for from, till of calendar.business_hours['mon']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Tuesday') %><% if _.isEmpty(calendar.business_hours['tue']): %>-<% else: %><% for from, till of calendar.business_hours['tue']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Wednesday') %><% if _.isEmpty(calendar.business_hours['wed']): %>-<% else: %><% for from, till of calendar.business_hours['wed']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Thursday') %><% if _.isEmpty(calendar.business_hours['thu']): %>-<% else: %><% for from, till of calendar.business_hours['thu']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Friday') %><% if _.isEmpty(calendar.business_hours['fri']): %>-<% else: %><% for from, till of calendar.business_hours['fri']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Saturday') %><% if _.isEmpty(calendar.business_hours['sat']): %>-<% else: %><% for from, till of calendar.business_hours['sat']: %><%= from %>-<%= till %> <% end %><% end %>
<%- @T('Sunday') %><% if _.isEmpty(calendar.business_hours['sun']): %>-<% else: %><% for from, till of calendar.business_hours['sun']: %><%= from %>-<%= till %> <% end %><% end %>
+
+
+
<%- @T('Public Holidays') %>
+ + <% for holiday, meta of calendar.public_holidays_preview: %> + class="is-inactive"<% end %>> + <% end %> +
<%- @Tdate(holiday) %><%= meta.summary %>
+
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss index 8a3b82daa..519ea3e51 100644 --- a/app/assets/stylesheets/zammad.css.scss +++ b/app/assets/stylesheets/zammad.css.scss @@ -581,14 +581,14 @@ table { .table > tbody > tr > td { padding: 9px; border: none; - box-shadow: 0 1px rgba(0,0,0,.02); + box-shadow: 0 1px rgba(0,0,0,.03); } .table-hover > tbody > tr:hover > td { background: white; box-shadow: - 0 1px rgba(0,0,0,.02), - 0 -1px rgba(0,0,0,.02); + 0 1px rgba(0,0,0,.03), + 0 -1px rgba(0,0,0,.03); } .table-hover > tbody > tr:hover > th { @@ -1861,7 +1861,8 @@ ol.tabs li { fill: $ok-color; &.inline { - margin: 2px 2px 0 0; + margin-top: -3px; + vertical-align: middle; } &.ok { @@ -6099,11 +6100,38 @@ output { .action-flow { display: flex; + flex-wrap: wrap; + } + + .action-separator { + width: 1px; + background: hsl(0,0%,97%); + margin: 0 10px; + } + + .table { + margin-left: -9px; + margin-right: -9px; } .action-block, - .action-controls { + .action-controls, + .action-row { padding: 10px; + + h2:first-child, + h3:first-child { + margin-top: 0; + } + + h2:only-child, + h3:only-child { + margin-bottom: 0; + } + } + + .action-row { + flex-basis: 100%; } h3 { @@ -6124,6 +6152,7 @@ output { .action-controls { display: flex; margin-left: auto; + align-self: flex-end; .btn { align-self: center;