diff --git a/app/assets/sass/_errors.scss b/app/assets/sass/_errors.scss new file mode 100644 index 00000000..116ea59f --- /dev/null +++ b/app/assets/sass/_errors.scss @@ -0,0 +1,24 @@ +body.error-page { + background-color: #f3f3f4; + + .middle-box { + height: 400px; + width: 400px; + position: absolute; + top: 50%; + left: 50%; + margin-top: -250px; + margin-left: -200px; + z-index: 100; + + h1 { + font-size: 9em; + } + } + + h3 { + &.font-bold { + font-weight: 600; + } + } +} diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index 18c76b90..9aef2615 100644 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -25,3 +25,6 @@ html, body { // Status Page will need to override certain styles. @import "status-page"; + +// Error pages can have their own overrides. +@import "errors"; diff --git a/app/views/errors/404.blade.php b/app/views/errors/404.blade.php index 888b2248..b54409c9 100644 --- a/app/views/errors/404.blade.php +++ b/app/views/errors/404.blade.php @@ -1,8 +1,15 @@ -@extends('layout.master') +@extends('layout.error') @section('content') -
-

This page is missing.

-

We've no idea.

+
+

404

+

Page Not Found

+ +
+

Sorry, but the page you are looking for has not been found. Check the URL for errors and try again.

+

+ Home +

+
@stop diff --git a/app/views/layout/error.blade.php b/app/views/layout/error.blade.php new file mode 100644 index 00000000..4c5e2ca5 --- /dev/null +++ b/app/views/layout/error.blade.php @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + {{ $pageTitle ?: Setting::get('app_name') }} Status + + + + + @include('partials.stylesheet') + + @if($stylesheet = Setting::get('stylesheet')) + + @endif + + + + +
+ @yield('content') +
+ + diff --git a/public/build/css/all-d71ab75f.css b/public/build/css/all-16923627.css similarity index 99% rename from public/build/css/all-d71ab75f.css rename to public/build/css/all-16923627.css index 19875aed..b9926fcd 100644 --- a/public/build/css/all-d71ab75f.css +++ b/public/build/css/all-16923627.css @@ -4964,3 +4964,19 @@ body.status-page { text-align: center; border-top: 1px solid #ecf0f1; background-color: #fbfcfc; } + +body.error-page { + background-color: #f3f3f4; } + body.error-page .middle-box { + height: 400px; + width: 400px; + position: absolute; + top: 50%; + left: 50%; + margin-top: -250px; + margin-left: -200px; + z-index: 100; } + body.error-page .middle-box h1 { + font-size: 9em; } + body.error-page h3.font-bold { + font-weight: 600; } diff --git a/public/build/css/all.css b/public/build/css/all.css index 19875aed..b9926fcd 100644 --- a/public/build/css/all.css +++ b/public/build/css/all.css @@ -4964,3 +4964,19 @@ body.status-page { text-align: center; border-top: 1px solid #ecf0f1; background-color: #fbfcfc; } + +body.error-page { + background-color: #f3f3f4; } + body.error-page .middle-box { + height: 400px; + width: 400px; + position: absolute; + top: 50%; + left: 50%; + margin-top: -250px; + margin-left: -200px; + z-index: 100; } + body.error-page .middle-box h1 { + font-size: 9em; } + body.error-page h3.font-bold { + font-weight: 600; } diff --git a/public/build/rev-manifest.json b/public/build/rev-manifest.json index 8a5f2f4c..75fd7291 100644 --- a/public/build/rev-manifest.json +++ b/public/build/rev-manifest.json @@ -1,4 +1,4 @@ { - "css/all.css": "css/all-d71ab75f.css", + "css/all.css": "css/all-16923627.css", "js/all.js": "js/all-4554a981.js" } \ No newline at end of file