From af5a73f92a852f757f69cd5d82247f4ebaaf5aba Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Thu, 16 Mar 2017 15:03:10 +0100
Subject: [PATCH] UI fixes

- calendar settings: clean checkbox label
- correct button layout in table
---
 .../views/profile/calendar_subscriptions.jst.eco | 16 +++++++---------
 app/assets/stylesheets/zammad.scss               |  3 ++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco b/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
index 125a7189c..91ec496ba 100644
--- a/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
+++ b/app/assets/javascripts/app/views/profile/calendar_subscriptions.jst.eco
@@ -8,7 +8,7 @@
 
   <p><%- @T('See your tickets from within your favorite calendar by adding the following URL to your calendar app.') %></p>
 
-  <h3><label for="calendar-subscription-url"><%- @T('URL') %></label></h3>
+  <label for="calendar-subscription-url"><%- @T('URL') %></label>
   <form class="form--flexibleWidth">
     <div class="form-group">
       <div class="controls">
@@ -23,14 +23,12 @@
       <label for="notification-sound"><%- @T('Alarm') %></label>
     </div>
     <div class="controls">
-      <p>
-        <label class="checkbox-replacement inline-label">
-          <input type="checkbox" name="alarm" value="true" <% if @preferences.alarm: %>checked<% end %>/>
-          <%- @Icon('checkbox', 'icon-unchecked') %>
-          <%- @Icon('checkbox-checked', 'icon-checked') %>
-        </label>
-        <%- @T('Add alarm to pending reminder and escalated tickets.') %>
-      </p>
+      <label class="checkbox-replacement inline-label">
+        <input type="checkbox" name="alarm" value="true" <% if @preferences.alarm: %>checked<% end %>/>
+        <%- @Icon('checkbox', 'icon-unchecked') %>
+        <%- @Icon('checkbox-checked', 'icon-checked') %>
+        <span class="label-text"><%- @T('Add alarm to pending reminder and escalated tickets.') %></span>
+      </label>
     </div>
   </div>
   <table class="settings-list">
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index f04976fb1..357691da4 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -7294,7 +7294,8 @@ output {
   }
 
   .btn--table {
-    margin: 0;
+    padding-top: 0;
+    padding-bottom: 0;
   }
 
   th:not(:last-child),