Skip to content

Commit

Permalink
Fixed navbar, added admin CSS
Browse files Browse the repository at this point in the history
  • Loading branch information
Adam Crampton committed Aug 22, 2018
1 parent 2afb8f7 commit 7fb580e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ As follows:
* Integrate user permissions into Auth and wrap certain items in these checks (e.g. Manage Users for Admins)
* Build log viewer
* Add file uploading functionality
* Make issue list multi-selectable
* Optimise loops + database queries - there's some not-very-good stuff in there
* LDAP to pull AD users in via cron job
3 changes: 3 additions & 0 deletions public/css/admin.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.container.container__main-container {
padding-top: 56px;
}
7 changes: 6 additions & 1 deletion resources/assets/less/admin.less
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
// Admin CSS.
// Admin CSS.

// Account for fixed navbar
.container.container__main-container {
padding-top: 56px;
}
6 changes: 3 additions & 3 deletions resources/views/layouts/admin-base.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<link rel="stylesheet" href="{{ URL::asset('vendor/bootstrap/css/bootstrap.min.css') }}">

<!-- App CSS -->
<link rel="stylesheet" href="{{ URL::asset('css/app.css') }}">
<link rel="stylesheet" href="{{ URL::asset('css/admin.css') }}">

<title>{{ $config->form_heading }}</title>
</head>
Expand Down Expand Up @@ -45,7 +45,7 @@

<!-- Navigation -->

<nav class="navbar navbar-expand-lg navbar-dark bg-dark static-top">
<nav class="navbar navbar-expand-lg navbar-dark fixed-top bg-dark static-top">
<div class="container">
<a class="navbar-brand" href="/">{{ $config->form_heading }}</a>
{{-- Only show nav items if logged in. --}}
Expand Down Expand Up @@ -74,7 +74,7 @@
</div>
</nav>

<div class="container">
<div class="container container__main-container">
@yield('content')
</div>

Expand Down

0 comments on commit 7fb580e

Please sign in to comment.