Move bootstrap-sass to rails_admin namespace

Fixes issue with breaking bootstrap-sass in app. All tests green. App works fine now with bootstrap-sass master (Bootstrap 3).
simple10 · Oct 21, 2013 · 2728c80 · 2728c80
1 parent ad9e935
commit 2728c80
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/rails_admin.rb b/lib/rails_admin.rb
@@ -33,4 +33,4 @@ def self.config(entity = nil, &block)
   end
 end
 
-require 'bootstrap-sass'
+require 'rails_admin/bootstrap-sass' unless defined? Bootstrap
diff --git a/lib/bootstrap-sass.rb → lib/rails_admin/bootstrap-sass.rb b/lib/bootstrap-sass.rb → lib/rails_admin/bootstrap-sass.rb
@@ -1,13 +1,13 @@
-module Bootstrap
+module RailsAdmin::Bootstrap
   class FrameworkNotFound < StandardError; end
 
   # Inspired by Kaminari
   def self.load!
     if compass?
-      require 'bootstrap-sass/compass_functions'
+      require 'rails_admin/bootstrap-sass/compass_functions'
       register_compass_extension
     elsif asset_pipeline?
-      require 'bootstrap-sass/sass_functions'
+      require 'rails_admin/bootstrap-sass/sass_functions'
     end
 
     if rails?
@@ -43,4 +43,4 @@ def self.register_compass_extension
   end
 end
 
-Bootstrap.load!
+RailsAdmin::Bootstrap.load!
diff --git a/lib/bootstrap-sass/compass_functions.rb → ...admin/bootstrap-sass/compass_functions.rb b/lib/bootstrap-sass/compass_functions.rb → ...admin/bootstrap-sass/compass_functions.rb
diff --git a/lib/bootstrap-sass/sass_functions.rb → ...ls_admin/bootstrap-sass/sass_functions.rb b/lib/bootstrap-sass/sass_functions.rb → ...ls_admin/bootstrap-sass/sass_functions.rb
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,4 +33,4 @@ def self.config(entity = nil, &block) @@
       end
     end
-    require 'bootstrap-sass'
+    require 'rails_admin/bootstrap-sass' unless defined? Bootstrap