Merge branch 'develop' of github.com:martini/zammad into develop

app/assets/javascripts/app/views/translation/index.jst.eco

@@ -13,8 +13,8 @@
   <div class="box box--message">
     <h2><%- @T('Inline translation') %></h2>
     <p><%- @T('To do easier translations you can enable and disable inline translation feature by pressing "%s".', 'ctrl+alt+t') %></p>
-    <p><%- @T('Text with disabled inline translations looks like') %> <button class="btn btn-primary"><%- @Ti('Some Text') %></button></p>
-    <p><%- @T('Text with enabled inline translations looks like') %> <button class="btn btn-primary"><span class="translation" contenteditable="true"><%- @Ti('Some Text') %></button></span></p>
+    <p><%- @T('Text with disabled inline translations looks like') %> <button class="btn btn-primary"><%- @Ti('Some Text') %></button></p>
+    <p><%- @T('Text with enabled inline translations looks like') %> <button class="btn btn-primary"><span class="translation" contenteditable="true"><%- @Ti('Some Text') %></button></span></p>
     <p><%- @T('Just click into the marker and update the words just in place. Enjoy!') %></p>
     <p><%- @T('If you want to translate it via the translation table, just go ahead below.') %></p>
   </div>

app/assets/stylesheets/zammad.scss

@@ -608,7 +608,7 @@ pre code.hljs {
   margin-left: 15px;
 }
 
-.vertical > .btn + .btn {
+.vertical > .btn:not(.hidden) + .btn {
   margin-left: 0;
   margin-top: 10px;
 }
@@ -5389,6 +5389,10 @@ footer {
     margin-top: 12px;
   }
 
+  .box ul {
+    padding-left: 10px;
+  }
+
   .box .two-columns {
     margin-left: -4px;
     margin-right: -4px;
@@ -5438,6 +5442,15 @@ footer {
     }
   }
 
+.horizontal > .box {
+  margin-top: 4px;
+  margin-bottom: 4px;
+
+  & + .box {
+    border-left-width: 0;
+  }
+}
+
 .formset-inset {
   margin: 34px -24px 24px;
   padding: 19px 24px 24px;
@@ -8439,6 +8452,10 @@ body.fit {
   align-self: end;
 }
 
+.span-width {
+  flex-basis: 100%;
+}
+
 .two-columns,
 .three-columns,
 .wrap {
@@ -8473,3 +8490,17 @@ body.fit {
   margin-left: auto;
   margin-right: auto;
 }
+
+.spacer {
+  width: 10px; 
+  height: 10px; 
+}
+
+.double-spacer {
+  width: 20px;
+  height: 20px;
+}
+
+.flex-spacer {
+  flex: 1;
+}

config/environments/development.rb

@@ -35,6 +35,7 @@ Rails.application.configure do
   config.middleware.insert_after(
     ActionDispatch::Static,
     Rack::LiveReload,
+    no_swf: true,
     min_delay: 500,    # default 1000
     max_delay: 10_000, # default 60_000
     live_reload_port: 35_738