Finished basic navbar

2016-03-22 20:18:51 +00:00
parent 4d07d2c8b1
commit d342cdb6ad
5 changed files with 18 additions and 15 deletions
@@ -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')
@@ -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>
@@ -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">