Remove all Sass dependencies from testing and sandbox environments

TrestleAdmin · Sep 21, 2023 · 13b7dab · 13b7dab
1 parent 7aa2942
commit 13b7dab
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 41 deletions.
diff --git a/Gemfile b/Gemfile
@@ -19,9 +19,6 @@ group :test do
   gem 'capybara-screenshot'
 end
 
-#gem 'sassc-rails'
-gem 'dartsass-sprockets'
-
 gem 'haml'
 gem 'sqlite3', '~> 1.4'
 

diff --git a/gemfiles/rails-5.2.gemfile b/gemfiles/rails-5.2.gemfile
@@ -16,7 +16,4 @@ end
 
 gem 'rails', '~> 5.2.0'
 
-#gem 'sassc-rails'
-gem 'dartsass-sprockets'
-
 gemspec path: "../"
diff --git a/gemfiles/rails-6.0.gemfile b/gemfiles/rails-6.0.gemfile
@@ -17,7 +17,4 @@ end
 gem 'rails', '~> 6.0.0'
 gem 'sqlite3', '~> 1.4'
 
-#gem 'sassc-rails'
-gem 'dartsass-sprockets'
-
 gemspec path: "../"
diff --git a/gemfiles/rails-6.1.gemfile b/gemfiles/rails-6.1.gemfile
@@ -17,7 +17,4 @@ end
 gem 'rails', '~> 6.1.0'
 gem 'sqlite3', '~> 1.4'
 
-#gem 'sassc-rails'
-gem 'dartsass-sprockets'
-
 gemspec path: "../"
diff --git a/gemfiles/rails-7.0.gemfile b/gemfiles/rails-7.0.gemfile
@@ -17,7 +17,4 @@ end
 gem 'rails', '~> 7.0.0'
 gem 'sqlite3', '~> 1.4'
 
-#gem 'sassc-rails'
-gem 'dartsass-sprockets'
-
 gemspec path: "../"
diff --git a/gemfiles/rails-7.1.gemfile b/gemfiles/rails-7.1.gemfile
@@ -22,7 +22,4 @@ end
 gem 'rails', '~> 7.1.0.beta1'
 gem 'sqlite3', '~> 1.4'
 
-#gem 'sassc-rails'
-gem 'dartsass-sprockets'
-
 gemspec path: "../"
diff --git a/...p/assets/stylesheets/trestle/_custom.scss → ...pp/assets/stylesheets/trestle/_custom.css b/...p/assets/stylesheets/trestle/_custom.scss → ...pp/assets/stylesheets/trestle/_custom.css
@@ -1,11 +1,11 @@
-// This file may be used for providing additional customizations to the Trestle
-// admin. It will be automatically included within all admin pages.
-//
-// For organizational purposes, you may wish to define your customizations
-// within individual partials and `import` them here, e.g.
-//
-//    @import "trestle/custom/my_custom_css";
-//
+/* This file may be used for providing additional customizations to the Trestle
+ * admin. It will be automatically included within all admin pages.
+ *
+ * For organizational purposes, you may wish to define your customizations
+ * within individual partials in this folder and they'll be required below.
+ *
+ *= require_tree .
+*/
 
 .user-link {
   display: inline-flex;
@@ -23,11 +23,11 @@
 
   width: 3rem;
   height: 3rem;
+}
 
-  &::-webkit-color-swatch {
-    border: 0;
-    border-radius: 50%;
-  }
+.color-swatch::-webkit-color-swatch {
+  border: 0;
+  border-radius: 50%;
 }
 
 .grid-example {
@@ -37,8 +37,8 @@
 
   border: 1px solid #ddd;
   background: #fafafa;
+}
 
-  code {
-    display: block;
-  }
+.grid-example code {
+  display: block;
 }
diff --git a/spec/dummy/app/assets/stylesheets/trestle/_custom.css b/spec/dummy/app/assets/stylesheets/trestle/_custom.css
@@ -0,0 +1,8 @@
+/* This file may be used for providing additional customizations to the Trestle
+ * admin. It will be automatically included within all admin pages.
+ *
+ * For organizational purposes, you may wish to define your customizations
+ * within individual partials in this folder and they'll be required below.
+ *
+ *= require_tree .
+*/
diff --git a/spec/dummy/app/assets/stylesheets/trestle/_custom.scss b/spec/dummy/app/assets/stylesheets/trestle/_custom.scss