From d8279930849c8814222c73c0d92048f5b23818b2 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Mon, 4 May 2015 19:02:24 +0200
Subject: [PATCH] fix notifications language problem

---
 app/assets/stylesheets/zammad.css.scss | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index b5f827132..ea8fc2c67 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -2908,10 +2908,12 @@ footer {
 
   .popover--notifications {
     min-height: 100px;
+    width: auto;
+    min-width: 372px;
     @extend .zIndex-5;
 
-    &.is-visible {
-      @extend .vertical;
+    &.fade {
+      display: inline-block !important;
     }
 
     .arrow {
@@ -2952,10 +2954,15 @@ footer {
     @extend .btn;
     @extend .btn--subtle;
     @extend .align-right;
+<<<<<<< HEAD
     padding: 5px 0 0;
 
+=======
+    padding: 5px 0 0 10px;
+    
+>>>>>>> fix notifications language problem
     &:hover {
-      padding: 5px 0 0;
+      padding: 5px 0 0 10px;
     }
   }