From b2437ead50e0cebb99581e47c85b4c5ce6e9ea11 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Tue, 22 Sep 2015 17:16:29 +0200
Subject: [PATCH] add .action-label

in the calendar case it needs a <div class="action-flow action-flow--noWrap"> as parent element
---
 .../javascripts/app/views/calendar/index.jst.eco  |  5 ++++-
 app/assets/stylesheets/zammad.css.scss            | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/app/views/calendar/index.jst.eco b/app/assets/javascripts/app/views/calendar/index.jst.eco
index 274722110..d1d8f6df8 100644
--- a/app/assets/javascripts/app/views/calendar/index.jst.eco
+++ b/app/assets/javascripts/app/views/calendar/index.jst.eco
@@ -19,7 +19,10 @@
 <div class="action" data-id="<%- calendar.id %>">
   <div class="action-flow action-flow--row">
     <div class="action-row">
-      <h2><span title="Last iCal Feed sync at: <%= calendar.last_sync %>: <%= calendar.last_log %>"><%- @Icon('status', 'ok inline') %></span> <%= calendar.name %></h2>
+      <div class="action-flow action-flow--noWrap">
+        <h2><span title="Last iCal Feed sync at: <%= calendar.last_sync %>: <%= calendar.last_log %>"><%- @Icon('status', 'ok inline') %></span> <%= calendar.name %></h2>
+        <div class="action-label">Default</div>
+      </div>
     </div>
     <div class="action-row">
       <div class="label"><%- @T('Timezone') %></div> <%= calendar.timezone %>
diff --git a/app/assets/stylesheets/zammad.css.scss b/app/assets/stylesheets/zammad.css.scss
index 6b53afc01..390353969 100644
--- a/app/assets/stylesheets/zammad.css.scss
+++ b/app/assets/stylesheets/zammad.css.scss
@@ -6158,6 +6158,10 @@ output {
     display: flex;
     flex-wrap: wrap;
     
+    &.action-flow--noWrap {
+      flex-wrap: nowrap;
+    }
+    
     &.action-flow--row {
       flex-basis: 100%;
     }
@@ -6204,6 +6208,17 @@ output {
     color: hsl(0,0%,60%);
     margin-top: 0;
   }
+
+  .action-label {
+    margin-left: auto;
+    background: hsl(197,20%,93%);
+    border: 1px solid hsl(197,20%,88%);
+    align-self: flex-start;
+    padding: 5px 10px;
+    margin-right: -25px;
+    margin-top: -4px;
+    color: hsl(197,16%,65%);
+  }
     
   .action-flow-icon {
     align-self: center;