Skip to content

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

Merged
merged 14 commits into from
Feb 16, 2020
Merged

Added case studies section #159

merged 14 commits into from
Feb 16, 2020

Conversation

MarsBarLee
Copy link
Contributor

This is what I have so far.
CaseStudies

The styling of the cards is based off Joe's section2 tiles.

It's based on Shaloo's recent mockup
image

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

@MarsBarLee
Copy link
Contributor Author

MarsBarLee commented Jan 23, 2020

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.

@joelachance
Copy link
Collaborator

@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.

@shaloo
Copy link
Contributor

shaloo commented Jan 26, 2020

This is what I have so far.
CaseStudies

The styling of the cards is based off Joe's section2 tiles.

It's based on Shaloo's recent mockup
image

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

@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
Cricket ball : https://unsplash.com/photos/oDs_AxeR5g4
Black Hole M87 pic source Event Horizon via their press release https://eventhorizontelescope.org/files/eht/files/20190410-78m-4000x2330.png

@shaloo
Copy link
Contributor

shaloo commented Jan 26, 2020

This is what I have so far.
CaseStudies

The styling of the cards is based off Joe's section2 tiles.

It's based on Shaloo's recent mockup
image

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

Regarding :

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?

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.

@rgommers
Copy link
Member

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:

image

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.

@MarsBarLee
Copy link
Contributor Author

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.
I also realized I didn't squash my commits above- that's why there's 3 commit messages above.
I've also fixed the styling of the cards, as I didn't account for long screen sizes, as @rgommers has.

@rgommers
Copy link
Member

Tiles look good to me now! Ready to go once the merge conflict left overs are cleaned up.

@rgommers rgommers added the design label Feb 1, 2020
@rgommers
Copy link
Member

rgommers commented Feb 1, 2020

This looks good design and code wise now. I had one minor comment left on naming: using section3 everywhere isn't very descriptive, better to use something like section-showcase (or a shorter alternative). This can be done after merge though. EDIT: this is analogous to section2, let's leave as is for now.

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

@shaloo
Copy link
Contributor

shaloo commented Feb 14, 2020

@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?

Screenshot 2020-02-14 at 12 19 17 PM

Screenshot 2020-02-14 at 12 19 23 PM

@rgommers
Copy link
Member

@shaloo those issues were introduced when fixing a merge conflict, I pushed a fix (@MarsBarLee please check!):

image

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.

@rgommers
Copy link
Member

Added some text as well:

image

@InessaPawson
Copy link
Member

Added some text as well:

image

I love all the progress made in this section!

@MarsBarLee
Copy link
Contributor Author

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.

@rgommers
Copy link
Member

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:

image

In section2, the horizontal space between tiles is only the margin, in section3 it is margin plus all the space that's left over - the outer tiles are pushed out, while in section2 they're pushed in. I don't quite see which CSS element(s) make the difference here, but could you try to make it behave the same as section2?

@MarsBarLee
Copy link
Contributor Author

@rgommers Made those changes as you suggested.

@rgommers rgommers merged commit 6402a39 into master Feb 16, 2020
@rgommers rgommers deleted the issu_129 branch February 16, 2020 02:19
@rgommers
Copy link
Member

Looks good to me now, merged! Thanks @MarsBarLee

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

Successfully merging this pull request may close these issues.

5 participants