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

Make sure flex is only set on the minimal pages

Browse source
This commit is contained in:
Eric Schultz 2018-07-24 14:17:49 -05:00 committed by Eric Schultz
parent d18d4de307
commit 1561198873
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,7 +38,7 @@
flex: 1; flex: 1;
} }
body { body.minimal {
display: flex; display: flex;
min-height: 100vh; min-height: 100vh;
flex-direction: column; flex-direction: column;

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

@ -23,7 +23,7 @@
body {padding-left: 0} body {padding-left: 0}
</style> </style>
</head> </head>
<body> <body class="<%= @theme == 'minimal' ? 'minimal' : nil %>">
<%= render 'layouts/apified_header' %> <%= render 'layouts/apified_header' %>
<%= IncludeAsset.js '/app/loading_indicator.js' %> <%= IncludeAsset.js '/app/loading_indicator.js' %>
<%= IncludeAsset.js '/app/react.js' %> <%= IncludeAsset.js '/app/react.js' %>

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

@ -3,6 +3,7 @@
<html lang="<%= I18n.locale %>"> <html lang="<%= I18n.locale %>">
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1">
<title><%= "#{yield(:title)} - #{Settings.general.name}" %></title> <title><%= "#{yield(:title)} - #{Settings.general.name}" %></title>
<%= render 'layouts/stylesheets' %> <%= render 'layouts/stylesheets' %>
<%= IncludeAsset.css '/client/css/global/page.css' %> <%= IncludeAsset.css '/client/css/global/page.css' %>
@ -12,7 +13,7 @@
</style> </style>
<%= favicon_link_tag %> <%= favicon_link_tag %>
</head> </head>
<body> <body class="<%= @theme == 'minimal' ? 'minimal' : nil %>">
<%= render 'layouts/apified_header' %> <%= render 'layouts/apified_header' %>
<div class="site-content"> <div class="site-content">
<%= yield %> <%= yield %>