mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-01-28 21:07:16 +00:00
Change web/all.css from sprockets to SASS and include web/all.css through darkswarm/all.css
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
@import 'base/*';
|
||||
@import '*';
|
||||
@import 'pages/*';
|
||||
@import '../web/all';
|
||||
|
||||
ofn-modal {
|
||||
display: block;
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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 .
|
||||
*/
|
||||
2
engines/web/app/assets/stylesheets/web/all.css.scss
Normal file
2
engines/web/app/assets/stylesheets/web/all.css.scss
Normal file
@@ -0,0 +1,2 @@
|
||||
@import 'web/pages/cookies_banner';
|
||||
@import 'web/pages/cookies_policy_modal';
|
||||
@@ -1,4 +1,4 @@
|
||||
@import '../../../../../../../app/assets/stylesheets/darkswarm/branding';
|
||||
@import 'darkswarm/branding';
|
||||
|
||||
.cookies-banner {
|
||||
background: $dark-grey;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
@import '../../../../../../../app/assets/stylesheets/darkswarm/branding';
|
||||
@import 'darkswarm/branding';
|
||||
|
||||
.cookies-policy-modal {
|
||||
background: $disabled-light;
|
||||
|
||||
Reference in New Issue
Block a user