Finished basic navbar

This commit is contained in:
James Brooks
2016-03-22 20:18:51 +00:00
parent 4d07d2c8b1
commit d342cdb6ad
5 changed files with 18 additions and 15 deletions

View File

@@ -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;
}
}
}
}

View File

@@ -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 <a href="https://cachethq.io" class="links">Cachet</a>.',
'about_this_site' => 'About This Site',

View File

@@ -65,7 +65,7 @@
</script>
<script src="{{ elixir('dist/js/all.js') }}"></script>
</head>
<body class="status-page">
<body class="status-page @yield('bodyClass')">
@yield('outer-content')
@include('partials.banner')

View File

@@ -1,17 +1,12 @@
<div class="navbar navbar-custom" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
<i class="zmdi zmdi-menu"></i>
</button>
<a class="navbar-brand" href="/">
<span>{{ $app_name }}</span>
</a>
<a class="navbar-brand" href="/"><span>{{ $app_name }}</span></a>
</div>
<div class="navbar-collapse collapse" id="navbar-menu">
<ul class="nav navbar-nav navbar-right">
<li><a href="/">{{ trans('cachet.home') }}</a></li>
@if($current_user)
<li class="dropdown">
<a href="#" data-toggle="dropdown">
@@ -25,7 +20,7 @@
</ul>
</li>
@elseif(Config::get('setting.dashboard_login_link'))
<li><a href="/dashboard" class="btn btn-primary navbar-btn">{{ trans('dashboard.dashboard') }}</a></li>
<li><a href="/dashboard">{{ trans('dashboard.dashboard') }}</a></li>
@endif
</ul>
</div>

View File

@@ -1,11 +1,13 @@
@extends('layout.master')
@section('bodyClass', 'no-padding')
@section('outer-content')
@include('partials.nav')
@stop
@section('content')
<h4>{{ formatted_date($incident->created_at) }}</h4>
<h1>{{ formatted_date($incident->created_at) }}</h1>
<div class="timeline">
<div class="content-wrapper">