diff --git a/public/lib/adminlte/css/AdminLTE.css b/public/lib/adminlte/css/AdminLTE.css index c9f25c3b59..95f676a911 100755 --- a/public/lib/adminlte/css/AdminLTE.css +++ b/public/lib/adminlte/css/AdminLTE.css @@ -29,6 +29,9 @@ * Core: General Layout Style * ------------------------- */ + +@import url('../../../css/google-fonts.css'); + html, body { height: 100%; diff --git a/public/lib/adminlte/css/AdminLTE.min.css b/public/lib/adminlte/css/AdminLTE.min.css index 1248fb005c..abc5596109 100755 --- a/public/lib/adminlte/css/AdminLTE.min.css +++ b/public/lib/adminlte/css/AdminLTE.min.css @@ -17,7 +17,7 @@ * You should have received a copy of the GNU General Public License * along with Firefly III. If not, see . */ - +@import url('../../../css/google-fonts.css'); /*! * AdminLTE v2.4.5 * Author: Almsaeed Studio diff --git a/resources/views/errors/FireflyException.twig b/resources/views/errors/FireflyException.twig index d3d7eb0c7b..ee0b221ce0 100644 --- a/resources/views/errors/FireflyException.twig +++ b/resources/views/errors/FireflyException.twig @@ -11,7 +11,6 @@ {# CSS things #} {# libraries #} - diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index e6ec478f00..70bf4aa925 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -20,7 +20,6 @@ {# CSS things #} {# libraries #} - diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig index 84c82ff7be..66cd7309b8 100644 --- a/resources/views/layout/empty.twig +++ b/resources/views/layout/empty.twig @@ -12,7 +12,6 @@ {# CSS things #} {# libraries #} - diff --git a/resources/views/layout/guest.twig b/resources/views/layout/guest.twig index d8ebce2888..72573e1217 100644 --- a/resources/views/layout/guest.twig +++ b/resources/views/layout/guest.twig @@ -21,7 +21,6 @@ {# CSS things #} {# libraries #} - diff --git a/resources/views/vendor/passport/authorize.twig b/resources/views/vendor/passport/authorize.twig index 9105fe2205..8d0496fbe0 100644 --- a/resources/views/vendor/passport/authorize.twig +++ b/resources/views/vendor/passport/authorize.twig @@ -7,8 +7,17 @@ Firefly III v{{ config('firefly.version') }} - {{ 'authorization'|_ }} - - + {# CSS things #} + {# libraries #} + + + + {# the theme #} + + + + {# Firefly III customisations #} +