Commit: 2b70ec100531dbf3c8f6335d39fe8bb054f8449e - Meghsingh (git)

Never give up

Commit MetaInfo

• Revisión: 2b70ec100531dbf3c8f6335d39fe8bb054f8449e (tree)
• Tiempo: 2013-10-27 04:05:57
• Autor: HMML <hmml3939@gmai...>
• Commiter: HMML

Log Message

Change to use bootstrap-sass and rails_admin on use-static-bootstrap-2 branch.

Cambiar Resumen

• modified: Gemfile
• modified: Gemfile.lock
• modified: app/assets/javascripts/application.js
• delete: app/assets/javascripts/rails_admin/rails_admin.js
• modified: app/assets/stylesheets/application.css.scss
• delete: app/assets/stylesheets/rails_admin/rails_admin.scss.erb

Diferencia incremental

--- a/Gemfile
+++ b/Gemfile
@@ -46,7 +46,8 @@ end
 # gem 'debugger', group: [:development, :test]
 
 gem 'rails_autolink', '~> 1.1.5'
-gem 'anjlab-bootstrap-rails', '~> 3.0.0.3', :require => 'bootstrap-rails'
+#gem 'anjlab-bootstrap-rails', '~> 3.0.0.3', :require => 'bootstrap-rails'
+gem 'bootstrap-sass', '~> 3.0.0.0.rc'
 gem 'rails-i18n'
 gem 'kaminari'
 #gem 'coffeebeans'
@@ -58,7 +59,7 @@ gem 'responders'
 gem 'rspec-rails', group: [:development, :test]
 gem 'paperclip'
 gem 'rubyzip', require: 'zip/zip'
-gem 'rails_admin'
+gem 'rails_admin', github: 'davebrace/rails_admin', branch: 'use-static-bootstrap-2'
 group :develpment do
   gem 'capistrano'
   gem 'capistrano-ext'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -6,6 +6,26 @@ GIT
     client_side_validations (3.2.2)
 
 GIT
+  remote: git://github.com/davebrace/rails_admin.git
+  revision: c6f6ff3110210ee90125a7258fc3fc1186f23088
+  branch: use-static-bootstrap-2
+  specs:
+    rails_admin (0.5.0)
+      builder (~> 3.1)
+      coffee-rails (~> 4.0)
+      font-awesome-rails (~> 3.0)
+      haml (~> 4.0)
+      jquery-rails (~> 3.0)
+      jquery-ui-rails (~> 4.0)
+      kaminari (~> 0.14)
+      nested_form (~> 0.3)
+      rack-pjax (~> 0.7)
+      rails (~> 4.0.0)
+      remotipart (~> 1.0)
+      safe_yaml (~> 0.9)
+      sass-rails (~> 4.0)
+
+GIT
   remote: git://github.com/saveritemedical/client_side_validations-simple_form.git
   revision: b97c938be745de1134169026425aa0c990b8b072
   specs:
@@ -40,12 +60,9 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
-    anjlab-bootstrap-rails (3.0.0.3)
-      railties (>= 3.0)
-      sass (>= 3.2)
     arel (4.0.1)
     atomic (1.1.14)
-    bootstrap-sass (2.3.2.2)
+    bootstrap-sass (3.0.0.0.rc2)
       sass (~> 3.2)
     builder (3.1.4)
     capistrano (2.15.5)
@@ -139,21 +156,6 @@ GEM
       sprockets-rails (~> 2.0.0)
     rails-i18n (0.7.4)
       i18n (~> 0.5)
-    rails_admin (0.5.0)
-      bootstrap-sass (~> 2.3)
-      builder (~> 3.1)
-      coffee-rails (~> 4.0)
-      font-awesome-rails (~> 3.0)
-      haml (~> 4.0)
-      jquery-rails (~> 3.0)
-      jquery-ui-rails (~> 4.0)
-      kaminari (~> 0.14)
-      nested_form (~> 0.3)
-      rack-pjax (~> 0.7)
-      rails (~> 4.0.0)
-      remotipart (~> 1.0)
-      safe_yaml (~> 0.9)
-      sass-rails (~> 4.0)
     rails_autolink (1.1.5)
       rails (> 3.1)
     railties (4.0.0)
@@ -222,7 +224,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  anjlab-bootstrap-rails (~> 3.0.0.3)
+  bootstrap-sass (~> 3.0.0.0.rc)
   capistrano
   capistrano-ext
   capistrano_colors
@@ -238,7 +240,7 @@ DEPENDENCIES
   paperclip
   rails (= 4.0.0)
   rails-i18n
-  rails_admin
+  rails_admin!
   rails_autolink (~> 1.1.5)
   responders
   rspec-rails

--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -14,18 +14,18 @@
 //= require jquery_ujs
 //= require turbolinks
 
-//= require twitter/bootstrap/transition
-//= require twitter/bootstrap/alert
-// /* disabled */ = require twitter/bootstrap/modal
-//= require twitter/bootstrap/dropdown
-// /* disabled */ = require twitter/bootstrap/scrollspy
-// /* disabled */ = require twitter/bootstrap/tab
-// /* disabled */ = require twitter/bootstrap/tooltip
-// /* disabled */ = require twitter/bootstrap/popover
-//= require twitter/bootstrap/button
-//= require twitter/bootstrap/collapse
-//= require twitter/bootstrap/carousel
-//= require twitter/bootstrap/affix
+//= require bootstrap/transition
+//= require bootstrap/alert
+// /* disabled */ = require bootstrap/modal
+//= require bootstrap/dropdown
+// /* disabled */ = require bootstrap/scrollspy
+// /* disabled */ = require bootstrap/tab
+// /* disabled */ = require bootstrap/tooltip
+// /* disabled */ = require bootstrap/popover
+//= require bootstrap/button
+//= require bootstrap/collapse
+//= require bootstrap/carousel
+//= require bootstrap/affix
 
 //= rails.validations
 //= rails.validations.simple_form

