Merge pull request #2242 from diowa/fix-bootstrap-row

Fix sidebar and main content style
railsadminteam · Apr 13, 2015 · 2fa9ada · 2fa9ada
2 parents ce55d34 + 05592be
commit 2fa9ada
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -28,7 +28,7 @@ body.rails_admin {
   .sidebar-nav {
     padding: 9px 9px 9px 9px;
     position: fixed;
-    width: 14%;
+    width: percentage(3 / $grid-columns); /* 3 sm columns */
     overflow-y: scroll;
     top: 50px;
     bottom: 0;
@@ -290,3 +290,11 @@ body.rails_admin {
     }
   }
 }
+
+@media screen and (min-width: $screen-md-min) {
+  body.rails_admin {
+    .sidebar-nav {
+      width: percentage(2 / $grid-columns); /* 2 md columns */
+    }
+  }
+}
diff --git a/app/views/layouts/rails_admin/application.html.haml b/app/views/layouts/rails_admin/application.html.haml
@@ -20,5 +20,4 @@
           .sidebar-nav
             = render "layouts/rails_admin/sidebar_navigation"
         .col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2
-          .row
-            .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'
+          .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'