Merge branch '0.1.0'

Conflicts:
	lib/active_admin_sidebar/version.rb

Author: Fivell

README.rdoc

@@ -1,12 +1,12 @@
 active_admin_sidebar 
 ====================
 
-easy change sidebar position with activeadmin (tested with active_admin-0.5.0)
+easy change sidebar position with activeadmin (tested with activeadmin ~> 1.0.0.pre)
 
 
 Add including of css file 
 
-  @import "active_admin_sidebar/index"; 
+  @import "active_admin_sidebar"; 
 
 to the  app/assets/stylesheets/active_admin.css.scss
 
@@ -15,7 +15,7 @@ Changing sidebar position dynamically with before_filter
 
   # app/admin/posts.rb
   ActiveAdmin.register Post do
-    before_filter :left_sidebar!, :only=>[:show]
+    before_filter :left_sidebar!, only: [:show]
   end
 
   # app/admin/comments.rb
@@ -34,7 +34,7 @@ Moving sidebar to the left within all resource (config/initializers/active_admin
   # Active Admin resources from here.
   #
   config.before_filter do
-    left_sidebar! if respond_to?(:left_sidebar!)
+    left_sidebar!
   end 
 
 Disabling using sidebar layout on dashboards (if you setup sidebar position with initializer)

app/assets/stylesheets/active_admin_sidebar.css.scss

@@ -0,0 +1,44 @@
+body.active_admin #active_admin_content.left_sidebar {
+  #sidebar{
+    margin-left:0;
+  }
+
+  .paginated_collection_contents{
+    clear: none;
+    float: left;
+    width: 100%;
+  }
+
+  .blank_slate_container{
+    clear:none;
+  }
+
+  .columns {
+      clear: none;
+  }  
+
+  #main_content_wrapper{
+    float:inherit;
+    width:auto;
+    margin-left: 298px;
+    #main_content{
+       margin:0;
+       float: inherit;
+       .tabs .comments {
+         .active_admin_comment {
+           clear: none;
+         }
+       }
+     }
+
+  }
+
+
+
+
+  .table_tools:after {
+    clear: none;
+    padding-bottom: 16px;
+  }
+}
+

app/assets/stylesheets/active_admin_sidebar/index.css

@@ -0,0 +1,44 @@
+body.active_admin #active_admin_content.left_sidebar {
+  #sidebar{
+    margin-left:0;
+  }
+
+  .paginated_collection_contents{
+    clear: none;
+    float: left;
+    width: 100%;
+  }
+
+  .blank_slate_container{
+    clear:none;
+  }
+
+  .columns {
+      clear: none;
+  }  
+
+  #main_content_wrapper{
+    float:inherit;
+    width:auto;
+    margin-left: 298px;
+    #main_content{
+       margin:0;
+       float: inherit;
+       .tabs .comments {
+         .active_admin_comment {
+           clear: none;
+         }
+       }
+     }
+
+  }
+
+
+
+
+  .table_tools:after {
+    clear: none;
+    padding-bottom: 16px;
+  }
+}
+

app/assets/stylesheets/active_admin_sidebar/index.css.scss

@@ -4,12 +4,14 @@
 require 'active_admin_sidebar/positions'
 
 module ActiveAdminSidebar
+  module  Rails
   class Engine < Rails::Engine
       config.after_initialize do
           ActiveAdmin::BaseController.send :include, ActiveAdminSidebar::Positions
       end
   end
 end
+end
 
 
 

lib/active_admin_sidebar.rb

@@ -1,3 +1,3 @@
 module ActiveAdminSidebar
-  VERSION = "0.0.5"
+  VERSION = "0.1.0.pre"
 end