Skip to content

added in fourth item in feature box and adjusted mobile responsiveness #41

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 2 commits into from
Jan 4, 2017

Conversation

chanonroy
Copy link
Contributor

screen shot 2017-01-03 at 5 48 44 pm

Looking to contribute more, holla if you need more help

@yocontra
Copy link
Member

yocontra commented Jan 3, 2017

Copy is duplicated between this and the first item. You can revert the copy for the first item to what it used to be to rectify that.

@chanonroy
Copy link
Contributor Author

Ah. Just noticed now.

Re: first item's old copy
Is this the copy you're referring to? (from the marvelapp mockup)
"By preferring code over configuration, gulp keeps things simple and makes complex tasks manageable"

Looking at the overall picture now, I can see why the 'Easy to Learn' feature item may have been omitted. Let me know if this is still a worthwhile effort. Otherwise, I can pick up on an official 'help wanted' issue.

@yocontra
Copy link
Member

yocontra commented Jan 4, 2017

@chanonroy Yep, that copy. Title too. I think they're different enough to have both.

@@ -66,6 +66,7 @@ body {
}
.subheading + .paragraph {
margin-top: 10px;
padding: 0 30px 0 30px;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(optional) - makes padding for text copy look similar to the mockup

@yocontra
Copy link
Member

yocontra commented Jan 4, 2017

@chanonroy It seems like the latest changes updated the existing copy to the old stuff, but didn't add the new section to replace the lost copy?

@chanonroy
Copy link
Contributor Author

chanonroy commented Jan 4, 2017

@contra - it didn't carry over from the first Pull Request commit? On my fork the new section with lost copy is still there. Did it have to do with the way that the last commit updated the Pull Request?

@yocontra yocontra merged commit 35ff78e into gulpjs:master Jan 4, 2017
@yocontra
Copy link
Member

yocontra commented Jan 4, 2017

Hmm, looks a little funky:

image

@chanonroy
Copy link
Contributor Author

chanonroy commented Jan 4, 2017

Hmm. It should not look like that. Checking now.

@chanonroy
Copy link
Contributor Author

chanonroy commented Jan 4, 2017

@contra - is this using the updated main.css? I copied the old stylesheet in and it looks funky like yours. The updated stylesheet from the commits achieve a look similar to the first photo I posted.

@yocontra
Copy link
Member

yocontra commented Jan 4, 2017

@chanonroy I merged your whole PR so all the changes in here were deployed.

@chanonroy
Copy link
Contributor Author

chanonroy commented Jan 4, 2017

commit

I'm looking at the merge. I could be wrong, but I feel like every 'remove' line in red (#1) is something that I intended to add, and that every 'add' line in green (#2) is something that I intended to remove.

Something funky going on here.

@chanonroy
Copy link
Contributor Author

chanonroy commented Jan 4, 2017

Worse comes to worse, we can always revert it to the original with 3 feature boxes. This might be a lot of effort for very minimal changes.

@yocontra
Copy link
Member

yocontra commented Jan 4, 2017

@chanonroy Reverted it while you work it out - send a new PR when ready.

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
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy