Reflect review

- Use `yarn run`, instead of `./node_modules/.bin/` - Remove unnecessary .prettierignore entries - Apply async: true to javascript tags - Restore order changes in gemfiles/* - Change scripts task `prettier` to `format`, since it conflicts with the prettier command itself - Apply prettier to src/rails_admin/styles/themes/cerulean
railsadminteam · Dec 4, 2021 · 7976e47 · 7976e47
1 parent b84d065
commit 7976e47
Show file tree

Hide file tree

Showing 9 changed files with 418 additions and 445 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -138,7 +138,7 @@ jobs:
       - name: Install dependencies
         run: yarn install
       - name: Run check
-        run: ./node_modules/.bin/prettier --check .
+        run: yarn run prettier --check .
 
   rubocop:
     name: RuboCop

diff --git a/.prettierignore b/.prettierignore
@@ -3,6 +3,4 @@ lib/generators/rails_admin/templates
 spec/dummy_app/public
 spec/dummy_app/tmp
 spec/support/jquery.simulate.drag-sortable.js
-src/rails_admin/styles/aristo
-src/rails_admin/styles/themes/cerulean
 vendor
diff --git a/app/views/layouts/rails_admin/_head.html.erb b/app/views/layouts/rails_admin/_head.html.erb
@@ -6,11 +6,11 @@
 <% case RailsAdmin::config.asset_source
    when :webpacker %>
   <%= stylesheet_pack_tag "rails_admin" %>
-  <%= javascript_pack_tag "rails_admin" %>
+  <%= javascript_pack_tag "rails_admin", async: true %>
 <% when :webpack, :sprockets %>
   <% handle_asset_dependency_error do %>
     <%= stylesheet_link_tag "rails_admin.css", media: :all %>
-    <%= javascript_include_tag "rails_admin.js", defer: true %>
+    <%= javascript_include_tag "rails_admin.js", async: true %>
   <% end %>
 <% else
      raise "Unknown asset_source: #{RailsAdmin::config.asset_source}"

diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile
@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 
 gem "appraisal", ">= 2.0"
-gem "devise", "~> 4.7"
 gem "rails", "~> 6.0.0"
+gem "devise", "~> 4.7"
 gem "webpacker", require: false
 gem "webrick", "~> 1.7"
 gem "sassc-rails", "~> 2.1"
@@ -33,17 +33,17 @@ group :test do
   gem "cancancan", "~> 3.0"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
   gem "cuprite"
-  gem "database_cleaner-active_record", ">= 2.0", require: false
   gem "database_cleaner-mongoid", ">= 2.0", require: false
+  gem "database_cleaner-active_record", ">= 2.0", require: false
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
   gem "pundit"
   gem "rack-cache", require: "rack/cache"
-  gem "rspec-expectations", "!= 3.8.3"
   gem "rspec-rails", ">= 4.0.0.beta2"
+  gem "rspec-expectations", "!= 3.8.3"
   gem "rspec-retry"
   gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
   gem "rubocop-performance", require: false

diff --git a/gemfiles/rails_6.1.gemfile b/gemfiles/rails_6.1.gemfile
@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 
 gem "appraisal", ">= 2.0"
-gem "devise", "~> 4.7"
 gem "rails", "~> 6.1.0"
+gem "devise", "~> 4.7"
 gem "webpacker", require: false
 gem "webrick", "~> 1.7"
 gem "sassc-rails", "~> 2.1"
@@ -33,17 +33,17 @@ group :test do
   gem "cancancan", "~> 3.2"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
   gem "cuprite"
-  gem "database_cleaner-active_record", ">= 2.0", require: false
   gem "database_cleaner-mongoid", ">= 2.0", require: false
+  gem "database_cleaner-active_record", ">= 2.0", require: false
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
   gem "pundit"
   gem "rack-cache", require: "rack/cache"
-  gem "rspec-expectations", "!= 3.8.3"
   gem "rspec-rails", ">= 4.0.0.beta2"
+  gem "rspec-expectations", "!= 3.8.3"
   gem "rspec-retry"
   gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
   gem "rubocop-performance", require: false

diff --git a/gemfiles/rails_7.0.gemfile b/gemfiles/rails_7.0.gemfile
@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 
 gem "appraisal", ">= 2.0"
-gem "devise", "~> 4.7", github: "strobilomyces/devise", branch: "patch-1"
 gem "rails", "~> 7.0.0.alpha2"
+gem "devise", "~> 4.7", github: "strobilomyces/devise", branch: "patch-1"
 gem "webpacker", require: false
 gem "webrick", "~> 1.7"
 gem "sassc-rails", "~> 2.1"
@@ -27,17 +27,17 @@ group :test do
   gem "cancancan", "~> 3.2"
   gem "carrierwave", [">= 2.0.0.rc", "< 3"]
   gem "cuprite"
-  gem "database_cleaner-active_record", ">= 2.0", require: false
   gem "database_cleaner-mongoid", ">= 2.0", require: false
+  gem "database_cleaner-active_record", ">= 2.0", require: false
   gem "dragonfly", "~> 1.0"
   gem "factory_bot", ">= 4.2"
   gem "generator_spec", ">= 0.8"
   gem "launchy", ">= 2.2"
   gem "mini_magick", ">= 3.4"
   gem "pundit"
   gem "rack-cache", require: "rack/cache"
-  gem "rspec-expectations", "!= 3.8.3"
   gem "rspec-rails", ">= 4.0.0.beta2"
+  gem "rspec-expectations", "!= 3.8.3"
   gem "rspec-retry"
   gem "rubocop", ["~> 1.20", "!= 1.22.2"], require: false
   gem "rubocop-performance", require: false

diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
   "main": "src/rails_admin/base.js",
   "scripts": {
     "link": "yarn link && cd spec/dummy_app && yarn link rails_admin",
-    "prettier": "prettier -w ."
+    "format": "prettier -w ."
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",

diff --git a/src/rails_admin/styles/themes/cerulean/theming.scss b/src/rails_admin/styles/themes/cerulean/theming.scss
@@ -3,8 +3,13 @@
 // .rails_admin .sidebar-nav added to prevent same link color
 // ------------------------------------------------------------------
 
-@mixin btn-shadow($color){
-  @include gradient-vertical-three-colors(lighten($color, 8%), $color, 60%, darken($color, 4%));
+@mixin btn-shadow($color) {
+  @include gradient-vertical-three-colors(
+    lighten($color, 8%),
+    $color,
+    60%,
+    darken($color, 4%)
+  );
   filter: none;
   border-bottom: 1px solid darken($color, 10%);
 }
@@ -18,16 +23,21 @@
 }
 
 .navbar.navbar-default .badge {
-      background-color: #fff;
-      color: $navbar-default-bg;
-  }
-
-.navbar.navbar-inverse , .rails_admin .sidebar-nav  {
-    @include gradient-vertical-three-colors(lighten($navbar-inverse-bg, 8%), lighten($navbar-inverse-bg, 4%), 60%, darken($navbar-inverse-bg, 2%));
-    filter: none;
-    border-bottom: 1px solid darken($navbar-inverse-bg, 10%);
-  }
+  background-color: #fff;
+  color: $navbar-default-bg;
+}
 
+.navbar.navbar-inverse,
+.rails_admin .sidebar-nav {
+  @include gradient-vertical-three-colors(
+    lighten($navbar-inverse-bg, 8%),
+    lighten($navbar-inverse-bg, 4%),
+    60%,
+    darken($navbar-inverse-bg, 2%)
+  );
+  filter: none;
+  border-bottom: 1px solid darken($navbar-inverse-bg, 10%);
+}
 
 .navbar.navbar-inverse .badge {
   background-color: #fff;
@@ -36,14 +46,11 @@
 
 .navbar .navbar-nav > li > a,
 .navbar .navbar-brand {
-    text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
-  }
-
+  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
+}
 
 @media (max-width: $grid-float-breakpoint-max) {
-
   .navbar {
-
     .dropdown-header {
       color: #fff;
     }
@@ -53,7 +60,6 @@
 // Buttons ====================================================================
 
 .btn {
-
   text-shadow: 0 1px 0 rgba(0, 0, 0, 0.1);
 
   .caret {
@@ -62,7 +68,6 @@
 }
 
 .btn-default {
-
   @include btn-shadow($btn-default-bg);
 
   &:hover {
@@ -104,10 +109,8 @@
 table,
 .table {
   > thead > tr > th {
-
     color: $headings-color;
   }
-
 }
 
 // Forms ======================================================================
@@ -125,7 +128,6 @@ table,
 .panel-warning,
 .panel-danger,
 .panel-info {
-
   .panel-heading,
   .panel-title {
     color: #fff;