kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 01:42:32 +00:00
Code Issues Projects Releases Wiki Activity

New CSS / JS code.

Browse Source
This commit is contained in:
James Cole
2015-02-27 18:05:40 +01:00
parent c1290c4e9b
commit edeaf13259
8 changed files with 56 additions and 6289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
resources/views/layouts/default.blade.php
View File

@@ -16,8 +16,13 @@
</title>
<link rel="stylesheet" href="bootstrap/css/bootstrap.min.css" type="text/css" media="all" />
<!-- <link rel="stylesheet" href="css/metisMenu.min.css" type="text/css" media="all" /> -->
<!-- new css for SB admin -->
<link rel="stylesheet" href="css/metisMenu.min.css" type="text/css" media="all" />
<link rel="stylesheet" href="css/sb.css" type="text/css" media="all" />
<link rel="stylesheet" href="css/sb-admin-2.css" type="text/css" media="all" />
<link rel="stylesheet" href="font-awesome/css/font-awesome.min.css" type="text/css" media="all" />
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto2" type="text/css" media="all" />
@yield('styles')
@@ -107,8 +112,18 @@
<script type="text/javascript" src="js/jquery-2.1.3.min.js"></script>
<script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/jquery.metisMenu.min.js"></script>
<!-- <script type="text/javascript" src="js/jquery.metisMenu.min.js"></script> -->
<!-- <script type="text/javascript" src="js/sb-admin-2.js"></script>-->
<!-- new js for sb admin -->
<script type="text/javascript" src="js/metisMenu.min.js"></script>
<script type="text/javascript" src="js/sb-admin-2.js"></script>
<script type="text/javascript" src="js/help.js"></script>
<script type="text/javascript" src="js/firefly.js"></script>
@yield('scripts')

39
resources/views/partials/menu.blade.php
View File

@@ -11,40 +11,10 @@
</div>
<!-- /.navbar-header -->
<ul class="nav navbar-top-links navbar-right">
<!-- reminders -->
@if(isset($reminders) && count($reminders) > 0)
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<i class="fa fa-bell fa-fw"></i> <i class="fa fa-caret-down"></i>
</a>
<ul class="dropdown-menu dropdown-alerts">
@foreach($reminders as $index => $reminder)
<li>
<a href="{{route('reminders.show',$reminder->id)}}">
<div>
<i class="fa fa-clock-o fa-fw"></i>
<!-- may be a title, may be a name or a description -->
@if($reminder->remindersable->title)
{{{$reminder->remindersable->title}}}
@endif
@if($reminder->remindersable->name)
{{{$reminder->remindersable->name}}}
@endif
<span class="pull-right text-muted small"></span>
</div>
</a>
</li>
@if($index+1 != count($reminders))
<li class="divider"></li>
@endif
@endforeach
</ul>
<!-- /.dropdown-alerts -->
</li>
@endif
<!-- /.dropdown -->
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
@@ -63,7 +33,12 @@
<!-- /.dropdown -->
</ul>
<!-- /.navbar-top-links -->
<div class="navbar-default sidebar" role="navigation">
<div class="sidebar-nav navbar-collapse">