From c75c268e2d4cc27c24bc39bd6180cb89e1b2c66f Mon Sep 17 00:00:00 2001 From: Greg Haygood Date: Tue, 11 Feb 2020 10:46:59 -0500 Subject: [PATCH 1/3] update to work with Rails6 + RailsAdmin2 --- .../themes/material/variables.scss | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/vendor/assets/stylesheets/rails_admin/themes/material/variables.scss b/vendor/assets/stylesheets/rails_admin/themes/material/variables.scss index 69d7acc..07e3740 100644 --- a/vendor/assets/stylesheets/rails_admin/themes/material/variables.scss +++ b/vendor/assets/stylesheets/rails_admin/themes/material/variables.scss @@ -6,7 +6,31 @@ @import 'bootstrap-material-design/_mixins'; @import 'bootstrap-material-design/_shadows'; @import 'bootstrap-material-design/_form'; -@import 'bootstrap-material-design/**/*'; +// @import 'bootstrap-material-design/**/*'; // not working with Rails6 + RailsAdmin2 + +@import 'bootstrap-material-design/_core'; +@import 'bootstrap-material-design/_alerts'; +@import 'bootstrap-material-design/_buttons'; +@import 'bootstrap-material-design/_cards'; +@import 'bootstrap-material-design/_checkboxes'; +@import 'bootstrap-material-design/_colors'; +@import 'bootstrap-material-design/_colors-map'; +@import 'bootstrap-material-design/_dialogs'; +@import 'bootstrap-material-design/_dividers'; +@import 'bootstrap-material-design/_inputs'; +@import 'bootstrap-material-design/_inputs-size'; +@import 'bootstrap-material-design/_labels'; +@import 'bootstrap-material-design/_lists'; +@import 'bootstrap-material-design/_navbar'; +@import 'bootstrap-material-design/_panels'; +@import 'bootstrap-material-design/_popups'; +@import 'bootstrap-material-design/_progress'; +@import 'bootstrap-material-design/_radios'; +@import 'bootstrap-material-design/_shadows'; +@import 'bootstrap-material-design/_tabs'; +@import 'bootstrap-material-design/_togglebutton'; +@import 'bootstrap-material-design/_typography'; +@import 'bootstrap-material-design/_welljumbo'; // fonts $admin-font: 'Roboto', sans-serif; From c56e6536ca6097cffe0570722b62771fbe7d9dc0 Mon Sep 17 00:00:00 2001 From: Greg Haygood Date: Tue, 11 Feb 2020 10:48:02 -0500 Subject: [PATCH 2/3] version bump --- lib/rails_admin_material/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rails_admin_material/version.rb b/lib/rails_admin_material/version.rb index 4aaec1d..ca7f42d 100644 --- a/lib/rails_admin_material/version.rb +++ b/lib/rails_admin_material/version.rb @@ -1,3 +1,3 @@ module RailsAdminMaterial - VERSION = "0.2.1" + VERSION = "0.2.2" end From fe2f7081623f509226762c56517b8afe7b966afd Mon Sep 17 00:00:00 2001 From: Greg Haygood Date: Tue, 11 Feb 2020 10:56:46 -0500 Subject: [PATCH 3/3] remove redundant imports --- .../themes/material/variables.scss | 21 +------------------ 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/vendor/assets/stylesheets/rails_admin/themes/material/variables.scss b/vendor/assets/stylesheets/rails_admin/themes/material/variables.scss index 07e3740..2cde9ff 100644 --- a/vendor/assets/stylesheets/rails_admin/themes/material/variables.scss +++ b/vendor/assets/stylesheets/rails_admin/themes/material/variables.scss @@ -7,30 +7,11 @@ @import 'bootstrap-material-design/_shadows'; @import 'bootstrap-material-design/_form'; // @import 'bootstrap-material-design/**/*'; // not working with Rails6 + RailsAdmin2 - -@import 'bootstrap-material-design/_core'; -@import 'bootstrap-material-design/_alerts'; -@import 'bootstrap-material-design/_buttons'; -@import 'bootstrap-material-design/_cards'; -@import 'bootstrap-material-design/_checkboxes'; +@import 'bootstrap-material-design/_core'; // this updates most of the other partials @import 'bootstrap-material-design/_colors'; @import 'bootstrap-material-design/_colors-map'; -@import 'bootstrap-material-design/_dialogs'; -@import 'bootstrap-material-design/_dividers'; -@import 'bootstrap-material-design/_inputs'; -@import 'bootstrap-material-design/_inputs-size'; @import 'bootstrap-material-design/_labels'; -@import 'bootstrap-material-design/_lists'; -@import 'bootstrap-material-design/_navbar'; -@import 'bootstrap-material-design/_panels'; -@import 'bootstrap-material-design/_popups'; -@import 'bootstrap-material-design/_progress'; -@import 'bootstrap-material-design/_radios'; @import 'bootstrap-material-design/_shadows'; -@import 'bootstrap-material-design/_tabs'; -@import 'bootstrap-material-design/_togglebutton'; -@import 'bootstrap-material-design/_typography'; -@import 'bootstrap-material-design/_welljumbo'; // fonts $admin-font: 'Roboto', sans-serif;