--- a/app/assets/javascripts/rails_admin/rails_admin.js
+++ /dev/null
@@ -1,21 +0,0 @@
-//=  require 'jquery'
-//=  require 'jquery_ujs'
-//=  require 'rails_admin/jquery.remotipart.fixed'
-//=  require 'jquery.ui.effect'
-//=  require 'jquery.ui.sortable'
-//=  require 'jquery.ui.autocomplete'
-//=  require 'jquery.ui.datepicker'
-//=  require 'rails_admin/jquery.ui.timepicker'
-//=  require 'rails_admin/ra.datetimepicker'
-//=  require 'rails_admin/jquery.colorpicker'
-//=  require 'rails_admin/ra.filter-box'
-//=  require 'rails_admin/ra.filtering-multiselect'
-//=  require 'rails_admin/ra.filtering-select'
-//=  require 'rails_admin/ra.remote-form'
-//=  require 'rails_admin/jquery.pjax'
-//=  require 'jquery_nested_form'
-//=  require 'rails_admin/ra.nested-form-hooks'
-//=  require 'twitter/bootstrap'
-//=  require 'rails_admin/ra.widgets'
-//=  require 'rails_admin/ui'
-//=  require 'rails_admin/custom/ui'

--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -11,4 +11,4 @@
  *= require_self
  *= require_tree .
  */
-@import "twitter/bootstrap";
+@import "bootstrap";

--- a/app/assets/stylesheets/rails_admin/rails_admin.scss.erb
+++ /dev/null
@@ -1,99 +0,0 @@
-@charset "UTF-8";
-
-<%
-  theme = ENV['RAILS_ADMIN_THEME'] || :default
-%>
-
-/***  Variables  ***/
-$black:                 #000;
-$grayDarker:            #222;
-$grayDark:              #333;
-$gray:                  #555;
-$grayLight:             #999;
-$grayLighter:           #F5F5F5;
-$white:                 #fff;
-$red:                   #f00;
-$blue:                  #00f;
-$green:                 #0f0;
-
-@import "twitter/bootstrap/variables";
-@import "rails_admin/base/variables";
-@import "rails_admin/themes/<%= theme %>/variables";
-@import "rails_admin/custom/variables";
-
-/***  Mixins  ***/
-
-@import "twitter/bootstrap/mixins";
-@import "rails_admin/base/mixins";
-@import "rails_admin/themes/<%= theme %>/mixins";
-@import "rails_admin/custom/mixins";
-
-/*** Reset ***/
-@import "twitter/bootstrap/normalize";
-@import "twitter/bootstrap/print";
-
-/***  Libraries  ***/
-
-@import "rails_admin/aristo/jquery-ui-1.8.7.custom";
-@import "rails_admin/jquery.ui.timepicker";
-@import "rails_admin/ra.calendar-additions";
-@import "rails_admin/ra.filtering-multiselect";
-@import "rails_admin/ra.widgets";
-@import "rails_admin/jquery.colorpicker";
-
-/*** Font-awesome ***/
-
-@import 'font-awesome';
-
-/***  Bootstrap Theming  ***/
-
-// Core CSS
-@import "twitter/bootstrap/scaffolding";
-@import "twitter/bootstrap/type";
-@import "twitter/bootstrap/code";
-@import "twitter/bootstrap/grid";
-@import "twitter/bootstrap/tables";
-@import "twitter/bootstrap/forms";
-@import "twitter/bootstrap/buttons";
-
-// Components
-@import "twitter/bootstrap/component-animations";
-@import "twitter/bootstrap/glyphicons";
-@import "twitter/bootstrap/dropdowns";
-@import "twitter/bootstrap/button-groups";
-@import "twitter/bootstrap/input-groups";
-@import "twitter/bootstrap/navs";
-@import "twitter/bootstrap/navbar";
-@import "twitter/bootstrap/breadcrumbs";
-@import "twitter/bootstrap/pagination";
-@import "twitter/bootstrap/pager";
-@import "twitter/bootstrap/labels";
-@import "twitter/bootstrap/badges";
-@import "twitter/bootstrap/jumbotron";
-@import "twitter/bootstrap/thumbnails";
-@import "twitter/bootstrap/alerts";
-@import "twitter/bootstrap/progress-bars";
-@import "twitter/bootstrap/media";
-@import "twitter/bootstrap/list-group";
-@import "twitter/bootstrap/panels";
-@import "twitter/bootstrap/wells";
-@import "twitter/bootstrap/close";
-
-// Components w/ JavaScript
-@import "twitter/bootstrap/modals";
-@import "twitter/bootstrap/tooltip";
-@import "twitter/bootstrap/popovers";
-@import "twitter/bootstrap/carousel";
-
-// Utility classes
-@import "twitter/bootstrap/utilities";
-@import "twitter/bootstrap/responsive-utilities";
-
-/***  RailsAdmin Theming  ***/
-
-@import "rails_admin/base/theming";
-@import "rails_admin/themes/<%= theme %>/theming";
-@import "rails_admin/custom/theming";
-
-
-