Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Bootstrap as a dependency #1

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Remove Bootstrap as a dependency #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
acf6011
Removed bootstrap as a gemfile dependency
zimkies Jan 3, 2014
9172623
Remove invalid commenting in rails_admin.css
zimkies Jan 3, 2014
b9ad6d4
Try using bootstrap-sass 3 as a dependency
zimkies Jan 3, 2014
d6d33b9
Remove bootstrap-sass as a dependency again
zimkies Jan 3, 2014
5a2e4ef
Removed precompilations step of rails_admin.css
Jan 5, 2014
9daf800
Use precompiled css stored on s3
Jan 6, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ tmp/**/*
.idea/*.xml
.sass-cache
nbproject
vendor
25 changes: 25 additions & 0 deletions app/assets/stylesheets/rails_admin/rails_admin.css
View file
Open in desktop

Large diffs are not rendered by default.

74 changes: 0 additions & 74 deletions app/assets/stylesheets/rails_admin/rails_admin.scss.erb
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/views/layouts/rails_admin/application.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
%meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
%meta{:content => "NONE,NOARCHIVE", :name => "robots"}
= csrf_meta_tag
= stylesheet_link_tag "rails_admin/rails_admin.css", :media => :all
= stylesheet_link_tag "//grouper-assets.s3.amazonaws.com/rails_admin.css", :media => :all
= javascript_include_tag "rails_admin/rails_admin.js"
%body.rails_admin
#loading.label.label-warning{:style => 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
Expand Down
2 changes: 1 addition & 1 deletion lib/rails_admin/engine.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module RailsAdmin
class Engine < Rails::Engine
isolate_namespace RailsAdmin
initializer "RailsAdmin precompile hook", :group => :all do |app|
app.config.assets.precompile += ['rails_admin/rails_admin.js', 'rails_admin/rails_admin.css', 'rails_admin/jquery.colorpicker.js', 'rails_admin/jquery.colorpicker.css']
app.config.assets.precompile += ['rails_admin/rails_admin.js', 'rails_admin/jquery.colorpicker.js', 'rails_admin/jquery.colorpicker.css']
end

initializer "RailsAdmin pjax hook" do |app|
Expand Down
1 change: 0 additions & 1 deletion rails_admin.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ require 'rails_admin/version'

Gem::Specification.new do |spec|
# If you add a dependency, please maintain alphabetical order
spec.add_dependency 'bootstrap-sass', '~> 2.2'
spec.add_dependency 'builder', '~> 3.0'
spec.add_dependency 'coffee-rails', ['>= 3.1', '< 5']
spec.add_dependency 'font-awesome-rails', '~> 3.0'
Expand Down