-
-
Notifications
You must be signed in to change notification settings - Fork 119
Added case studies section #159
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
Conversation
There's a conflict as well. That must have been because my code was wrriten before Joe's section2 tiles were merged to the master. Should I update my local repo, make my changes and delete this pull request? Update: I did git fetched and git merged updates from the numpy repo master, and that made the changes that Joe did. I also changed the remote origin for my fork. However, there is still a merge conflict. |
@MarsBarLee I resolved the conflict, but there's a couple other things we may want to fix styling-wise. I'm a bit busy today, but will do a deeper dive this weekend. |
@MarsBarLee, thanks for helping out with the tile page! The mock up had links to these images - and source credits listed. If that does not suffice and imposes royalty liabilities we can switch pictures to free ones available online from say unsplash... Here are some examples: Tesla: https://unsplash.com/photos/jwyO3NhPZKQ |
Regarding :
The process I've been using is to work with branches created out of my fork. I keep updating changes into my fork branch (say issue_num) until I am ready to issue a PR into NumPy.org - as suggested by @gommers. Once merge happens, I rebase my fork. Jfyi, if that helps. |
Looks like a good start! I like the styling. The one issue I see when I build locally is that the tiles are very long vertically for some reason: Regarding branches: let's keep the current one as is, but for future PRs it's indeed much better to do what @shaloo describes, pushing to your own fork and sending the PR from there. |
Thanks for the comments! I'll update the images with the link @shaloo provided. It took a bit of research for me but I now understand how to pull and merge the changes that @joelachance made. |
Tiles look good to me now! Ready to go once the merge conflict left overs are cleaned up. |
This looks good design and code wise now. I had one minor comment left on naming: using The other part I was trying to double check is image copyright (preferably we use fully unencumbered ones):
EDIT2: one other small thing: the 3 remaining tiles should be centered under the section title |
@MarsBarLee, @rgommers : I was curious to see how the card tiles look so I checked out issues_129 branch. However, I don't see tiles but a case-studies section after ecosystem tabs and 3 pictures one below other. What am I missing? Why don't I see three vertical tiles side by side? |
@shaloo those issues were introduced when fixing a merge conflict, I pushed a fix (@MarsBarLee please check!): One issue left (other than adding summary text and linking the actual case studies), the 3 tiles aren't nicely centered below the section title. |
Hi all, I apologize for the delay. I've centered the columns and pulled the changes @rgommers has made. I learnt about rebasing commits, resolving merge conflicts and gitk. I was not able to squash my commits, as they were already pushed. Next time, I'll make to push fro my fork, pull changes from the upstream master, squash commits before pushing and rebase if necessary. |
Thanks Mars. No worries about git, you got it right now - that al sounds good:) I'm not sure about the last commit, the tiles look a little uncomfortably spaced: In |
@rgommers Made those changes as you suggested. |
Looks good to me now, merged! Thanks @MarsBarLee |
This is what I have so far.

The styling of the cards is based off Joe's section2 tiles.
It's based on Shaloo's recent mockup

I have a few questions:
What section number should the case studies be? I currently have it as section3, so I have section3.html, section3.css and replaced section3 in the config.yaml file.
I also have pushed this branch on the numpy.org repo rather than my forked repo. Would it be better to make this pull request from my forked repo?
I've also added images to the content_images folder. I change them to placeholder images since I'm not sure if they're royalty free.
Issue 129