nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'stable' into develop

Browse source
This commit is contained in:
Jonne Haß 2015-07-22 11:55:59 +02:00
commit 3af30718f9
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -58,6 +58,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
## Bug fixes ## Bug fixes
* Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212) * Fix indentation and a link title on the default home page [#6212](https://github.com/diaspora/diaspora/pull/6212)
* Bring peeping Tom on the 404 page back [#6226](https://github.com/diaspora/diaspora/pull/6226)
## Features ## Features

4
app/assets/stylesheets/error_pages.scss
View file

@ -1,6 +1,8 @@
@import 'colors'; @import 'colors';
@import 'mixins'; @import 'mixins';
html { min-height: 100%; }
#big-number { #big-number {
font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif; font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif;
font-size: 250px; font-size: 250px;
@ -27,7 +29,6 @@
#error_404 { #error_404 {
width: 100%; width: 100%;
height: 100%; height: 100%;
position: fixed;
bottom:0px; bottom:0px;
margin: 0px; margin: 0px;
font-family: Roboto, Helvetica, Arial, sans-serif; font-family: Roboto, Helvetica, Arial, sans-serif;
@ -35,6 +36,7 @@
text-shadow: 0 1px 0 #fff; text-shadow: 0 1px 0 #fff;
color: #666; color: #666;
background: image-url("peeping-tom.png") no-repeat bottom; background: image-url("peeping-tom.png") no-repeat bottom;
background-attachment: fixed;
#big-number { #big-number {
font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif; font-family: Roboto-BoldCondensed, Helvetica, Arial, sans-serif;