From 9f6d93760e8357886e678b76f2febf976d2423fa Mon Sep 17 00:00:00 2001 From: Joe Fiorini Date: Wed, 10 Jun 2015 14:19:36 -0400 Subject: [PATCH] [system_tracking] Fix flexbox table styling in IE11 --- .../js/system-tracking/date-picker/date-picker.block.less | 4 ++-- awx/ui/static/js/system-tracking/fact-data-table.block.less | 2 +- .../static/js/system-tracking/fact-module-pickers.block.less | 4 ++-- .../js/system-tracking/system-tracking-container.block.less | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/awx/ui/static/js/system-tracking/date-picker/date-picker.block.less b/awx/ui/static/js/system-tracking/date-picker/date-picker.block.less index 01aa490d73..e972128e06 100644 --- a/awx/ui/static/js/system-tracking/date-picker/date-picker.block.less +++ b/awx/ui/static/js/system-tracking/date-picker/date-picker.block.less @@ -1,7 +1,7 @@ /** @define DatePicker */ .DatePicker { - flex: 1; + flex: 1 0 auto; display: flex; &-icon { @@ -24,7 +24,7 @@ } &-input { - flex: 1; + flex: 1 0 auto; border-radius: 0 4px 4px 0; border: 1px solid #ccc; padding: 6px 12px; diff --git a/awx/ui/static/js/system-tracking/fact-data-table.block.less b/awx/ui/static/js/system-tracking/fact-data-table.block.less index 96b694f269..a13aef9798 100644 --- a/awx/ui/static/js/system-tracking/fact-data-table.block.less +++ b/awx/ui/static/js/system-tracking/fact-data-table.block.less @@ -24,7 +24,7 @@ &-column { padding: 8px; - flex: 1; + flex: 1 0 33%; white-space: nowrap; &--offsetLeft { margin-left: 33%; diff --git a/awx/ui/static/js/system-tracking/fact-module-pickers.block.less b/awx/ui/static/js/system-tracking/fact-module-pickers.block.less index f40d580164..8d883f3047 100644 --- a/awx/ui/static/js/system-tracking/fact-module-pickers.block.less +++ b/awx/ui/static/js/system-tracking/fact-module-pickers.block.less @@ -6,7 +6,7 @@ margin-bottom: 15px; &-dateContainer { - flex: 1; + flex: 1 0 auto; display: flex; flex-direction: column } @@ -20,7 +20,7 @@ } &-label { - flex: 1; + flex: 1 0 auto; font-weight: 700; padding-bottom: 5px; } diff --git a/awx/ui/static/js/system-tracking/system-tracking-container.block.less b/awx/ui/static/js/system-tracking/system-tracking-container.block.less index 6a50afbff5..40ecb7ab2f 100644 --- a/awx/ui/static/js/system-tracking/system-tracking-container.block.less +++ b/awx/ui/static/js/system-tracking/system-tracking-container.block.less @@ -4,11 +4,11 @@ min-height: 85vh; > * { - flex: 0; + flex: 0 0 auto; } &-main { - flex: 1; + flex: 1 0 auto; align-self: stretch; } }