diff --git a/Changelog.md b/Changelog.md index c3bd5f787..a4097696b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -6,6 +6,7 @@ * Rename bitcoin_wallet_id setting to bitcoin_address [#4485](https://github.com/diaspora/diaspora/pull/4485) * Batch insert posts into stream collection for a small speedup [#4341](https://github.com/diaspora/diaspora/pull/4351) * Ported fileuploader to Backbone and refactored publisher views [#4480](https://github.com/diaspora/diaspora/pull/4480) +* Refactor 404.html, fix [#4078](https://github.com/diaspora/diaspora/issues/4078) ## Bug fixes * Highlight down arrow at the user menu on hover [#4441](https://github.com/diaspora/diaspora/pull/4441) diff --git a/public/404.css b/public/404.css new file mode 100644 index 000000000..b0d7864ad --- /dev/null +++ b/public/404.css @@ -0,0 +1,52 @@ +@font-face { + font-family:Roboto; + src: local("Roboto-Regular.ttf") +} + +@font-face { + font-family:Roboto-BoldCondensed; + src: local("Roboto-BoldCondensed.ttf") +} + +html { + background: url("bgpattern.png") #ebebeb; + text-align: center; +} + +body { + width: 100%; + height: 100%; + position: fixed; + bottom:0px; + margin: 0px; + font-family: Roboto, Helvetica, Arial, sans-serif; + text-align: center; + text-shadow: 0 1px 0 #fff; + color: #666; + background: url("peeping-tom.png") no-repeat bottom; +} + +#big-number { + font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif; + font-size: 250px; + text-shadow: 0 2px 0 #fff, 0 -1px 0 #999; + color: #ddd; +} + +a { + text-decoration : none; + color : rgb(42,156,235); +} + +a:hover { + text-decoration : underline; +} + +.transparent { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; + filter: alpha(opacity=80); + opacity: 0.8; + -moz-opacity: 0.8; + -khtml-opacity: 0.8; + -webkit-opacity: 0.8; +} diff --git a/public/404.html b/public/404.html index f2d8f6910..f329c6708 100644 --- a/public/404.html +++ b/public/404.html @@ -1,85 +1,14 @@ - - The page you were looking for doesn't exist (404) - - - - - -
- 404 -
- -
- These are not the kittens you're looking for. Move along. -
-
- - Go Back? - -
- - - + + The page you were looking for doesn't exist (404) + + + + + +
404
+

These are not the kittens you're looking for. Move along.

+

Go Back?

+