hotfix ayann#2

FabioRos · Jun 21, 2016 · 0fc44b3 · 0fc44b3
1 parent 5a53d30
commit 0fc44b3
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -61,6 +61,8 @@ include also font awesome
      
     @import "font-awesome";
 
+    //in some case should be specified css ( @import "font-awesome.css"; )
+
 include active flat skin js
 
     # active_admin.js

diff --git a/bin/console b/bin/console
@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
+require 'font-awesome-rails'
 require "active_admin_flat_skin"
 
 # You can add fixtures and/or initialization code here to make experimenting
@@ -10,5 +11,6 @@ require "active_admin_flat_skin"
 # require "pry"
 # Pry.start
 
+
 require "irb"
 IRB.start
diff --git a/lib/active_admin_flat_skin.rb b/lib/active_admin_flat_skin.rb
@@ -1,4 +1,5 @@
 require "active_admin_flat_skin/version"
+require "font-awesome-rails"
 
 module ActiveAdminFlatSkin
   class Engine < ::Rails::Engine

diff --git a/vendor/assets/stylesheets/active_admin_flat_skin.scss b/vendor/assets/stylesheets/active_admin_flat_skin.scss
@@ -8,4 +8,5 @@
 @import "filter";
 @import "panel";
 @import "overlay_overview";
-@import "footer";
+@import "footer";
+@import "font-awesome";
diff --git a/vendor/assets/stylesheets/active_admin_skin.scss b/vendor/assets/stylesheets/active_admin_skin.scss
@@ -548,4 +548,15 @@ html {
   .cke_toolgroup, .cke_combo_button {
     border-radius: 0 !important;
   }
+
+  #active_admin_content.with_sidebar #sidebar{
+    width: 100%;
+    float:right;
+    order: 1;
+  }
+  #active_admin_content.with_sidebar #main_content{
+    width: 100%;
+    float: left;
+    order: 2;
+  }
 }