From 3883dd0e68acb340b06a67e3a92838bb474700d3 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Wed, 6 Apr 2016 10:28:09 +0200
Subject: [PATCH 1/2] checkbox form-group: fix spacing

---
 app/assets/stylesheets/bootstrap.css | 12 ------------
 app/assets/stylesheets/zammad.scss   |  7 +------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/app/assets/stylesheets/bootstrap.css b/app/assets/stylesheets/bootstrap.css
index 32a7f91ef..b497e60ba 100644
--- a/app/assets/stylesheets/bootstrap.css
+++ b/app/assets/stylesheets/bootstrap.css
@@ -1738,18 +1738,6 @@ input[type="search"] {
   font-weight: normal;
   cursor: pointer;
 }
-.radio input[type="radio"],
-.radio-inline input[type="radio"],
-.checkbox input[type="checkbox"],
-.checkbox-inline input[type="checkbox"] {
-  position: absolute;
-  margin-top: 4px \9;
-  margin-left: -20px;
-}
-.radio + .radio,
-.checkbox + .checkbox {
-  margin-top: -5px;
-}
 .radio-inline,
 .checkbox-inline {
   display: inline-block;
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index 2baa5cb62..4c20f48a3 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -5939,7 +5939,7 @@ footer {
 }
 
 .checkbox.form-group .controls label {
-  padding: 3px 0 3px 20px;
+  padding: 2px 0;
   font: inherit;
   font-size: 13px;
   margin-bottom: 0;
@@ -5949,11 +5949,6 @@ footer {
   @extend .u-clickable;
 }
 
-.checkbox.form-group input[type=checkbox] {
-  margin-top: 7px;
-  vertical-align: bottom;
-}
-
 .userSearch-label {
   margin: 11px 10px 0 0;
 }

From fa012f55f8870e041ddde367dfcd2fff998ca61c Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Wed, 6 Apr 2016 10:28:29 +0200
Subject: [PATCH 2/2] fix ticket-zoom sidebar organisation userList

---
 app/assets/javascripts/app/views/widget/organization.jst.eco | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/app/views/widget/organization.jst.eco b/app/assets/javascripts/app/views/widget/organization.jst.eco
index a7de46b7a..15ef6c5e8 100644
--- a/app/assets/javascripts/app/views/widget/organization.jst.eco
+++ b/app/assets/javascripts/app/views/widget/organization.jst.eco
@@ -32,6 +32,7 @@
       <a href="<%- user.uiUrl() %>" class="userList-name user-popover" data-id="<%- user.id %>">
         <%= user.displayName() %>
       </a>
+    </div>
 <% end %>
   </div>
 </div>