From 198ff8a8ad28184eda5ba9afc8b5381d64448a85 Mon Sep 17 00:00:00 2001 From: Sam Pohlenz Date: Mon, 27 May 2024 17:14:17 +0930 Subject: [PATCH] Remove sassc-rails and Sass files --- Gemfile | 3 +-- gemfiles/rails-5.2.gemfile | 3 +-- gemfiles/rails-6.0.gemfile | 3 +-- gemfiles/rails-6.1.gemfile | 3 +-- gemfiles/rails-7.0.gemfile | 3 +-- gemfiles/rails-7.1.gemfile | 3 +-- spec/dummy/app/assets/stylesheets/application.css | 1 - .../app/assets/stylesheets/trestle/_custom.css | 8 ++++++++ .../app/assets/stylesheets/trestle/_custom.scss | 8 -------- .../app/assets/stylesheets/trestle/_theme.scss | 13 ------------- 10 files changed, 14 insertions(+), 34 deletions(-) create mode 100644 spec/dummy/app/assets/stylesheets/trestle/_custom.css delete mode 100644 spec/dummy/app/assets/stylesheets/trestle/_custom.scss delete mode 100644 spec/dummy/app/assets/stylesheets/trestle/_theme.scss diff --git a/Gemfile b/Gemfile index 9301e72..61bf97e 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,5 @@ group :test do end gem "rails", "~> 7.1.0" -gem "sassc-rails" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" diff --git a/gemfiles/rails-5.2.gemfile b/gemfiles/rails-5.2.gemfile index ade8fe5..300d797 100644 --- a/gemfiles/rails-5.2.gemfile +++ b/gemfiles/rails-5.2.gemfile @@ -10,9 +10,8 @@ end gem "rails", "~> 5.2.0" gem "sqlite3", "~> 1.3.13" -gem "sassc-rails" gem "devise" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" gemspec path: "../" diff --git a/gemfiles/rails-6.0.gemfile b/gemfiles/rails-6.0.gemfile index 40c5f4f..f022eb9 100644 --- a/gemfiles/rails-6.0.gemfile +++ b/gemfiles/rails-6.0.gemfile @@ -9,10 +9,9 @@ end gem "rails", "~> 6.0.0" -gem "sassc-rails" gem "sqlite3", "~> 1.4" gem "devise" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" gemspec path: "../" diff --git a/gemfiles/rails-6.1.gemfile b/gemfiles/rails-6.1.gemfile index b8446d6..3f28534 100644 --- a/gemfiles/rails-6.1.gemfile +++ b/gemfiles/rails-6.1.gemfile @@ -10,9 +10,8 @@ end gem "rails", "~> 6.1.0" gem "sqlite3", "~> 1.4" -gem "sassc-rails" gem "devise" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" gemspec path: "../" diff --git a/gemfiles/rails-7.0.gemfile b/gemfiles/rails-7.0.gemfile index c046365..a32e254 100644 --- a/gemfiles/rails-7.0.gemfile +++ b/gemfiles/rails-7.0.gemfile @@ -10,9 +10,8 @@ end gem "rails", "~> 7.0.0" gem "sqlite3", "~> 1.4" -gem "sassc-rails" gem "devise" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" gemspec path: "../" diff --git a/gemfiles/rails-7.1.gemfile b/gemfiles/rails-7.1.gemfile index 20fc271..7c1f2f9 100644 --- a/gemfiles/rails-7.1.gemfile +++ b/gemfiles/rails-7.1.gemfile @@ -10,9 +10,8 @@ end gem "rails", "~> 7.1.0" gem "sqlite3", "~> 1.4" -gem "sassc-rails" gem "devise" -gem "trestle", github: "TrestleAdmin/trestle" +gem "trestle", github: "TrestleAdmin/trestle", branch: "hotwire" gemspec path: "../" diff --git a/spec/dummy/app/assets/stylesheets/application.css b/spec/dummy/app/assets/stylesheets/application.css index 0ebd7fe..d1a3a7e 100644 --- a/spec/dummy/app/assets/stylesheets/application.css +++ b/spec/dummy/app/assets/stylesheets/application.css @@ -10,6 +10,5 @@ * 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_self */ diff --git a/spec/dummy/app/assets/stylesheets/trestle/_custom.css b/spec/dummy/app/assets/stylesheets/trestle/_custom.css new file mode 100644 index 0000000..f15c317 --- /dev/null +++ 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 deleted file mode 100644 index 6286615..0000000 --- a/spec/dummy/app/assets/stylesheets/trestle/_custom.scss +++ /dev/null @@ -1,8 +0,0 @@ -// 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"; -// diff --git a/spec/dummy/app/assets/stylesheets/trestle/_theme.scss b/spec/dummy/app/assets/stylesheets/trestle/_theme.scss deleted file mode 100644 index 64a89c2..0000000 --- a/spec/dummy/app/assets/stylesheets/trestle/_theme.scss +++ /dev/null @@ -1,13 +0,0 @@ -// This file may be used to override the Sass variables used within the Trestle -// admin. It will be automatically included within all admin pages. -// -// A subset of Bootstrap and Trestle defaults can be set here. -// For a detailed overview of the customizable variables, see the file -// `frontend/theme/trestle/theme/_defaults.scss` within the Trestle source. - -// Customize admin theme colors: -// -// $theme-colors: ( -// "primary": #337ab7, -// "secondary": #b3b53d -// );