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.

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

Upgrade to bootstrap 3 #467

Merged
merged 22 commits into from Mar 5, 2015
Merged

Upgrade to bootstrap 3 #467

merged 22 commits into from Mar 5, 2015

Conversation

ghost
Copy link

@ghost ghost commented Mar 5, 2015

Bootstrap 3.2.0 was added.

(I included a lot of changes implemented by @marks on his branch but forked from okfn/recline to start with everything up to date).

How I tested it:

  • Built and tried the demos.
  • Run tests.
  • Tried on Dkan project.

What's pending:

Improve the usage of the grid system on multiview.

@rufuspollock
Copy link
Member

@MSolv this is great!

rufuspollock added a commit that referenced this pull request Mar 5, 2015
@rufuspollock rufuspollock merged commit 32f15f1 into datopian:master Mar 5, 2015
@rufuspollock
Copy link
Member

Hi one question on this merge: I note jquery is still at v1.7. I note bootstrap JS needs jquery >= 1.10 IIRC. Have you looked at bumping jquery and seeing if everything still works.

I anticipate we'll need an upgrade to slickgrid for this to work - see: mleibman/SlickGrid#518

A monkey patch is: mleibman/SlickGrid#518 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants