Merge branch 'error_404_mobile' of git://github.com/movilla/diaspora into movilla-error_404_mobile

Conflicts:
	Changelog.md

Changelog.md

@@ -140,6 +140,7 @@ everything is set up.
 * Fix preview with locator feature. [#4147](https://github.com/diaspora/diaspora/pull/4147)
 * Fix mentions at end of post. [#3746](https://github.com/diaspora/diaspora/issues/3746)
 * Fix missing indent to correct logged-out-header container relative positioning [#4134](https://github.com/diaspora/diaspora/pull/4134)
+* Private post dont show error 404 when you are not authorized on mobile page [#4129](https://github.com/diaspora/diaspora/issues/4129)
 
 ## Features
 

app/assets/stylesheets/mobile.css.scss

@@ -1235,3 +1235,11 @@ input#q.search {
   height: 16px;
   width: 16px;
 }
+
+#big-number {
+  font-size: 120px !important;
+}
+
+#content {
+  font-size: 13px !important;
+}

app/views/errors/not_public.haml

@@ -2,16 +2,9 @@
 -# licensed under the Affero General Public License version 3 or later. See
 -# the COPYRIGHT file.
 
-- if in_mobile_view?
-  :css
-    #big-number{ font-size: 120px;}
-    #content{ font-size: 13px;}
-
 - content_for :head do
   = stylesheet_link_tag :error_pages, :media => 'all'
 
-- content_for :after_content do
-
   #big-number.transparent
     404