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

Responsive master #1935

Merged
merged 15 commits into from Sep 30, 2014

Conversation

Projects
None yet
4 participants
@johnmartin
Copy link
Contributor

commented Sep 18, 2014

I've taken from ckan:responsive-2.2 and re-git amed the commits into the laster master to make this easy to merge.

Note: This will need a paster front-end-build and commit after merging:

paster front-end-build
git commit -am "Rebuild front-end"
@amercader

This comment has been minimized.

Copy link
Member

commented Sep 18, 2014

@johnmartin, just to clarify, is the target of this master? If so can you edit the issue title to avoid confusion? Thanks

@johnmartin johnmartin changed the title Responsive 2.2 Responsive master Sep 18, 2014

@johnmartin

This comment has been minimized.

Copy link
Contributor Author

commented Sep 18, 2014

@amercader Agreed. It's for master, so I've updated the title.

@amercader amercader self-assigned this Sep 18, 2014

@amercader

This comment has been minimized.

Copy link
Member

commented Sep 18, 2014

@johnmartin to review

@johnmartin

This comment has been minimized.

Copy link
Contributor Author

commented Sep 18, 2014

@nigelbabu Can you remember what the context of bf726c1 was?

@nigelbabu

This comment has been minimized.

Copy link
Contributor

commented Sep 18, 2014

Yep. Please revert that change. It was only because Sam couldn't get it
working.

Nigel Babu
Senior Sysadmin, Open Knowledge

On 18 September 2014 19:45, John Martin notifications@github.com wrote:

@nigelbabu https://github.com/nigelbabu Can you remember what the
context of bf726c1
bf726c1
was?


Reply to this email directly or view it on GitHub
#1935 (comment).

@johnmartin johnmartin assigned johnmartin and unassigned amercader Sep 30, 2014

@johnmartin

This comment has been minimized.

Copy link
Contributor Author

commented Sep 30, 2014

Note to people with custom themes: If you've changed the {% block secondary_content %} in templates/package/search.html pay close attention as this pull request changes the structure of that template block a little.

Also: There's a few more bootstrap classes (especially for grid layout) that are now going to be in the templates. So pay close attention if any of the following changes might effect your content blocks: https://github.com/ckan/ckan/pull/1935/files

@johnmartin

This comment has been minimized.

Copy link
Contributor Author

commented Sep 30, 2014

@amercader As soon as the build passes I'm happy to merge this. What's the protocol on that at the moment? Is it something I can just do?

@amercader

This comment has been minimized.

Copy link
Member

commented Sep 30, 2014

@johnmartin Do you mind adding a quick note on the CHANGELOG with the changes you mention on the previous commit? They are more likely to be noticed there. Don't worry about the formatting, we'll sort it out on the actual release.

Regarding the merge, you go ahead if you are happy, if not ping me and I'll do it.

johnmartin added a commit that referenced this pull request Sep 30, 2014

@johnmartin johnmartin merged commit cf632a5 into ckan:master Sep 30, 2014

1 check was pending

continuous-integration/travis-ci The Travis CI build is in progress
Details
@amercader

This comment has been minimized.

Copy link
Member

commented Sep 30, 2014

🎆 This is great news, great work @mintcanary and @johnmartin

@johnmartin johnmartin deleted the johnmartin:responsive branch Sep 30, 2014

johnmartin added a commit that referenced this pull request Sep 30, 2014

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.