Merge pull request #7092 from MrPetovan/task/7047-theme-error-page
Add style to exception page
This commit is contained in:
commit
14d8c12130
6 changed files with 32 additions and 5 deletions
BIN
images/friendica-404_svg_flexy-o-hare.png
Normal file
BIN
images/friendica-404_svg_flexy-o-hare.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 14 KiB |
BIN
images/friendica-404_svg_hare-bottom-light-inside.png
Normal file
BIN
images/friendica-404_svg_hare-bottom-light-inside.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.9 KiB |
|
@ -52,14 +52,14 @@ class HTTPException
|
||||||
$message = defaults($explanation, $e->getCode(), '');
|
$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.
|
* Displays a bare message page with no theming at all.
|
||||||
*
|
*
|
||||||
* @param \Friendica\Network\HTTPException $e
|
* @param \Friendica\Network\HTTPException $e
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
public static function rawContent(\Friendica\Network\HTTPException $e)
|
public static function rawContent(\Friendica\Network\HTTPException $e)
|
||||||
{
|
{
|
||||||
|
@ -78,7 +78,7 @@ class HTTPException
|
||||||
*
|
*
|
||||||
* @param \Friendica\Network\HTTPException $e
|
* @param \Friendica\Network\HTTPException $e
|
||||||
* @return string
|
* @return string
|
||||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
* @throws \Exception
|
||||||
*/
|
*/
|
||||||
public static function content(\Friendica\Network\HTTPException $e)
|
public static function content(\Friendica\Network\HTTPException $e)
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,7 +5,7 @@ details > summary {
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* General designing elements */
|
/* General design elements */
|
||||||
.btn {
|
.btn {
|
||||||
outline: none;
|
outline: none;
|
||||||
-moz-box-shadow: inset 0px 1px 0px 0px #ffffff;
|
-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,
|
.wall-item-container .wall-item-content .type-link img.attachment-image,
|
||||||
.type-link img.attachment-image, .type-video img.attachment-image {
|
.type-link img.attachment-image, .type-video img.attachment-image {
|
||||||
/* max-width: 640px; */
|
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
max-height: initial;
|
max-height: initial;
|
||||||
float: initial;
|
float: initial;
|
||||||
|
@ -621,3 +620,22 @@ span.emoji.mastodon img {
|
||||||
height: 1.2em;
|
height: 1.2em;
|
||||||
vertical-align: middle;
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,4 +1,6 @@
|
||||||
<div id="exception" class="generic-page-wrapper">
|
<div id="exception" class="generic-page-wrapper">
|
||||||
|
<img class="hare" src="images/friendica-404_svg_flexy-o-hare.png"/>
|
||||||
<h1>{{$title}}</h1>
|
<h1>{{$title}}</h1>
|
||||||
<p>{{$message}}</p>
|
<p>{{$message}}</p>
|
||||||
|
<p><button type="button" onclick="window.history.back()" class="btn btn-primary">{{$back}}</button></p>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -105,6 +105,9 @@ blockquote {
|
||||||
* mobile aside
|
* mobile aside
|
||||||
*/
|
*/
|
||||||
@media screen and (max-width: 990px) {
|
@media screen and (max-width: 990px) {
|
||||||
|
body {
|
||||||
|
padding-top: 105px;
|
||||||
|
}
|
||||||
aside{
|
aside{
|
||||||
position: fixed!important;
|
position: fixed!important;
|
||||||
top: 0!important;
|
top: 0!important;
|
||||||
|
@ -616,6 +619,10 @@ nav.navbar a, nav.navbar .btn-link {
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#friendica-logo-mask {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* Notification Menu */
|
/* Notification Menu */
|
||||||
#topbar-first #nav-notifications-menu {
|
#topbar-first #nav-notifications-menu {
|
||||||
|
|
Loading…
Reference in a new issue