From 4e39e225126a1ad4f50988d6179e0049232d6515 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 4 Nov 2015 16:22:39 +0100 Subject: [PATCH 1/3] increate table text contrast, add dropdown menu badge spacing --- app/assets/stylesheets/zammad.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 3d29eee00..fddc3925e 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -696,6 +696,7 @@ table { .table { display: table; + color: hsl(198,19%,72%); } .table-fluid { @@ -5313,6 +5314,10 @@ footer { display: block; } + .dropdown-menu .badge { + padding-left: 10px; + } + .dropdown.dropdown--actions { li { line-height: initial; From cf00f552c46f29af361d81cc3db263b50bcd1fbb Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 4 Nov 2015 16:39:03 +0100 Subject: [PATCH 2/3] refactor wide-tabs --- .../javascripts/app/views/dashboard.jst.eco | 2 +- .../app/views/generic/table.jst.eco | 2 +- .../app/views/layout_ref/content.jst.eco | 2 +- .../app/views/layout_ref/local_modal.jst.eco | 2 +- .../app/views/layout_ref/user_profile.jst.eco | 2 +- .../app/views/widget/ticket_stats.jst.eco | 2 +- app/assets/stylesheets/zammad.scss | 36 ++++++++++--------- 7 files changed, 25 insertions(+), 23 deletions(-) diff --git a/app/assets/javascripts/app/views/dashboard.jst.eco b/app/assets/javascripts/app/views/dashboard.jst.eco index ca8eb477b..d31604bed 100644 --- a/app/assets/javascripts/app/views/dashboard.jst.eco +++ b/app/assets/javascripts/app/views/dashboard.jst.eco @@ -1,5 +1,5 @@
-
+
<%- @T('My Stats') %>
<%- @T('First Steps') %>
diff --git a/app/assets/javascripts/app/views/generic/table.jst.eco b/app/assets/javascripts/app/views/generic/table.jst.eco index 4427f6822..bcbdb3362 100644 --- a/app/assets/javascripts/app/views/generic/table.jst.eco +++ b/app/assets/javascripts/app/views/generic/table.jst.eco @@ -1,4 +1,4 @@ - +
"> <% if @checkbox: %> diff --git a/app/assets/javascripts/app/views/layout_ref/content.jst.eco b/app/assets/javascripts/app/views/layout_ref/content.jst.eco index f2aa5fd75..814567d94 100644 --- a/app/assets/javascripts/app/views/layout_ref/content.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/content.jst.eco @@ -6,7 +6,7 @@

Tabs

-
+
My Stats
My Group
All
diff --git a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco index 1f1a350d2..d1e953d24 100644 --- a/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/local_modal.jst.eco @@ -355,7 +355,7 @@
-
+
Tickets von Doreen Kubiak
Tickets von Steuerbüro C. Kaik
diff --git a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco index 9a9111861..d2736f8f5 100644 --- a/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/user_profile.jst.eco @@ -57,7 +57,7 @@
-
+
Tickets von Doreen Kubiak
Tickets von Steuerbüro C. Kaik
diff --git a/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco b/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco index 21431341f..824583645 100644 --- a/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco +++ b/app/assets/javascripts/app/views/widget/ticket_stats.jst.eco @@ -1,5 +1,5 @@ <% if @user && @user.organization: %> -
+
<%- @T('Tickets of User') %> <%- "(" + @user_total + ")" %>
<%- @T('Tickets of Organization') %> <%- "(" + @org_total + ")" %>
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index fddc3925e..c8c284a30 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -2064,16 +2064,24 @@ ol.tabs li { font-size: 0.95em; } - .wide-tabs { - margin: 25px 0 20px; + .tabs.tabs--inline { + display: inline-flex; + margin-left: 0; + margin-right: 0; + + .tab { + flex: none; + } + } + + .tabs--big { + margin: 25px auto 20px; font-size: 14px; border-radius: 8px; - display: inline-flex; .tab { height: auto; padding: 10px 24px; - flex-grow: 0; } .tab-dropdown { @@ -2082,25 +2090,18 @@ ol.tabs li { } } - .dashboard .wide-tabs { - width: 50%; - margin-left: auto; - margin-right: auto; - display: flex; - - .tab { - flex: 1; - } - } - - .wide-tabs .tab:first-child { + .tabs--big .tab:first-child { border-radius: 8px 0 0 8px; } - .wide-tabs .tab:last-child { + .tabs--big .tab:last-child { border-radius: 0 8px 8px 0; } + .dashboard .tabs--big { + width: 50%; + } + .separator { margin: 20px 0; position: relative; @@ -4934,6 +4935,7 @@ footer { } .type-tabs .tab { + height: 40px; line-height: 42px; padding: 0 12px 0 12px; list-style: none; From 7716061fe76f2767a9a1e80dc54d4142240be041 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Wed, 4 Nov 2015 16:39:12 +0100 Subject: [PATCH 3/3] increase text color contrast --- .../javascripts/app/controllers/ticket_overview.coffee | 1 + app/assets/javascripts/app/controllers/users.coffee | 1 + .../app/views/agent_ticket_view/navbar_vertical.jst.eco | 4 ++-- app/assets/stylesheets/zammad.scss | 6 ++++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_overview.coffee b/app/assets/javascripts/app/controllers/ticket_overview.coffee index 2759e13ac..4486f05b0 100644 --- a/app/assets/javascripts/app/controllers/ticket_overview.coffee +++ b/app/assets/javascripts/app/controllers/ticket_overview.coffee @@ -302,6 +302,7 @@ class Table extends App.Controller groupBy: @overview.group_by orderBy: @overview.order.by orderDirection: @overview.order.direction + class: 'table--light' bindRow: events: 'click': openTicket diff --git a/app/assets/javascripts/app/controllers/users.coffee b/app/assets/javascripts/app/controllers/users.coffee index bf435e9c5..675d5a69f 100644 --- a/app/assets/javascripts/app/controllers/users.coffee +++ b/app/assets/javascripts/app/controllers/users.coffee @@ -57,6 +57,7 @@ class Index extends App.Controller display: 'Action' className: 'actionCell' translation: true + width: '222px' header.push attribute header diff --git a/app/assets/javascripts/app/views/agent_ticket_view/navbar_vertical.jst.eco b/app/assets/javascripts/app/views/agent_ticket_view/navbar_vertical.jst.eco index 86ddfe3d0..a8087ef78 100644 --- a/app/assets/javascripts/app/views/agent_ticket_view/navbar_vertical.jst.eco +++ b/app/assets/javascripts/app/views/agent_ticket_view/navbar_vertical.jst.eco @@ -1,4 +1,4 @@ -
+
<% if @items: %> <% for item in @items: %> @@ -20,7 +20,7 @@ <% end %>
<% if @items: %> -
+
<% for item in @items: %> <%- @T(item.name) %> diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index c8c284a30..ac6be1bba 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -27,7 +27,7 @@ body { font-weight: normal; background: hsl(210,14%,97%); height: 100%; - color: hsl(198,19%,72%); + color: hsl(60,1%,34%); word-wrap: break-word; overflow-wrap: break-word; display: flex; @@ -41,7 +41,6 @@ use { p { margin: 14px 0; - color: hsl(60,1%,34%); &.subtle { color: hsl(60,1%,74%); @@ -696,6 +695,9 @@ table { .table { display: table; +} + +.table--light { color: hsl(198,19%,72%); }