diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index 551f319..7a24c74 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -1,3 +1,4 @@ //= link_tree ../images //= link_tree ../builds +//= link admin.css //= link legacy.css diff --git a/app/assets/stylesheets/admin.scss b/app/assets/stylesheets/admin.scss index cc97b18..c9a4f40 100644 --- a/app/assets/stylesheets/admin.scss +++ b/app/assets/stylesheets/admin.scss @@ -1,4 +1,4 @@ -@import "variables"; +@import "legacy/variables"; body#admin-panel { #wrapper { diff --git a/app/assets/stylesheets/legacy.css b/app/assets/stylesheets/legacy.css index d05ea0f..33063ee 100644 --- a/app/assets/stylesheets/legacy.css +++ b/app/assets/stylesheets/legacy.css @@ -1,5 +1,5 @@ /* - * This is a manifest file that'll be compiled into application.css, which will include all the files + * This is a manifest file that'll be compiled into legacy.css, which will include all the files * listed below. * * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's @@ -10,6 +10,6 @@ * files in this directory. Styles in this file should be added after the last require_* statement. * It is generally better to create a new file per style scope. * - *= require_tree . + *= require_tree ./legacy/ *= require_self */ diff --git a/app/assets/stylesheets/_mediaqueries.scss b/app/assets/stylesheets/legacy/_mediaqueries.scss similarity index 100% rename from app/assets/stylesheets/_mediaqueries.scss rename to app/assets/stylesheets/legacy/_mediaqueries.scss diff --git a/app/assets/stylesheets/_variables.scss b/app/assets/stylesheets/legacy/_variables.scss similarity index 100% rename from app/assets/stylesheets/_variables.scss rename to app/assets/stylesheets/legacy/_variables.scss diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/legacy/layout.scss similarity index 100% rename from app/assets/stylesheets/layout.scss rename to app/assets/stylesheets/legacy/layout.scss diff --git a/app/assets/stylesheets/main_nav.scss b/app/assets/stylesheets/legacy/main_nav.scss similarity index 100% rename from app/assets/stylesheets/main_nav.scss rename to app/assets/stylesheets/legacy/main_nav.scss diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index f8a53a4..2604405 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -6,6 +6,7 @@ <%= csp_meta_tag %> + <%= stylesheet_link_tag 'admin', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'legacy', media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'application' %>