Skip to content

Commit b8365f5

Browse files
committed
fix: address deprecations
1 parent 5ca3c32 commit b8365f5

File tree

7 files changed

+29
-29
lines changed

7 files changed

+29
-29
lines changed

app/assets/stylesheets/better_together/application.scss

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@
1414
*= require_self
1515
*/
1616

17-
@import 'theme';
17+
@use 'theme' as *;
1818

1919
// Import Bootstrap and Font Awesome
2020

21-
@import 'bootstrap';
22-
@import 'cards';
23-
@import 'devise';
24-
@import 'font-awesome';
25-
@import 'actiontext';
26-
@import 'contact_details';
27-
@import 'content_blocks';
28-
@import 'conversations';
29-
@import 'forms';
30-
@import 'image-galleries';
31-
@import 'maps';
32-
@import 'metrics';
33-
@import 'navigation';
34-
@import 'notifications';
35-
@import 'profiles';
36-
@import 'simple_calendar';
37-
@import 'share';
38-
@import 'sidebar_nav';
39-
@import 'trix-extensions/richtext';
21+
@use 'bootstrap' as *;
22+
@use 'cards';
23+
@use 'devise';
24+
@use 'font-awesome';
25+
@use 'actiontext';
26+
@use 'contact_details';
27+
@use 'content_blocks';
28+
@use 'conversations';
29+
@use 'forms';
30+
@use 'image-galleries';
31+
@use 'maps';
32+
@use 'metrics';
33+
@use 'navigation';
34+
@use 'notifications';
35+
@use 'profiles';
36+
@use 'simple_calendar';
37+
@use 'share';
38+
@use 'sidebar_nav';
39+
@use 'trix-extensions/richtext';
4040

4141
// Styles that use the variables
4242
.text-opposite-theme {

app/assets/stylesheets/better_together/contact_details.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'theme';
1+
@use 'theme' as *;
22

33
.contact-detail-item {
44
margin-bottom: 15px;

app/assets/stylesheets/better_together/forms.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "theme";
1+
@use "theme" as *;
22

33
.required-indicator {
44
color: $danger;

app/assets/stylesheets/better_together/share.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
2-
@import 'theme';
1+
@use 'theme' as *;
32

43
.social-share-buttons {
54
margin-top: 40px;

app/assets/stylesheets/better_together/sidebar_nav.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import 'theme';
1+
@use 'theme' as *;
22

33
#sidebar_nav {
44
// Sidebar heading styles

app/assets/stylesheets/better_together/theme.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
@import "bootstrap/functions";
2-
@import "bootstrap/mixins";
3-
@import "bootstrap/variables";
1+
@use "bootstrap/functions" as *;
2+
@use "bootstrap/mixins" as *;
3+
@use "bootstrap/variables" as *;
44

55
// Define default color variables (if not overridden by the host app)
66
$text-opposite-theme-color: #333 !default;

spec/dummy/config/application.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ class Application < Rails::Application
2323
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
2424
# config.time_zone = 'Central Time (US & Canada)'
2525

26-
config.active_storage.replace_on_assign_to_many = true
26+
# Use the latest cache format and remove deprecated Active Storage setting
27+
config.active_support.cache_format_version = 7.1
2728

2829
config.generators do |g|
2930
g.orm :active_record, primary_key_type: :uuid

0 commit comments

Comments
 (0)