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

Merge pull request #57 from houdiniproject/fix_for_56

Browse source 
Closes #56 - Minimal theme, add for onboard
This commit is contained in:
Eric Schultz 2018-05-29 12:10:43 -05:00 committed by GitHub
commit 8342065006
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 73 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
app/assets/stylesheets/common/minimal.css.scss Normal file
View file

@ -0,0 +1,40 @@
.minimalHeader {
background-color: whitesmoke;
height: 90px;
.container {
display: flex;
height: 100%;
img {
opacity: 0.5;
max-height: 50px;
margin: auto 0;
}
}
}
.minimalFooter {
background-color: whitesmoke;
height:70px;
.container {
display: flex;
height: 100%;
* {
opacity: 0.5;
margin: auto 0;
margin-right:10px;
}
}
}
.site-content {
flex: 1;
}
body {
display: flex;
min-height: 100vh;
flex-direction: column;
}

1
app/assets/stylesheets/global.css.scss
View file

@ -42,3 +42,4 @@
@import 'common/media_queries';
@import 'common/z_indices';
@import 'common/ios_hack';
@import 'common/minimal';

2
app/controllers/onboard_controller.rb
View file

@ -1,6 +1,6 @@
class OnboardController < ApplicationController
layout 'layouts/apified'
def index
@theme = 'minimal'
end
end

13
app/views/layouts/_apified_footer.html.erb Normal file
View file

@ -0,0 +1,13 @@
<%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%>
<% if @theme == 'minimal' %>
<div class="minimalFooter">
<div class="container">
<span>© 2018 <%= Settings.general.name %></span>
<span>About</span>
<span>Terms &amp; Privacy</span>
</div>
</div>
<% end %>

11
app/views/layouts/_apified_header.html.erb Normal file
View file

@ -0,0 +1,11 @@
<%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%>
<% if @theme == 'minimal' %>
<div class="minimalHeader">
<div class="container">
<img src="<%= image_path(Settings.general.logo_full) %>">
</div>
</div>
<% end %>

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

@ -16,15 +16,21 @@
<%= render 'layouts/stylesheets' %>
<%= IncludeAsset.css 'client/css/global/page.css' %>
<%= IncludeAsset.css 'client/css/bootstrap.css' %>
<style>
body {padding-left: 0}
</style>
</head>
<body>
<%= render 'layouts/apified_header' %>
<%= IncludeAsset.js 'app/loading_indicator.js' %>
<%= IncludeAsset.js 'app/react.js' %>
<%= IncludeAsset.js 'app/react-dom.js' %>
<%= IncludeAsset.js 'app/vendor.js' %>
<%= yield :javascripts %>
<div class="site-content">
<%= yield %>
</div>
<%= render 'layouts/apified_footer' %>
</body>
</html>