From dbfceafb026c08838ebd52cdec2dab163da8ba3d Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 3 Mar 2023 09:14:44 +0100 Subject: [PATCH] CSS fixes for subdirectories. Full credits to @GaneshKandu --- frontend/quasar.conf.js | 6 +++--- public/v3-local/css/fonts.css | 16 ++++++++-------- resources/views/layout/v3/session.twig | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/frontend/quasar.conf.js b/frontend/quasar.conf.js index b36494dfaf..ef4d94995b 100644 --- a/frontend/quasar.conf.js +++ b/frontend/quasar.conf.js @@ -101,18 +101,18 @@ module.exports = configure(function (ctx) { type: 'https' }, port: 8080, - host: 'firefly-dev.sd.home', + host: 'firefly-dev.sd.local', open: false, // opens browser window automatically proxy: [ { context: ['/sanctum', '/api'], - target: 'https://firefly.sd.home', // Laravel Homestead end-point + target: 'https://firefly.sd.local', // Laravel Homestead end-point // avoid problems with session and XSRF cookies // When using capacitor, use the IP of the dev server streaming the app // For SPA and PWA use localhost, given that the app is streamed on that host // xxx address is your machine current IP address cookieDomainRewrite: - ctx.modeName === 'capacitor' ? '10.0.0.1' : '.sd.home', + ctx.modeName === 'capacitor' ? '10.0.0.1' : '.sd.local', changeOrigin: true, } ] diff --git a/public/v3-local/css/fonts.css b/public/v3-local/css/fonts.css index aae669feec..d61343d0c7 100644 --- a/public/v3-local/css/fonts.css +++ b/public/v3-local/css/fonts.css @@ -24,8 +24,8 @@ font-style: normal; font-weight: 300; src: local(''), - url('/v3-local/fonts/source-sans-pro-v21-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/v3-local/fonts/source-sans-pro-v21-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('../../v3-local/fonts/source-sans-pro-v21-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../../v3-local/fonts/source-sans-pro-v21-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* source-sans-pro-regular - latin */ @@ -34,8 +34,8 @@ font-style: normal; font-weight: 400; src: local(''), - url('/v3-local/fonts/source-sans-pro-v21-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/v3-local/fonts/source-sans-pro-v21-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('../../v3-local/fonts/source-sans-pro-v21-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('v3-local/fonts/source-sans-pro-v21-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* source-sans-pro-italic - latin */ @@ -44,8 +44,8 @@ font-style: italic; font-weight: 400; src: local(''), - url('/v3-local/fonts/source-sans-pro-v21-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/v3-local/fonts/source-sans-pro-v21-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('../../v3-local/fonts/source-sans-pro-v21-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../../v3-local/fonts/source-sans-pro-v21-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } /* source-sans-pro-700 - latin */ @@ -54,6 +54,6 @@ font-style: normal; font-weight: 700; src: local(''), - url('/v3-local/fonts/source-sans-pro-v21-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ - url('/v3-local/fonts/source-sans-pro-v21-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ + url('../../v3-local/fonts/source-sans-pro-v21-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */ + url('../../v3-local/fonts/source-sans-pro-v21-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */ } diff --git a/resources/views/layout/v3/session.twig b/resources/views/layout/v3/session.twig index e89d3a2b0b..e1e20b4176 100644 --- a/resources/views/layout/v3/session.twig +++ b/resources/views/layout/v3/session.twig @@ -7,10 +7,10 @@ {{ 'login_page_title'|_ }} - - - - + + + + {% block content %}{% endblock %}