NPO-Accounting/houdini
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix flexbox on IE11

Browse source
This commit is contained in:
Eric Schultz 2018-07-26 21:39:40 -05:00
parent 1561198873
commit 11b7210048
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/stylesheets/common/minimal.css.scss
View file

@ -4,7 +4,7 @@
height: 90px; height: 90px;
.container { .container {
display: flex; padding-top: 20px;
height: 100%; height: 100%;
img { img {
@ -19,7 +19,7 @@
background-color: whitesmoke; background-color: whitesmoke;
height:70px; height:70px;
.container { .container {
display: flex; padding-top: 24px;
height: 100%; height: 100%;
> * { > * {
@ -35,7 +35,7 @@
} }
.site-content { .site-content {
flex: 1; flex: 1 0 auto;
} }
body.minimal { body.minimal {

3
app/views/layouts/apified.html.erb
View file

@ -5,7 +5,7 @@
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title><%= "#{yield(:title)} - #{Settings.general.name}" %></title> <title><%= "#{yield(:title)} - #{Settings.general.name}" %></title>
<script src="https://cdn.polyfill.io/v2/polyfill.js?features=default,Intl.~locale.en"></script>
<%= IncludeAsset.js '/client/js/i18n.js' %> <%= IncludeAsset.js '/client/js/i18n.js' %>
<script> <script>
I18n.defaultLocale = "<%= I18n.default_locale %>" I18n.defaultLocale = "<%= I18n.default_locale %>"
@ -25,6 +25,7 @@
</head> </head>
<body class="<%= @theme == 'minimal' ? 'minimal' : nil %>"> <body class="<%= @theme == 'minimal' ? 'minimal' : nil %>">
<%= render 'layouts/apified_header' %> <%= render 'layouts/apified_header' %>
<%= IncludeAsset.js '/app/polyfill.js' %>
<%= IncludeAsset.js '/app/loading_indicator.js' %> <%= IncludeAsset.js '/app/loading_indicator.js' %>
<%= IncludeAsset.js '/app/react.js' %> <%= IncludeAsset.js '/app/react.js' %>
<%= IncludeAsset.js '/app/react-dom.js' %> <%= IncludeAsset.js '/app/react-dom.js' %>

2
app/views/layouts/static.html.erb
View file

@ -5,6 +5,7 @@
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title><%= "#{yield(:title)} - #{Settings.general.name}" %></title> <title><%= "#{yield(:title)} - #{Settings.general.name}" %></title>
<script src="https://cdn.polyfill.io/v2/polyfill.js?features=default,Intl.~locale.en"></script>
<%= render 'layouts/stylesheets' %> <%= render 'layouts/stylesheets' %>
<%= IncludeAsset.css '/client/css/global/page.css' %> <%= IncludeAsset.css '/client/css/global/page.css' %>
<%= IncludeAsset.css '/client/css/bootstrap.css' %> <%= IncludeAsset.css '/client/css/bootstrap.css' %>
@ -14,6 +15,7 @@
<%= favicon_link_tag %> <%= favicon_link_tag %>
</head> </head>
<body class="<%= @theme == 'minimal' ? 'minimal' : nil %>"> <body class="<%= @theme == 'minimal' ? 'minimal' : nil %>">
<%= IncludeAsset.js '/app/polyfill.js' %>
<%= render 'layouts/apified_header' %> <%= render 'layouts/apified_header' %>
<div class="site-content"> <div class="site-content">
<%= yield %> <%= yield %>

3
javascripts/app/loading_indicator.ts
View file

@ -40,7 +40,10 @@ const pp: PageProgressBar = new PageProgressBar();
(window as any).pageProgress = pp (window as any).pageProgress = pp
let ua = window.navigator.userAgent
if (ua.indexOf('MSIE ') <= 0 && ua.indexOf('Trident/') <= 0) {
pp.beginPageLoad() pp.beginPageLoad()
}