diff --git a/app/assets/images/background.jpg b/app/assets/images/background.jpg deleted file mode 100644 index 0e6c2d0d..00000000 Binary files a/app/assets/images/background.jpg and /dev/null differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index c449310b..83bffeac 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -55,7 +55,6 @@ ol.breadcrumb { .background-cover { - background: image-url("background.jpg") no-repeat center center fixed; -webkit-background-size: cover; -moz-background-size: cover; -o-background-size: cover; diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 384ce108..8c96f8c4 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,14 +1,26 @@ !!! %html %head - %meta{content: "text/html; charset=UTF-8", 'http-equiv': "Content-Type"}/ + %meta{ content: 'text/html; charset=UTF-8', + 'http-equiv': 'Content-Type' }/ %title Sutty + = csrf_meta_tags - = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' - = javascript_include_tag 'application', 'data-turbolinks-track': 'reload' + = stylesheet_link_tag 'application', media: 'all', + 'data-turbolinks-track': 'reload' + = javascript_include_tag 'application', + 'data-turbolinks-track': 'reload' + - if @site.try(:persisted?) && @site.try(:config).try(:dig, 'css') - %link{rel: 'stylesheet', type: 'text/css', href: @site.get_url_from_site(@site.config.dig('css'))} - - style = "background-image: url(#{@site.try(:cover) || image_url('background.jpg')})" - %body{class: @has_cover ? 'background-cover' : '', style: @has_cover ? style : ''} - #sutty.container-fluid + %link{ rel: 'stylesheet', + type: 'text/css', + href: @site.get_url_from_site(@site.config.dig('css')) } + + - style = "background-image: url(#{@site.try(:cover)})" + -# haml-lint:disable InlineStyles + %body{ class: @has_cover ? 'background-cover' : '', + style: @has_cover ? style : '' } + + .container-fluid#sutty = yield + -# haml-lint:enable InlineStyles