-
Notifications
You must be signed in to change notification settings - Fork 2.3k
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.
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
Embed bootstrap-sass (locked at version 2.3.2.2). #1799
Embed bootstrap-sass (locked at version 2.3.2.2). #1799
Conversation
@sferik I'm not sure while Travis failed this build; I've run |
@jcoleman Thanks for doing this. Saved me a lot of time. However, including bootstrap-sass in the app breaks because of a conflict with the bootstrap-sass.rb file in rails_admin. This commit fixes the namespacing issue. Tests pass and app works. I'm now going to try making a Bootstrap 3 specific theme. It would be great if devs could choose between Bootstrap 2/3 by just using different themes. |
@simple10 Good catch! I've squashed your commit into the single commit I made so that this branch and pull request now reflects the total change in a single commit for the sake of keeping the history clean. |
I'm afraid that we lose ability to upgrade embedded bootstrap files if we go this way. |
Our trunk build was broken for a while so I think the build breakage may be our fault. Now that master builds cleanly I've restarted your build. |
If you bootstrapped them, why not remove the bootstrap 2 dependency? I thought this commit was related to us trying to use bootstrap 3 with rails admin? |
What's the status on the main branch? When will this be merged? The themefied idea seems awesome for folks to define which versions of bootstrap they require. Thanks. |
Embed bootstrap-sass (locked at version 2.3.2.2).
Merged 🔨 |
I am getting the issue with bootstrap-sass using rails 3.2, I have changed my gemfile to However, the master branch requires rails 4. How can I solve this issue when using rails 3.2? |
@mrjlynch If you can find the commit immediately prior to the one that bumped the rails version requirement to 4 from 3.2, then you should be able to (on your local checkout of your own fork) run |
Has anyone done what @jcoleman suggests here? If not, I'll give it a go and share if I get anywhere. |
@kprentiss I have just done what jcoleman suggested https://github.com/sumitag/rails_admin/tree/my_backported_branch |
This is a replacement pull request for #1733 that fixes the issues with the original and passes all tests cleanly.
The big difference is that while the original embedded the scss files from bootstrap-sass, it didn't embedded the lib code that was necessary for all of that to work.
I've also namespaced the bootstrap files (they're all inside the respective rails_admin directories) so that they don't interfere with a Rails app using a newer version of bootstrap by being globally available in the root include paths.