Update some v2 views.

This commit is contained in:
James Cole 2019-01-03 19:02:47 +01:00
parent f62b7e4ae9
commit 1d51a0f396
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
3 changed files with 13 additions and 132 deletions

View File

@ -18,16 +18,11 @@
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/
// Fonts
@import url('https://fonts.googleapis.com/css?family=Nunito');
// Variables
@import 'variables';
// Bootstrap
@import '~bootstrap/scss/bootstrap';
// Font awesome.
// @import "node_modules/font-awesome/scss/font-awesome";
@import "~font-awesome/scss/font-awesome";
// @import "~font-awesome/scss/font-awesome";
// import tabler
// @import "~tabler-react/dist/Tabler.css";

View File

@ -5,7 +5,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta http-equiv="Content-Language" content="en" />
<meta name="csrf-token" content="{{ csrf_token() }}">
<meta http-equiv="Content-Language" content="en"/>
{# favicons #}
{% include('partials.favicons') %}
@ -20,129 +21,16 @@
Firefly III
</title>
<!--
<link rel="stylesheet" href="v2/lib/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="v2/assets/css/gf-source.css">
<link href="v2/assets/css/dashboard.css" rel="stylesheet" />
<link href="v2/assets/plugins/charts-c3/plugin.css" rel="stylesheet" />
<link href="v2/assets/plugins/maps-google/plugin.css" rel="stylesheet" />
-->
<link href="v2/assets/css/app.css" rel="stylesheet" />
<link href="v2/assets/css/app.css" rel="stylesheet"/>
{% block styles %}{% endblock %}
</head>
<body class="">
<div class="page">
<div class="page-main">
<div class="header py-4">
<div class="container">
<div class="d-flex">
{# favicons #}
{% include('partials.top_bar') %}
</div>
</div>
</div>
<div class="header collapse d-lg-flex p-0" id="headerMenuCollapse">
<div class="container">
<div class="row align-items-center">
<div class="col-lg-3 ml-auto">
<form class="input-icon my-3 my-lg-0" action="{{ route('search.index') }}" method="get">
<input type="search" class="form-control header-search" placeholder="Search&hellip;" name="q" tabindex="1">
<div class="input-icon-addon">
<i class="fe fe-search"></i>
</div>
</form>
</div>
<div class="col-lg order-lg-first">
<div id="TopMenu"></div>
</div>
</div>
</div>
</div>
<div class="my-3 my-md-5">
<div class="container">
<div class="page-header">
<h1 class="page-title">
{{ title }}
<small class="text-muted">{{ subTitle }}</small>
</h1>
</div>
{% block content %}{% endblock %}
</div>
</div>
</div>
<div class="footer">
<div class="container">
<div class="row">
<div class="col-lg-8">
<div class="row">
<div class="col-6 col-md-3">
<ul class="list-unstyled mb-0">
<li><a href="#">First link</a></li>
<li><a href="#">Second link</a></li>
</ul>
</div>
<div class="col-6 col-md-3">
<ul class="list-unstyled mb-0">
<li><a href="#">Third link</a></li>
<li><a href="#">Fourth link</a></li>
</ul>
</div>
<div class="col-6 col-md-3">
<ul class="list-unstyled mb-0">
<li><a href="#">Fifth link</a></li>
<li><a href="#">Sixth link</a></li>
</ul>
</div>
<div class="col-6 col-md-3">
<ul class="list-unstyled mb-0">
<li><a href="#">Other link</a></li>
<li><a href="#">Last link</a></li>
</ul>
</div>
</div>
</div>
<div class="col-lg-4 mt-4 mt-lg-0">
Premium and Open Source dashboard template with responsive and high quality UI. For Free!
</div>
</div>
</div>
</div>
<footer class="footer">
<div class="container">
<div class="row align-items-center flex-row-reverse">
<div class="col-auto ml-lg-auto">
<div class="row align-items-center">
<div class="col-auto">
<ul class="list-inline list-inline-dots mb-0">
<li class="list-inline-item"><a href="./docs/index.html">Documentation</a></li>
<li class="list-inline-item"><a href="./faq.html">FAQ</a></li>
</ul>
</div>
<div class="col-auto">
<a href="https://github.com/tabler/tabler" class="btn btn-outline-primary btn-sm">Source code</a>
</div>
</div>
</div>
<div class="col-12 col-lg-auto mt-3 mt-lg-0 text-center">
Copyright © 2018 <a href=".">Tabler</a>. Theme by <a href="https://codecalm.net" target="_blank">codecalm.net</a> All rights reserved.
</div>
</div>
</div>
</footer>
</div>
<body>
<noscript>
You need to enable JavaScript to run this app.
</noscript>
<span id="root"></span>
<!--
<script src="v2/assets/js/require.min.js"></script>
<script>
requirejs.config({
baseUrl: '.'
});
</script>
<script src="v2/assets/js/dashboard.js"></script>
<script src="v2/assets/plugins/charts-c3/plugin.js"></script>
<script src="v2/assets/plugins/maps-google/plugin.js"></script>
<script src="v2/assets/plugins/input-mask/plugin.js"></script>
-->
<script src="v2/assets/js/app.js"></script>
{% block scripts %}{% endblock %}
</body>

View File

@ -1,4 +1,3 @@
{#
<ul class="nav nav-tabs border-0 flex-column flex-lg-row">
<li class="nav-item">
<a href="{{ route('index') }}" class="nav-link active"><i class="fa fa-home"></i> {{ 'dashboard'|_ }}</a>
@ -48,4 +47,3 @@
</li>
</ul>
#}