diff --git a/app/assets/builds/.keep b/app/assets/builds/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js index bf57da8..d56c201 100644 --- a/app/assets/config/manifest.js +++ b/app/assets/config/manifest.js @@ -1,5 +1,5 @@ //= link_tree ../images -//= link_tree ../builds +//= link_directory ../stylesheets .css //= link_tree ../audios //= link_tree ../../javascript .js //= link_tree ../../../vendor/javascript .js diff --git a/app/assets/stylesheets/application.bootstrap.scss b/app/assets/stylesheets/application.bootstrap.scss deleted file mode 100644 index 5232634..0000000 --- a/app/assets/stylesheets/application.bootstrap.scss +++ /dev/null @@ -1,44 +0,0 @@ -@import 'bootstrap/scss/bootstrap'; -@import 'bootstrap-icons/font/bootstrap-icons'; - -.lyrics-site-content { - min-height: 700px; -} - -.lyrics-site-sidenav-item { - - a, - button { - color: #fff; - } -} - -.layoutAuthentication { - display: flex; - flex-direction: column; - min-height: 100vh; - - .layoutAuthentication_content { - min-width: 0; - flex-grow: 1; - } -} - -.img-error { - max-width: 20rem; -} - -#layoutError { - display: flex; - flex-direction: column; - min-height: 100vh; -} - -#layoutError #layoutError_content { - min-width: 0; - flex-grow: 1; -} - -#layoutError #layoutError_footer { - min-width: 0; -} \ No newline at end of file diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 0fa9e6f..52de590 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -1 +1,43 @@ -@import "font-awesome"; \ No newline at end of file +@import "font-awesome"; + +.lyrics-site-content { + min-height: 700px; + } + + .lyrics-site-sidenav-item { + + a, + button { + color: #fff; + } + } + + .layoutAuthentication { + display: flex; + flex-direction: column; + min-height: 100vh; + + .layoutAuthentication_content { + min-width: 0; + flex-grow: 1; + } + } + + .img-error { + max-width: 20rem; + } + + #layoutError { + display: flex; + flex-direction: column; + min-height: 100vh; + } + + #layoutError #layoutError_content { + min-width: 0; + flex-grow: 1; + } + + #layoutError #layoutError_footer { + min-width: 0; + } \ No newline at end of file diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim index 8e75ade..402736c 100644 --- a/app/views/layouts/application.html.slim +++ b/app/views/layouts/application.html.slim @@ -8,6 +8,6 @@ html = csp_meta_tag = favicon_link_tag('favicon.ico') = stylesheet_link_tag "application", "data-turbo-track": "reload" - = javascript_include_tag "application", "data-turbo-track": "reload", defer: true + = javascript_importmap_tags body class="#{yield (:body_class)}" = yield diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index d8f9659..b3a1313 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -7,7 +7,6 @@ # Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path -Rails.application.config.assets.paths << Rails.root.join('node_modules/bootstrap-icons/font') # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in the app/assets