From 32ad4ed42dc1f33f978d7760fa16efb3507d7eba Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Thu, 24 May 2018 16:34:04 -0500 Subject: [PATCH] Minimal theme, add for onboard --- .../stylesheets/common/minimal.css.scss | 40 +++++++++++++++++++ app/assets/stylesheets/global.css.scss | 1 + app/controllers/onboard_controller.rb | 2 +- app/views/layouts/_apified_footer.html.erb | 13 ++++++ app/views/layouts/_apified_header.html.erb | 11 +++++ app/views/layouts/apified.html.erb | 8 +++- 6 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 app/assets/stylesheets/common/minimal.css.scss create mode 100644 app/views/layouts/_apified_footer.html.erb create mode 100644 app/views/layouts/_apified_header.html.erb diff --git a/app/assets/stylesheets/common/minimal.css.scss b/app/assets/stylesheets/common/minimal.css.scss new file mode 100644 index 00000000..0e6c551b --- /dev/null +++ b/app/assets/stylesheets/common/minimal.css.scss @@ -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; +} diff --git a/app/assets/stylesheets/global.css.scss b/app/assets/stylesheets/global.css.scss index 85d853f9..745425dc 100644 --- a/app/assets/stylesheets/global.css.scss +++ b/app/assets/stylesheets/global.css.scss @@ -42,3 +42,4 @@ @import 'common/media_queries'; @import 'common/z_indices'; @import 'common/ios_hack'; +@import 'common/minimal'; diff --git a/app/controllers/onboard_controller.rb b/app/controllers/onboard_controller.rb index e05ddd8d..7e11316c 100644 --- a/app/controllers/onboard_controller.rb +++ b/app/controllers/onboard_controller.rb @@ -1,6 +1,6 @@ class OnboardController < ApplicationController layout 'layouts/apified' def index - + @theme = 'minimal' end end diff --git a/app/views/layouts/_apified_footer.html.erb b/app/views/layouts/_apified_footer.html.erb new file mode 100644 index 00000000..3d36e816 --- /dev/null +++ b/app/views/layouts/_apified_footer.html.erb @@ -0,0 +1,13 @@ +<%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%> + +<% if @theme == 'minimal' %> +
+
+ © 2018 <%= Settings.general.name %> + About + Terms & Privacy +
+ +
+ +<% end %> diff --git a/app/views/layouts/_apified_header.html.erb b/app/views/layouts/_apified_header.html.erb new file mode 100644 index 00000000..c3d9b76b --- /dev/null +++ b/app/views/layouts/_apified_header.html.erb @@ -0,0 +1,11 @@ +<%- # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -%> + +<% if @theme == 'minimal' %> +
+
+ +
+ +
+ +<% end %> diff --git a/app/views/layouts/apified.html.erb b/app/views/layouts/apified.html.erb index 43dfd4d8..c9a82e57 100644 --- a/app/views/layouts/apified.html.erb +++ b/app/views/layouts/apified.html.erb @@ -16,15 +16,21 @@ <%= render 'layouts/stylesheets' %> <%= IncludeAsset.css 'client/css/global/page.css' %> <%= IncludeAsset.css 'client/css/bootstrap.css' %> + +<%= 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 %> +
<%= yield %> - +
+<%= render 'layouts/apified_footer' %> \ No newline at end of file