Fixes for sidebar nav

This commit is contained in:
David Bomba 2019-08-21 09:17:46 +10:00
parent 9d9addfc30
commit 63fb68faa7
6 changed files with 63 additions and 71 deletions

View File

@ -1,18 +1,15 @@
@extends('portal.default.layouts.master')
@section('body')
<main class="main">
<div class="container-fluid">
<div class="row">
<div class="col-lg-12">
<div class="col-lg-6">test</div>
<div class="col-lg-6">test2</div>
</div>
<main class="main">
<div class="container-fluid">
<div class="row">
<div class="col-lg-12">
<div class="col-lg-6">test</div>
<div class="col-lg-6">test2</div>
</div>
</div>
</main>
</div>
</div>
</main>
</body>
@endsection

View File

@ -7,10 +7,10 @@
<img class="navbar-brand-full" src="/images/logo.png" width="50" height="50" alt="Invoice Ninja Logo">
<img class="navbar-brand-minimized" src="/images/logo.png" width="30" height="30" alt="Invoice Ninja Logo">
</a>
<button class="sidebar-minimizer brand-minimizer" type="button">
<span class="navbar-toggler-icon"></span>
</button>
<button class="navbar-toggler sidebar-toggler sidebar-minimizer" type="button" data-toggle="sidebar-show">
<span class="navbar-toggler-icon"></span>
</button>
<ul class="nav navbar-nav ml-auto">
<li class="nav-item dropdown d-md-down-none" style="padding-left:20px; padding-right: 20px;">
<a class="nav-link" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">

View File

@ -5,74 +5,72 @@
<link href="/vendors/css/select2.min.css" rel="stylesheet">
@stop
@section('body')
<main class="main">
<div class="container-fluid">
<main class="main">
<div class="container-fluid">
{!! Former::framework('TwitterBootstrap4'); !!}
{!! Former::framework('TwitterBootstrap4'); !!}
{!! Former::horizontal_open()
->id('payment_form')
->route('client.invoices.bulk')
->method('POST'); !!}
{!! Former::horizontal_open()
->id('payment_form')
->route('client.invoices.bulk')
->method('POST'); !!}
{!! Former::hidden('hashed_ids')->id('hashed_ids') !!}
{!! Former::hidden('action')->id('action') !!}
{!! Former::close() !!}
<div class="row" style="padding-top: 30px;">
<div class="col-lg-12" style="padding-bottom: 10px;">
<div class="pull-left">
{!! Former::hidden('hashed_ids')->id('hashed_ids') !!}
{!! Former::hidden('action')->id('action') !!}
<div class="btn-group">
<button type="button" class="btn btn-success" id="pay_invoices">{{ ctrans('texts.pay_now') }}</button>
<button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split" id="pay_invoices_drop" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">Toggle Dropdown</span>
</button>
<div class="dropdown-menu">
<a class="dropdown-item" id="download_invoices">{{ctrans('texts.download_pdf')}}</a>
</div>
</div>
{!! Former::close() !!}
<div class="row" style="padding-top: 30px;">
<div class="col-lg-12" style="padding-bottom: 10px;">
<div class="pull-left">
<select class="form-control" style="width: 220px;" id="statuses" name="client_status[]" multiple="multiple">
<option value="paid">{{ ctrans('texts.status_paid') }}</option>
<option value="unpaid">{{ ctrans('texts.status_unpaid') }}</option>
<option value="overdue">{{ ctrans('texts.overdue') }}</option>
</select>
<div class="btn-group">
<button type="button" class="btn btn-success" id="pay_invoices">{{ ctrans('texts.pay_now') }}</button>
<button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split" id="pay_invoices_drop" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="sr-only">Toggle Dropdown</span>
</button>
<div class="dropdown-menu">
<a class="dropdown-item" id="download_invoices">{{ctrans('texts.download_pdf')}}</a>
</div>
</div>
<!-- Filters / Buttons in here.-->
<div id="top_right_buttons" class="pull-right">
<input id="table_filter" type="text" style="width:180px;background-color: white !important"
class="form-control pull-left" placeholder="{{ trans('texts.filter')}}" value=""/>
</div>
<select class="form-control" style="width: 220px;" id="statuses" name="client_status[]" multiple="multiple">
<option value="paid">{{ ctrans('texts.status_paid') }}</option>
<option value="unpaid">{{ ctrans('texts.status_unpaid') }}</option>
<option value="overdue">{{ ctrans('texts.overdue') }}</option>
</select>
<div class="animated fadeIn">
<div class="col-md-12 card">
</div>
{!! $html->table(['class' => 'table table-hover table-striped', 'id' => 'datatable'], true) !!}
<!-- Filters / Buttons in here.-->
<div id="top_right_buttons" class="pull-right">
</div>
</div>
<input id="table_filter" type="text" style="width:180px;background-color: white !important"
class="form-control pull-left" placeholder="{{ trans('texts.filter')}}" value=""/>
</div>
<div class="animated fadeIn">
<div class="col-md-12 card">
{!! $html->table(['class' => 'table table-hover table-striped', 'id' => 'datatable'], true) !!}
</div>
</div>
</div>
</div>
</main>
</div>
</div>
</main>
</body>
@endsection
@push('scripts')
<script src="//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js" type="text/javascript"></script>
<script src="//cdn.datatables.net/1.10.18/js/dataTables.bootstrap4.min.js"></script>
<script src="/vendors/js/select2.min.js"></script>
@endpush
@section('footer')
<script>
/*global json payload*/
@ -239,5 +237,5 @@ $('#statuses').select2({
});
</script>
@endsection
@endpush

View File

@ -32,8 +32,8 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, shrink-to-fit=no">
<meta name="author" content="Łukasz Holeczek">
<meta name="keyword" content="Bootstrap,Admin,Template,Open,Source,jQuery,CSS,HTML,RWD,Dashboard">
<meta name="author" content="">
<meta name="keyword" content="">
<!-- Icons-->
<link href="/vendors/css/coreui-icons.min.css" rel="stylesheet">
<link href="/vendors/css/font-awesome.min.css" rel="stylesheet">

View File

@ -42,6 +42,9 @@
<!-- Main styles for this application-->
<link href="/vendors/css/bootstrap.min.css" rel="stylesheet">
<link href="/vendors/css/coreui.min.css" rel="stylesheet">
<style type="text/css">
.nav {min-height: calc(100% - 55px);}
</style>
@stack('css')
@yield('head')

View File

@ -9,13 +9,7 @@
</a>
</li>
@endforeach
</ul>
<div class="ps__rail-x" style="left: 0px; bottom: 0px;">
<div class="ps__thumb-x" tabindex="0" style="left: 0px; width: 0px;"></div>
</div>
<div class="ps__rail-y" style="top: 0px; height: 1142px; right: 0px;">
<div class="ps__thumb-y" tabindex="0" style="top: 0px; height: 1097px;"></div>
</div>
</ul>
</nav>
<button class="sidebar-minimizer brand-minimizer" type="button"></button>
</div>