From 901759ae166939c8d11362a08744b4be670ba4f4 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 9 Feb 2016 16:17:00 +0100 Subject: [PATCH 1/3] personal settings: same width notification columns --- .../javascripts/app/views/profile/notification.jst.eco | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/views/profile/notification.jst.eco b/app/assets/javascripts/app/views/profile/notification.jst.eco index d666030d2..fb8e6524f 100644 --- a/app/assets/javascripts/app/views/profile/notification.jst.eco +++ b/app/assets/javascripts/app/views/profile/notification.jst.eco @@ -9,10 +9,10 @@ - <%- @T('My Tickets') %> - <%- @T('Not Assigned') %> * - <%- @T('All Tickets') %> * - <%- @T('Notify also via Email') %> + <%- @T('My Tickets') %> + <%- @T('Not Assigned') %> * + <%- @T('All Tickets') %> * + <%- @T('Notify also via Email') %> <% if @config.matrix: %> From bc8315e3fe7d1aab31ecaa59f308b4d0a77a57e2 Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 9 Feb 2016 16:22:08 +0100 Subject: [PATCH 2/3] fix dropdown-header style --- app/assets/stylesheets/zammad.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 800e27164..5770e95cf 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -5564,6 +5564,10 @@ footer { .dropdown-menu.dropdown-menu--light > li { color: hsl(202,70%,49%); + + &.dropdown-header { + color: hsl(198,19%,72%); + } } .dropdown-menu.dropdown-menu--light > li > a:hover { @@ -5680,8 +5684,8 @@ footer { } li.dropdown-header { - line-height: 36px; - height: 32px; + line-height: 34px; + height: 30px; } .recipientList, From a224110448041565b47407a584ff28a2d951815c Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Tue, 9 Feb 2016 16:28:39 +0100 Subject: [PATCH 3/3] fix btn--secondary --- app/assets/stylesheets/zammad.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 5770e95cf..b10a3e635 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -431,6 +431,10 @@ pre code.hljs { } } + &.btn--secondary { + color: hsl(202,68%,54%); + } + &.btn--positive, &.btn--create, &.btn--success {