diff --git a/app/assets/stylesheets/boot/google-webfonts.css.scss.erb b/app/assets/stylesheets/boot/google-webfonts.css.scss.erb index b5a5b6a6..5c01e8fb 100644 --- a/app/assets/stylesheets/boot/google-webfonts.css.scss.erb +++ b/app/assets/stylesheets/boot/google-webfonts.css.scss.erb @@ -1,5 +1,41 @@ <% # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later %> +/* Open Sans */ + +@font-face { + font-family: 'Open Sans'; + src: url('<%= asset_path('Open_Sans/opensans-regular-webfont.eot') %>'); + src: url('<%= asset_path('Open_Sans/opensans-regular-webfont.eot?#iefix') %>') format('embedded-opentype'), + url('<%= asset_path('Open_Sans/opensans-regular-webfont.woff') %>') format('woff'), + url('<%= asset_path('Open_Sans/opensans-regular-webfont.ttf') %>') format('truetype'), + url('<%= asset_path('Open_Sans/opensans-regular-webfont.svg#open_sansregular') %>') format('svg'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'Open Sans'; + src: url('<%= asset_path('Open_Sans/opensans-light-webfont.eot') %>'); + src: url('<%= asset_path('Open_Sans/opensans-light-webfont.eot?#iefix') %>') format('embedded-opentype'), + url('<%= asset_path('Open_Sans/opensans-light-webfont.woff') %>') format('woff'), + url('<%= asset_path('Open_Sans/opensans-light-webfont.ttf') %>') format('truetype'), + url('<%= asset_path('Open_Sans/opensans-light-webfont.svg#open_sanslight') %>') format('svg'); + font-weight: 200; + font-style: normal; +} + +@font-face { + font-family: 'Open Sans'; + src: url('<%= asset_path('Open_Sans/opensans-bold-webfont.eot') %>'); + src: url('<%= asset_path('Open_Sans/opensans-bold-webfont.eot?#iefix') %>') format('embedded-opentype'), + url('<%= asset_path('Open_Sans/opensans-bold-webfont.woff') %>') format('woff'), + url('<%= asset_path('Open_Sans/opensans-bold-webfont.ttf') %>') format('truetype'), + url('<%= asset_path('Open_Sans/opensans-bold-webfont.svg#open_sansbold') %>') format('svg'); + font-weight: bold; + font-style: normal; +} + + /* Bitter */ $condensed: '<%= asset_path('Open_Sans_Condensed') %>'; @@ -38,37 +74,4 @@ $condensed: '<%= asset_path('Open_Sans_Condensed') %>'; font-style: normal; } -/* Open Sans */ -@font-face { - font-family: 'Open Sans'; - src: url('<%= asset_path('Open_Sans/opensans-regular-webfont.eot') %>'); - src: url('<%= asset_path('Open_Sans/opensans-regular-webfont.eot?#iefix') %>') format('embedded-opentype'), - url('<%= asset_path('Open_Sans/opensans-regular-webfont.woff') %>') format('woff'), - url('<%= asset_path('Open_Sans/opensans-regular-webfont.ttf') %>') format('truetype'), - url('<%= asset_path('Open_Sans/opensans-regular-webfont.svg#open_sansregular') %>') format('svg'); - font-weight: normal; - font-style: normal; -} - -@font-face { - font-family: 'Open Sans'; - src: url('<%= asset_path('Open_Sans/opensans-light-webfont.eot') %>'); - src: url('<%= asset_path('Open_Sans/opensans-light-webfont.eot?#iefix') %>') format('embedded-opentype'), - url('<%= asset_path('Open_Sans/opensans-light-webfont.woff') %>') format('woff'), - url('<%= asset_path('Open_Sans/opensans-light-webfont.ttf') %>') format('truetype'), - url('<%= asset_path('Open_Sans/opensans-light-webfont.svg#open_sanslight') %>') format('svg'); - font-weight: 200; - font-style: normal; -} - -@font-face { - font-family: 'Open Sans'; - src: url('<%= asset_path('Open_Sans/opensans-bold-webfont.eot') %>'); - src: url('<%= asset_path('Open_Sans/opensans-bold-webfont.eot?#iefix') %>') format('embedded-opentype'), - url('<%= asset_path('Open_Sans/opensans-bold-webfont.woff') %>') format('woff'), - url('<%= asset_path('Open_Sans/opensans-bold-webfont.ttf') %>') format('truetype'), - url('<%= asset_path('Open_Sans/opensans-bold-webfont.svg#open_sansbold') %>') format('svg'); - font-weight: bold; - font-style: normal; -} diff --git a/app/assets/stylesheets/common/minimal.css.scss b/app/assets/stylesheets/common/minimal.css.scss index 0e6c551b..70c912bb 100644 --- a/app/assets/stylesheets/common/minimal.css.scss +++ b/app/assets/stylesheets/common/minimal.css.scss @@ -1,3 +1,4 @@ +/* License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later */ .minimalHeader { background-color: whitesmoke; height: 90px; @@ -21,12 +22,16 @@ display: flex; height: 100%; - * { + > * { opacity: 0.5; - margin: auto 0; - margin-right:10px; + margin: auto 10px auto 0; } } + + a { + color:$charcoal + } + } .site-content { diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb new file mode 100644 index 00000000..0d4a28c2 --- /dev/null +++ b/app/controllers/static_controller.rb @@ -0,0 +1,25 @@ +# License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later +class StaticController < ApplicationController + layout 'layouts/static' + + def terms_and_privacy + @theme = 'minimal' + end + + def ccs + ccs_method = !Settings.ccs ? 'local_tar_gz' : Settings.ccs.ccs_method + if (ccs_method == 'local_tar_gz') + temp_file = "#{$RAILS_ROOT}/tmp/#{Time.current.to_i}.tar.gz" + result = Kernel.system("git archive --format=tar.gz -o #{temp_file} HEAD") + if result + send_file(temp_file, :type => "application/gzip") + else + render :nothing => true, :status => 500 + end + elsif (ccs_method == 'github') + git_hash = File.read("#{$RAILS_ROOT}/CCS_HASH") + redirect_to "https://github.com/#{Settings.ccs.options.account}/#{Settings.ccs.options.repo}/tree/#{git_hash}" + end + + end +end diff --git a/app/views/components/_footer_sub.html.erb b/app/views/components/_footer_sub.html.erb index 382709a4..cce410c3 100644 --- a/app/views/components/_footer_sub.html.erb +++ b/app/views/components/_footer_sub.html.erb @@ -8,7 +8,7 @@ - diff --git a/app/views/layouts/_apified_footer.html.erb b/app/views/layouts/_apified_footer.html.erb index e2fd9bcd..52c507b5 100644 --- a/app/views/layouts/_apified_footer.html.erb +++ b/app/views/layouts/_apified_footer.html.erb @@ -3,9 +3,9 @@ <% if @theme == 'minimal' %> +
diff --git a/app/views/layouts/apified.html.erb b/app/views/layouts/apified.html.erb index c9a82e57..3a16b398 100644 --- a/app/views/layouts/apified.html.erb +++ b/app/views/layouts/apified.html.erb @@ -14,18 +14,18 @@ <%= render 'layouts/stylesheets' %> - <%= IncludeAsset.css 'client/css/global/page.css' %> - <%= IncludeAsset.css 'client/css/bootstrap.css' %> + <%= 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' %> +<%= IncludeAsset.js '/app/loading_indicator.js' %> +<%= IncludeAsset.js '/app/react.js' %> +<%= IncludeAsset.js '/app/react-dom.js' %> +<%= IncludeAsset.js '/app/vendor.js' %> <%= yield :javascripts %>The Houdini Project is released under a set of free and open source software licenses. The full details of + what code is released under which license can be reviewed in source code in the Houdini Project repository and + in its LICENSE file.
+ +Please look above for any additional permissions or restrictions for this instance of the Houdini Project.
+ + + +