Update CSS font references

This commit is contained in:
James Cole
2018-08-26 21:29:30 +02:00
parent 503158ab97
commit c4bbbc49b4
7 changed files with 15 additions and 7 deletions

View File

@@ -29,6 +29,9 @@
* Core: General Layout Style * Core: General Layout Style
* ------------------------- * -------------------------
*/ */
@import url('../../../css/google-fonts.css');
html, html,
body { body {
height: 100%; height: 100%;

View File

@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with Firefly III. If not, see <http://www.gnu.org/licenses/>. * along with Firefly III. If not, see <http://www.gnu.org/licenses/>.
*/ */
@import url('../../../css/google-fonts.css');
/*! /*!
* AdminLTE v2.4.5 * AdminLTE v2.4.5
* Author: Almsaeed Studio * Author: Almsaeed Studio

View File

@@ -11,7 +11,6 @@
{# CSS things #} {# CSS things #}
{# libraries #} {# libraries #}
<link href="css/google-fonts.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>

View File

@@ -20,7 +20,6 @@
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'> <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
{# CSS things #} {# CSS things #}
{# libraries #} {# libraries #}
<link href="css/google-fonts.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>

View File

@@ -12,7 +12,6 @@
{# CSS things #} {# CSS things #}
{# libraries #} {# libraries #}
<link href="css/google-fonts.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>

View File

@@ -21,7 +21,6 @@
{# CSS things #} {# CSS things #}
{# libraries #} {# libraries #}
<link href="css/google-fonts.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/> <link href="css/daterangepicker.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>

View File

@@ -7,8 +7,17 @@
<title>Firefly III v{{ config('firefly.version') }} - {{ 'authorization'|_ }}</title> <title>Firefly III v{{ config('firefly.version') }} - {{ 'authorization'|_ }}</title>
<!-- Styles --> {# CSS things #}
<link href="/css/app.css" rel="stylesheet"> {# libraries #}
<link href="lib/bs/css/bootstrap.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/fa/css/font-awesome.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# the theme #}
<link href="lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<link href="lib/adminlte/css/skins/skin-blue-light.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
{# Firefly III customisations #}
<link href="css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
<style> <style>
.passport-authorize .container { .passport-authorize .container {