Fix Bootstrap 5.2 compatibility

railsadminteam · Sep 22, 2022 · ef76fce · ef76fce
1 parent 458d0fb
commit ef76fce
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/app/views/layouts/rails_admin/_sidebar_navigation.html.erb b/app/views/layouts/rails_admin/_sidebar_navigation.html.erb
@@ -1,4 +1,4 @@
-<ul class="sidebar col-sm-3 col-md-2 btn-toggle-nav list-unstyled bg-light">
+<ul class="sidebar col-sm-3 col-md-2 nav btn-toggle-nav list-unstyled bg-light">
   <%= main_navigation %>
   <%= root_navigation %>
   <%= static_navigation %>

diff --git a/app/views/rails_admin/main/_dashboard_history.html.erb b/app/views/rails_admin/main/_dashboard_history.html.erb
@@ -12,7 +12,7 @@
       </th>
     </tr>
   </thead>
-  <tbody>
+  <tbody class="table-group-divider">
     <% @history.each do |t| %>
       <% abstract_model = RailsAdmin.config(t.table).abstract_model %>
       <tr>

diff --git a/app/views/rails_admin/main/dashboard.html.erb b/app/views/rails_admin/main/dashboard.html.erb
@@ -14,7 +14,7 @@
         <th class="shrink controls"></th>
       </tr>
     </thead>
-    <tbody>
+    <tbody class="table-group-divider">
       <% @abstract_models.each do |abstract_model| %>
         <% if authorized? :index, abstract_model %>
           <% index_path = index_path(model_name: abstract_model.to_param) %>
@@ -42,7 +42,7 @@
               </div>
             </td>
             <td class="links">
-              <ul class="inline list-inline">
+              <ul class="nav d-inline list-inline">
                 <%= menu_for :collection, abstract_model, nil, true %>
               </ul>
             </td>

diff --git a/app/views/rails_admin/main/history.html.erb b/app/views/rails_admin/main/history.html.erb
@@ -38,7 +38,7 @@
       <% end %>
     </tr>
   </thead>
-  <tbody>
+  <tbody class="table-group-divider">
     <% @history.each_with_index do |object, index| %>
       <tr>
         <% unless object.created_at.nil? %>

diff --git a/app/views/rails_admin/main/index.html.erb b/app/views/rails_admin/main/index.html.erb
@@ -123,7 +123,7 @@
             <th class="last shrink"></th>
           </tr>
         </thead>
-        <tbody>
+        <tbody class="table-group-divider">
           <% @objects.each do |object| %>
             <tr class="<%= @abstract_model.param_key %>_row <%= @model_config.list.with(object: object).row_css_class %>">
               <% if checkboxes %>
@@ -138,7 +138,7 @@
                 </td>
               <% end %>
               <td class="last links ra-sidescroll-frozen">
-                <ul class="inline list-inline">
+                <ul class="nav d-inline list-inline">
                   <%= menu_for :member, @abstract_model, object, true %>
                 </ul>
               </td>

diff --git a/src/rails_admin/styles/widgets.scss b/src/rails_admin/styles/widgets.scss
@@ -21,6 +21,6 @@ iframe.wysihtml5-sandbox,
   display: none;
 }
 
-.links .inline.list-inline .disabled span {
+.links .list-inline .disabled span {
   color: $gray-600;
 }