Merge pull request #38 from dkniffin/dartsass-deprecations

Updates to resolve dartsass deprecation warnings
dkniffin · Feb 3, 2025 · b0ba512 · b0ba512
2 parents a811a67 + 245fdab
commit b0ba512
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/rubyonrails.yml b/.github/workflows/rubyonrails.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
       # Add or replace dependency steps here
       - name: Install Ruby and gems
-        uses: ruby/setup-ruby@55283cc23133118229fd3f97f9336ee23a179fcf # v1.146.0
+        uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true
       # Add or replace database setup steps here

diff --git a/activeadmin_reorderable.gemspec b/activeadmin_reorderable.gemspec
@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "selenium-webdriver", '~> 4.10'
   s.add_development_dependency "sqlite3", "~> 1.4"
   s.add_development_dependency "sassc-rails"
+  s.add_development_dependency "concurrent-ruby", "1.3.4"
 end
diff --git a/app/assets/stylesheets/activeadmin_reorderable.scss b/app/assets/stylesheets/activeadmin_reorderable.scss
@@ -1,7 +1,10 @@
+@use "@activeadmin/activeadmin/src/scss/mixins/all" as *;
+
 .aa-reorderable {
   .reorder-handle {
-    @include light-button;
     cursor: move;
+
+    @include light-button;
   }
 
   .dragged-row {

diff --git a/package.json b/package.json
@@ -11,5 +11,7 @@
   "license": "MIT",
   "scripts": { },
   "devDependencies": { },
-  "dependencies": { }
+  "dependencies": {
+    "@activeadmin/activeadmin": "^3.2.0"
+  }
 }