diff --git a/app/Foundation/Providers/ComposerServiceProvider.php b/app/Foundation/Providers/ComposerServiceProvider.php index 6d6fb313..3f42bab6 100644 --- a/app/Foundation/Providers/ComposerServiceProvider.php +++ b/app/Foundation/Providers/ComposerServiceProvider.php @@ -33,8 +33,8 @@ class ComposerServiceProvider extends ServiceProvider $factory->composer('*', AppComposer::class); $factory->composer('*', CurrentUserComposer::class); $factory->composer(['index'], MetricsComposer::class); - $factory->composer(['index', 'incident', 'subscribe', 'signup'], StatusPageComposer::class); - $factory->composer(['index', 'incident', 'subscribe.*', 'signup', 'dashboard.settings.theme'], ThemeComposer::class); + $factory->composer(['index', 'single-incident', 'subscribe', 'signup'], StatusPageComposer::class); + $factory->composer(['index', 'single-incident', 'subscribe.*', 'signup', 'dashboard.settings.theme'], ThemeComposer::class); $factory->composer('dashboard.*', DashboardComposer::class); $factory->composer(['setup', 'dashboard.settings.localization'], TimezoneLocaleComposer::class); } diff --git a/app/Http/Controllers/StatusPageController.php b/app/Http/Controllers/StatusPageController.php index e05e7000..782d8a08 100644 --- a/app/Http/Controllers/StatusPageController.php +++ b/app/Http/Controllers/StatusPageController.php @@ -121,7 +121,7 @@ class StatusPageController extends AbstractApiController */ public function showIncident(Incident $incident) { - return View::make('incident') + return View::make('single-incident') ->withIncident($incident); } diff --git a/resources/assets/sass/_status-page.scss b/resources/assets/sass/_status-page.scss index dd263375..47c27ca7 100755 --- a/resources/assets/sass/_status-page.scss +++ b/resources/assets/sass/_status-page.scss @@ -389,4 +389,25 @@ body.status-page { .section-timeline, .section-components, .section-metrics, .section-scheduled { margin-top: 40px; } + + .navbar-custom { + width: 100%; + border-radius: 0px; + margin-bottom: 0px; + + a.navbar-brand { + font-size: 30px; + font-weight: 600; + } + + .navbar-nav li a { + color: $cachet-base-dark; + font-size: 1.7rem; + margin: 5px 0px; + } + + .nav>li>a:focus,.navbar-custom .nav>li>a:hover { + background-color: transparent; + } + } } diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index c9d7429d..1d5118bb 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -66,6 +66,8 @@ + @yield('outer-content') + @include('partials.banner')
diff --git a/resources/views/partials/nav.blade.php b/resources/views/partials/nav.blade.php new file mode 100644 index 00000000..ec9d1002 --- /dev/null +++ b/resources/views/partials/nav.blade.php @@ -0,0 +1,33 @@ + diff --git a/resources/views/incident.blade.php b/resources/views/single-incident.blade.php similarity index 87% rename from resources/views/incident.blade.php rename to resources/views/single-incident.blade.php index 6b2c8c72..95103c1d 100644 --- a/resources/views/incident.blade.php +++ b/resources/views/single-incident.blade.php @@ -1,12 +1,10 @@ @extends('layout.master') +@section('outer-content') +@include('partials.nav') +@stop + @section('content') -
- @include('dashboard.partials.errors') -
- -@include('partials.about-app') -

{{ formatted_date($incident->created_at) }}