diff --git a/resources/sass/print-styles.scss b/resources/sass/_print.scss similarity index 90% rename from resources/sass/print-styles.scss rename to resources/sass/_print.scss index cfc0ecdad..f7d52a6dd 100644 --- a/resources/sass/print-styles.scss +++ b/resources/sass/_print.scss @@ -1,6 +1,3 @@ -@use "sass:math"; -@import "variables"; - html, body { font-size: 12px; background-color: #FFF; diff --git a/resources/sass/styles.scss b/resources/sass/styles.scss index c0ce7ba63..b4691bc4d 100644 --- a/resources/sass/styles.scss +++ b/resources/sass/styles.scss @@ -23,6 +23,10 @@ @import "pages"; @import "content"; +@media print { + @import "print"; +} + // Jquery Sortable Styles .dragged { position: absolute; diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index 67b074905..4acabbcac 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -17,9 +17,8 @@ <meta property="og:url" content="{{ url()->current() }}"> @stack('social-meta') - <!-- Styles and Fonts --> + <!-- Styles --> <link rel="stylesheet" href="{{ versioned_asset('dist/styles.css') }}"> - <link rel="stylesheet" media="print" href="{{ versioned_asset('dist/print-styles.css') }}"> <!-- Icons --> <link rel="icon" type="image/png" sizes="256x256" href="{{ setting('app-icon') ?: url('/icon.png') }}"> diff --git a/resources/views/layouts/plain.blade.php b/resources/views/layouts/plain.blade.php index a644ef789..37ebbe83d 100644 --- a/resources/views/layouts/plain.blade.php +++ b/resources/views/layouts/plain.blade.php @@ -9,9 +9,8 @@ <meta name="viewport" content="width=device-width"> <meta charset="utf-8"> - <!-- Styles and Fonts --> + <!-- Styles --> <link rel="stylesheet" href="{{ versioned_asset('dist/styles.css') }}"> - <link rel="stylesheet" media="print" href="{{ versioned_asset('dist/print-styles.css') }}"> <!-- Custom Styles & Head Content --> @include('layouts.parts.custom-styles')