diff --git a/app/assets/stylesheets/darkswarm/all.scss b/app/assets/stylesheets/darkswarm/all.scss index b3f5433d8e..2f73f5e796 100644 --- a/app/assets/stylesheets/darkswarm/all.scss +++ b/app/assets/stylesheets/darkswarm/all.scss @@ -12,6 +12,7 @@ @import 'base/*'; @import '*'; @import 'pages/*'; +@import '../web/all'; ofn-modal { display: block; diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index 83173c16e3..79d78c67ea 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -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" diff --git a/engines/web/app/assets/stylesheets/web/all.css b/engines/web/app/assets/stylesheets/web/all.css deleted file mode 100644 index 3192ec897b..0000000000 --- a/engines/web/app/assets/stylesheets/web/all.css +++ /dev/null @@ -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 . - */ diff --git a/engines/web/app/assets/stylesheets/web/all.css.scss b/engines/web/app/assets/stylesheets/web/all.css.scss new file mode 100644 index 0000000000..53fb36eef5 --- /dev/null +++ b/engines/web/app/assets/stylesheets/web/all.css.scss @@ -0,0 +1,2 @@ +@import 'web/pages/cookies_banner'; +@import 'web/pages/cookies_policy_modal'; diff --git a/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss b/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss index afd0d73d43..a655c513a8 100644 --- a/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss +++ b/engines/web/app/assets/stylesheets/web/pages/cookies_banner.css.scss @@ -1,4 +1,4 @@ -@import '../../../../../../../app/assets/stylesheets/darkswarm/branding'; +@import 'darkswarm/branding'; .cookies-banner { background: $dark-grey; diff --git a/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss b/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss index 2279bf6983..490fe6e529 100644 --- a/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss +++ b/engines/web/app/assets/stylesheets/web/pages/cookies_policy_modal.css.scss @@ -1,4 +1,4 @@ -@import '../../../../../../../app/assets/stylesheets/darkswarm/branding'; +@import 'darkswarm/branding'; .cookies-policy-modal { background: $disabled-light;