From 11b72100489a9415c98a58229c1fe992d53e7ffc Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Thu, 26 Jul 2018 21:39:40 -0500 Subject: [PATCH] Fix flexbox on IE11 --- app/assets/stylesheets/common/minimal.css.scss | 6 +++--- app/views/layouts/apified.html.erb | 3 ++- app/views/layouts/static.html.erb | 2 ++ javascripts/app/loading_indicator.ts | 5 ++++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/common/minimal.css.scss b/app/assets/stylesheets/common/minimal.css.scss index 8c82351b..a63f1f6b 100644 --- a/app/assets/stylesheets/common/minimal.css.scss +++ b/app/assets/stylesheets/common/minimal.css.scss @@ -4,7 +4,7 @@ height: 90px; .container { - display: flex; + padding-top: 20px; height: 100%; img { @@ -19,7 +19,7 @@ background-color: whitesmoke; height:70px; .container { - display: flex; + padding-top: 24px; height: 100%; > * { @@ -35,7 +35,7 @@ } .site-content { - flex: 1; + flex: 1 0 auto; } body.minimal { diff --git a/app/views/layouts/apified.html.erb b/app/views/layouts/apified.html.erb index 85df6a66..569f8195 100644 --- a/app/views/layouts/apified.html.erb +++ b/app/views/layouts/apified.html.erb @@ -5,7 +5,7 @@ <%= "#{yield(:title)} - #{Settings.general.name}" %> - + <%= IncludeAsset.js '/client/js/i18n.js' %> <%= render 'layouts/stylesheets' %> <%= IncludeAsset.css '/client/css/global/page.css' %> <%= IncludeAsset.css '/client/css/bootstrap.css' %> @@ -14,6 +15,7 @@ <%= favicon_link_tag %> +<%= IncludeAsset.js '/app/polyfill.js' %> <%= render 'layouts/apified_header' %>
<%= yield %> diff --git a/javascripts/app/loading_indicator.ts b/javascripts/app/loading_indicator.ts index d3e95174..2df90273 100644 --- a/javascripts/app/loading_indicator.ts +++ b/javascripts/app/loading_indicator.ts @@ -40,7 +40,10 @@ const pp: PageProgressBar = new PageProgressBar(); (window as any).pageProgress = pp -pp.beginPageLoad() +let ua = window.navigator.userAgent +if (ua.indexOf('MSIE ') <= 0 && ua.indexOf('Trident/') <= 0) { + pp.beginPageLoad() +}