From 4d07d2c8b189f5707015acf8002a9a6fc86ac1cc Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 21 Mar 2016 17:38:50 +0000 Subject: [PATCH 1/2] Working on a new navbar and minor design tweaks for the status page --- .../Providers/ComposerServiceProvider.php | 4 +-- app/Http/Controllers/StatusPageController.php | 2 +- resources/assets/sass/_status-page.scss | 21 ++++++++++++ resources/views/layout/master.blade.php | 2 ++ resources/views/partials/nav.blade.php | 33 +++++++++++++++++++ ...nt.blade.php => single-incident.blade.php} | 10 +++--- 6 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 resources/views/partials/nav.blade.php rename resources/views/{incident.blade.php => single-incident.blade.php} (87%) 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) }}

From d342cdb6ad338cab4814bbfa536368954a08d3bf Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 22 Mar 2016 20:18:51 +0000 Subject: [PATCH 2/2] Finished basic navbar --- resources/assets/sass/_status-page.scss | 15 ++++++++++----- resources/lang/en/cachet.php | 1 + resources/views/layout/master.blade.php | 2 +- resources/views/partials/nav.blade.php | 11 +++-------- resources/views/single-incident.blade.php | 4 +++- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/resources/assets/sass/_status-page.scss b/resources/assets/sass/_status-page.scss index 47c27ca7..74861718 100755 --- a/resources/assets/sass/_status-page.scss +++ b/resources/assets/sass/_status-page.scss @@ -7,6 +7,10 @@ body.status-page { font-weight: $base-font-weight; -webkit-font-smoothing: antialiased; + &.no-padding { + padding-top: 0 !important; + } + hr { margin-top: 10px; margin-bottom: 10px; @@ -391,9 +395,11 @@ body.status-page { } .navbar-custom { + padding-top: 10px; + padding-bottom: 10px; width: 100%; border-radius: 0px; - margin-bottom: 0px; + margin-bottom: 10px; a.navbar-brand { font-size: 30px; @@ -403,11 +409,10 @@ body.status-page { .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; + &:hover { + background-color: transparent; + } } } } diff --git a/resources/lang/en/cachet.php b/resources/lang/en/cachet.php index f15122a0..6276f55c 100755 --- a/resources/lang/en/cachet.php +++ b/resources/lang/en/cachet.php @@ -139,6 +139,7 @@ return [ ], // Other + 'home' => 'Home', 'description' => 'Stay up to date with the latest service updates from :app.', 'powered_by' => ':app Status Page is powered by Cachet.', 'about_this_site' => 'About This Site', diff --git a/resources/views/layout/master.blade.php b/resources/views/layout/master.blade.php index 1d5118bb..22485d9f 100644 --- a/resources/views/layout/master.blade.php +++ b/resources/views/layout/master.blade.php @@ -65,7 +65,7 @@ - + @yield('outer-content') @include('partials.banner') diff --git a/resources/views/partials/nav.blade.php b/resources/views/partials/nav.blade.php index ec9d1002..878c7813 100644 --- a/resources/views/partials/nav.blade.php +++ b/resources/views/partials/nav.blade.php @@ -1,17 +1,12 @@