Change web/all.css from sprockets to SASS and include web/all.css through darkswarm/all.css

This commit is contained in:
luisramos0
2018-09-17 12:45:06 +01:00
parent d170a4d489
commit dc5eb6448e
6 changed files with 5 additions and 16 deletions

View File

@@ -12,6 +12,7 @@
@import 'base/*';
@import '*';
@import 'pages/*';
@import '../web/all';
ofn-modal {
display: block;

View File

@@ -19,7 +19,6 @@
%script{src: "//maps.googleapis.com/maps/api/js?libraries=places,geometry#{ ENV['GOOGLE_MAPS_API_KEY'] ? '&key=' + ENV['GOOGLE_MAPS_API_KEY'] : ''} "}
= stylesheet_link_tag "darkswarm/all"
= javascript_include_tag "darkswarm/all"
= stylesheet_link_tag "web/all"
= javascript_include_tag "web/all"
= render "layouts/i18n_script"

View File

@@ -1,13 +0,0 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
*= require_tree .
*/

View File

@@ -0,0 +1,2 @@
@import 'web/pages/cookies_banner';
@import 'web/pages/cookies_policy_modal';

View File

@@ -1,4 +1,4 @@
@import '../../../../../../../app/assets/stylesheets/darkswarm/branding';
@import 'darkswarm/branding';
.cookies-banner {
background: $dark-grey;

View File

@@ -1,4 +1,4 @@
@import '../../../../../../../app/assets/stylesheets/darkswarm/branding';
@import 'darkswarm/branding';
.cookies-policy-modal {
background: $disabled-light;