From d342cdb6ad338cab4814bbfa536368954a08d3bf Mon Sep 17 00:00:00 2001 From: James Brooks Date: Tue, 22 Mar 2016 20:18:51 +0000 Subject: [PATCH] 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 @@