diff --git a/gulpfile.js b/gulpfile.js index 14d35df..00b8c12 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -140,6 +140,11 @@ gulp.task("sass-dashboard", () => { return processSass("dashboard"); }); +// Task for error page styles +gulp.task("sass-error", () => { + return processSass("error"); +}); + // Task for public javascript gulp.task("js-public", () => { return processVue("app", jsPublic); @@ -191,13 +196,14 @@ gulp.task("watch", () => { gulp.watch([ "app/**/*.php", "routes/**/*.php", "resources/views/**/*.blade.php" ], gulp.series(browserSyncReload)); gulp.watch([ jsPublic, "resources/assets/js/mixins/**/*.js", "resources/components/**/*.vue" ], gulp.series("js-public", browserSyncReload)); gulp.watch(jsDashboard, gulp.series("js-dashboard", browserSyncReload)); - gulp.watch("resources/assets/sass/**/*.scss", gulp.parallel("sass-public", "sass-dashboard")); + gulp.watch("resources/assets/sass/**/*.scss", gulp.parallel("sass-public", "sass-dashboard", "sass-error")); }); // Task to run non-development tasks gulp.task("default", gulp.parallel( "sass-public", "sass-dashboard", + "sass-error", "js-public", "js-public-libs", "js-dashboard", diff --git a/resources/assets/fonts/OpenSans-Bold.eot b/resources/assets/fonts/OpenSans-Bold.eot new file mode 100644 index 0000000..33d971e Binary files /dev/null and b/resources/assets/fonts/OpenSans-Bold.eot differ diff --git a/resources/assets/fonts/OpenSans-Bold.otf b/resources/assets/fonts/OpenSans-Bold.otf new file mode 100644 index 0000000..5183283 Binary files /dev/null and b/resources/assets/fonts/OpenSans-Bold.otf differ diff --git a/resources/assets/fonts/OpenSans-Bold.ttf b/resources/assets/fonts/OpenSans-Bold.ttf new file mode 100644 index 0000000..7b52945 Binary files /dev/null and b/resources/assets/fonts/OpenSans-Bold.ttf differ diff --git a/resources/assets/fonts/OpenSans-Bold.woff b/resources/assets/fonts/OpenSans-Bold.woff new file mode 100644 index 0000000..e37f6e2 Binary files /dev/null and b/resources/assets/fonts/OpenSans-Bold.woff differ diff --git a/resources/assets/fonts/OpenSans-Bold.woff2 b/resources/assets/fonts/OpenSans-Bold.woff2 new file mode 100644 index 0000000..5f11d52 Binary files /dev/null and b/resources/assets/fonts/OpenSans-Bold.woff2 differ diff --git a/resources/assets/sass/_fonts.scss b/resources/assets/sass/_fonts.scss index b7a8075..5ca33ed 100644 --- a/resources/assets/sass/_fonts.scss +++ b/resources/assets/sass/_fonts.scss @@ -10,6 +10,18 @@ font-style: normal; } +@font-face { + font-family: "OpenSans-Bold"; + src: url("/fonts/OpenSans-Bold.eot"); + src: url("/fonts/OpenSans-Bold.eot?#iefix") format("embedded-opentype"), + url("/fonts/OpenSans-Bold.woff") format("woff"), + url("/fonts/OpenSans-Bold.woff2") format("woff2"), + url("/fonts/OpenSans-Bold.ttf") format("truetype"), + url("/fonts/OpenSans-Bold.otf") format("opentype"); + font-weight: normal; + font-style: normal; +} + @mixin normalize-font { -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; @@ -19,3 +31,8 @@ @include normalize-font; font-family: "OpenSans-Regular", Arial, Helvetica, sans-serif; } + +@mixin font-sans-bold { + @include normalize-font; + font-family: "OpenSans-Bold", Arial, Helvetica, sans-serif; +} diff --git a/resources/assets/sass/error.scss b/resources/assets/sass/error.scss new file mode 100644 index 0000000..baeaf76 --- /dev/null +++ b/resources/assets/sass/error.scss @@ -0,0 +1,28 @@ +// Core +@import "_fonts"; + +// Libraries +@import "bootstrap/scss/bootstrap.scss"; + +.error-page { + display: flex; + min-height: 100vh; + padding: $grid-gutter-width ($grid-gutter-width / 2); + align-items: center; + + &-content { + @include font-sans-bold; + width: 100%; + font-size: 22px; + text-align: center; + text-transform: uppercase; + + @include media-breakpoint-up(sm) { + font-size: 32px; + } + + @include media-breakpoint-up(lg) { + font-size: 48px; + } + } +} diff --git a/resources/views/errors/404.blade.php b/resources/views/errors/404.blade.php index fa6068b..f9abf7c 100644 --- a/resources/views/errors/404.blade.php +++ b/resources/views/errors/404.blade.php @@ -1,5 +1,3 @@ -@extends('templates.error') - -@section('error-title') - Page Not Found -@endsection +@extends('templates.error', [ + 'title' => 'Page Not Found' +]) diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php index 7d7c423..825688c 100644 --- a/resources/views/errors/503.blade.php +++ b/resources/views/errors/503.blade.php @@ -1,5 +1,3 @@ -@extends('templates.error') - -@section('error-title') - Be Right Back -@endsection +@extends('templates.error', [ + 'title' => 'Be Right Back' +]) diff --git a/resources/views/errors/no-such-record.blade.php b/resources/views/errors/no-such-record.blade.php index bbea58d..571cca1 100644 --- a/resources/views/errors/no-such-record.blade.php +++ b/resources/views/errors/no-such-record.blade.php @@ -1,5 +1,3 @@ -@extends('templates.error') - -@section('error-title') - No Such Record -@endsection +@extends('templates.error', [ + 'title' => 'No Such Record' +]) diff --git a/resources/views/templates/error.blade.php b/resources/views/templates/error.blade.php index 318fcdd..e9defea 100644 --- a/resources/views/templates/error.blade.php +++ b/resources/views/templates/error.blade.php @@ -1,46 +1,15 @@ - - - - @yield('error-title') - {{ env('APP_NAME') }} +@extends('templates.base') - - - - -
-
-
@yield('error-title')
+@section('page-content') +
+
+
+ {{ $title }}
- - +
+@endsection