From a5e39d47990e2cde9a0a3a8eb612fd9e06aad19b Mon Sep 17 00:00:00 2001 From: Felix Niklas Date: Thu, 8 Oct 2015 14:10:54 +0200 Subject: [PATCH] refactor datetime, fix ff flex bug --- .../app/views/generic/datetime.jst.eco | 4 +-- app/assets/stylesheets/zammad.scss | 25 +++++++++++++------ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/app/views/generic/datetime.jst.eco b/app/assets/javascripts/app/views/generic/datetime.jst.eco index 2f62c75a7..c4678611d 100644 --- a/app/assets/javascripts/app/views/generic/datetime.jst.eco +++ b/app/assets/javascripts/app/views/generic/datetime.jst.eco @@ -1,6 +1,6 @@ -
+
- +
<%- @T('at') %>
\ No newline at end of file diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss index 83c61b8ee..49e30e783 100644 --- a/app/assets/stylesheets/zammad.scss +++ b/app/assets/stylesheets/zammad.scss @@ -1193,13 +1193,9 @@ fieldset > .form-group { margin-bottom: 0; } -.controls--bundle { - display: flex; - - .controls-label { - margin: 11px 10px 0; - flex-shrink: 0; - } +.controls-label { + margin: 11px 10px 0; + flex-shrink: 0; } input[type="radio"], @@ -6977,6 +6973,21 @@ body.fit { flex: 1; } +/* + + Firefox minimum content bugfix + + https://github.com/philipwalton/flexbugs#1-minimum-content-sizing-of-flex-items-not-honored + + "By default, flex items won’t shrink below their minimum + content size (the length of the longest word or fixed-size element). + To change this, set the min-width or min-height property." + +*/ +.flex-shrink-horizontal { + min-width: 0; +} + .flex-full { flex: 1 1 100%; }