Skip to content

Added error link on 404 pages#2792

Merged
ErisDS merged 1 commit intoTryGhost:masterfrom
jxhn:2298-error-page
Jun 1, 2014
Merged

Added error link on 404 pages#2792
ErisDS merged 1 commit intoTryGhost:masterfrom
jxhn:2298-error-page

Conversation

@jxhn
Copy link
Contributor

@jxhn jxhn commented May 22, 2014

closes #2722, closes #2298

  • added hyperlink to error templates
  • added class for styling hyperlinks on error pages

@JohnONolan
Copy link
Member

Any PR that introduces visual changes needs screenshot(s) to accompany. For sanity / ease of review / and history.

I think the copy would maybe be better as: Go to the front page →

@jxhn
Copy link
Contributor Author

jxhn commented May 23, 2014

I'll redo the copy (→ inclusive? ) and screen cap tonight or this weekend.

@JohnONolan
Copy link
Member

Yep including the arrow :)

@ErisDS
Copy link
Member

ErisDS commented May 31, 2014

@jomahoney ping? 😺

@jxhn
Copy link
Contributor Author

jxhn commented May 31, 2014

@ErisDS Laptop died earlier in the week 😧 Using a replacement now, PR ready tonight, like actually tonight.

@jxhn
Copy link
Contributor Author

jxhn commented May 31, 2014

Submitting the PR as @JohnONolan suggested
screen shot 2014-05-31 at 21 16 59

@jxhn
Copy link
Contributor Author

jxhn commented May 31, 2014

I don't know how I managed the last commit but the PR https://github.com/jomahoney/Ghost/commit/24d5885a61eb0800c9ee7c5786e6922c1229a2fa should be the one accepted. Sorry for messing this up so much, if you want a clean new PR let me know.

@ErisDS
Copy link
Member

ErisDS commented Jun 1, 2014

Yes pleae to the clean PR, but it shouldn't be necessary to make a new one, it should be possible to clean this one. We have instructions on how to manage PRs in the contributing guidelines, specifically here: https://github.com/TryGhost/Ghost/wiki/Git-workflow#clean-up-history

I imagine that this happened because you tried to do a merge, rather than a rebase? I'm always interested to understand what goes wrong so that I can update our guidelines to be more helpful.

I think the easiest way to clean this up would be to cherry-pick the changes you want to keep onto a fresh copy of master, and then squash. Once you've got a branch you're happy with, you can delete your existing 2298-error-page branch, and then rename your clean branch to 2298-error-page, push it, and the PR will update with your nice clean branch! Let me know if you need more help :)

closes #2298
- added hyperlink to error templates
- added class for styling hyperlinks on error pages
@jxhn
Copy link
Contributor Author

jxhn commented Jun 1, 2014

Hope that's ok, I think my merging came about as I used git push -u and got a lot of complaints and started to follow what git suggested. Needless to say git push -f worked a charm this time around.

Hope you're happy with the PR and sorry for the few months delay.

ErisDS added a commit that referenced this pull request Jun 1, 2014
@ErisDS ErisDS merged commit 61dbed0 into TryGhost:master Jun 1, 2014
@jxhn jxhn deleted the 2298-error-page branch June 1, 2014 18:20
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.

404 link

3 participants