Add style to exception page

diff --git a/images/friendica-404_svg_flexy-o-hare.png b/images/friendica-404_svg_flexy-o-hare.png
new file mode 100644 (file)
index 0000000..36d6b5c
Binary files /dev/null and b/images/friendica-404_svg_flexy-o-hare.png differ

diff --git a/images/friendica-404_svg_hare-bottom-light-inside.png b/images/friendica-404_svg_hare-bottom-light-inside.png
new file mode 100644 (file)
index 0000000..6c9189e
Binary files /dev/null and b/images/friendica-404_svg_hare-bottom-light-inside.png differ

diff --git a/src/Module/Special/HTTPException.php b/src/Module/Special/HTTPException.php
index 5c6ff79ae6188385f95f2246993f05c88d8ff16e..6446ec38cb3bc764cbba57504204e787dd3a1486 100644 (file)
--- a/src/Module/Special/HTTPException.php
+++ b/src/Module/Special/HTTPException.php
@@ -52,14 +52,14 @@ class HTTPException
                        $message = defaults($explanation, $e->getCode(), '');
                }
 
-               return ['$title' => $title, '$description' => $message];
+               return ['$title' => $title, '$message' => $message, '$back' => L10n::t('Go back')];
        }
 
        /**
         * Displays a bare message page with no theming at all.
         *
         * @param \Friendica\Network\HTTPException $e
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \Exception
         */
        public static function rawContent(\Friendica\Network\HTTPException $e)
        {
@@ -78,7 +78,7 @@ class HTTPException
         *
         * @param \Friendica\Network\HTTPException $e
         * @return string
-        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \Exception
         */
        public static function content(\Friendica\Network\HTTPException $e)
        {

diff --git a/view/global.css b/view/global.css
index b48fa1a24abd3986a4047a57947350eb7ad198bf..b729f1fa8e84918aec04e2add32650225a121c6b 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -5,7 +5,7 @@ details > summary {
   cursor: pointer;
 }
 
-/* General designing elements */
+/* General design elements */
 .btn {
   outline: none;
   -moz-box-shadow: inset 0px 1px 0px 0px #ffffff;
@@ -87,7 +87,6 @@ span.connector {
 
 .wall-item-container .wall-item-content .type-link img.attachment-image,
 .type-link img.attachment-image, .type-video img.attachment-image  {
-  /* max-width: 640px; */
   max-width: 100%;
   max-height: initial;
   float: initial;
@@ -621,3 +620,22 @@ span.emoji.mastodon img {
   height: 1.2em;
   vertical-align: middle;
 }
+
+/* Exception page */
+
+#exception {
+  overflow: hidden;
+  background-image: url('../images/friendica-404_svg_hare-bottom-light-inside.png');
+  background-position: 50px bottom;
+  background-repeat: no-repeat;
+}
+
+#exception .hare {
+  float: right;
+}
+
+@media screen and (max-width: 600px) {
+  #exception .hare {
+    display: none;
+  }
+}
\ No newline at end of file

diff --git a/view/templates/exception.tpl b/view/templates/exception.tpl
index 02b7648e3a0f584ea8bc9312db1ca067f7be81f6..6c261689087938201bf1f4bfb3fbeee1e36d02b5 100644 (file)
--- a/view/templates/exception.tpl
+++ b/view/templates/exception.tpl
@@ -1,4 +1,6 @@
 <div id="exception" class="generic-page-wrapper">
+    <img class="hare" src="images/friendica-404_svg_flexy-o-hare.png"/>
     <h1>{{$title}}</h1>
     <p>{{$message}}</p>
+       <p><button type="button" onclick="window.history.back()" class="btn btn-primary">{{$back}}</button></p>
 </div>

diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css
index e6b42e52eae9e890c124526a597727b9ffc548e6..4a72628352891da6a7c77a7e4e8fc3bce158012f 100644 (file)
--- a/view/theme/frio/css/style.css
+++ b/view/theme/frio/css/style.css
@@ -105,6 +105,9 @@ blockquote {
  * mobile aside
  */
 @media screen and (max-width: 990px) {
+    body {
+        padding-top: 105px;
+    }
     aside{
         position: fixed!important;
         top: 0!important;
@@ -616,6 +619,10 @@ nav.navbar a, nav.navbar .btn-link {
     display: flex;
 }
 
+#friendica-logo-mask {
+    display: block;
+}
+
 
 /* Notification Menu */
 #topbar-first #nav-notifications-menu {