diff --git a/public/fonts/liberationsans/stylesheet.css b/public/fonts/liberationsans/stylesheet.css index 4ca48d155c28cc084a58d7d1ffd32ccbd54f6649..f8a366d87a313c353d10e270dfe72721cdda52ef 100644 --- a/public/fonts/liberationsans/stylesheet.css +++ b/public/fonts/liberationsans/stylesheet.css @@ -1,11 +1,7 @@ @font-face { font-family: 'Liberation Sans'; src: url('hinted-LiberationSans.eot'); - src: url('hinted-LiberationSans.eot?#iefix') format('embedded-opentype'), - url('hinted-LiberationSans.woff2') format('woff2'), - url('hinted-LiberationSans.woff') format('woff'), - url('hinted-LiberationSans.ttf') format('truetype'), - url('hinted-LiberationSans.svg#LiberationSans') format('svg'); + src: local('Liberation Sans'), local('LiberationSans'), url('hinted-LiberationSans.eot?#iefix') format('embedded-opentype'), url('hinted-LiberationSans.woff2') format('woff2'), url('hinted-LiberationSans.woff') format('woff'), url('hinted-LiberationSans.ttf') format('truetype'), url('hinted-LiberationSans.svg#LiberationSans') format('svg'); font-weight: normal; font-style: normal; } @@ -13,11 +9,7 @@ @font-face { font-family: 'Liberation Sans'; src: url('hinted-LiberationSans-Italic.eot'); - src: url('hinted-LiberationSans-Italic.eot?#iefix') format('embedded-opentype'), - url('hinted-LiberationSans-Italic.woff2') format('woff2'), - url('hinted-LiberationSans-Italic.woff') format('woff'), - url('hinted-LiberationSans-Italic.ttf') format('truetype'), - url('hinted-LiberationSans-Italic.svg#LiberationSans-Italic') format('svg'); + src: local('Liberation Sans Italic'), local('LiberationSans-Italic'), url('hinted-LiberationSans-Italic.eot?#iefix') format('embedded-opentype'), url('hinted-LiberationSans-Italic.woff2') format('woff2'), url('hinted-LiberationSans-Italic.woff') format('woff'), url('hinted-LiberationSans-Italic.ttf') format('truetype'), url('hinted-LiberationSans-Italic.svg#LiberationSans-Italic') format('svg'); font-weight: normal; font-style: italic; } @@ -25,11 +17,7 @@ @font-face { font-family: 'Liberation Sans'; src: url('hinted-LiberationSans-Bold.eot'); - src: url('hinted-LiberationSans-Bold.eot?#iefix') format('embedded-opentype'), - url('hinted-LiberationSans-Bold.woff2') format('woff2'), - url('hinted-LiberationSans-Bold.woff') format('woff'), - url('hinted-LiberationSans-Bold.ttf') format('truetype'), - url('hinted-LiberationSans-Bold.svg#LiberationSans-Bold') format('svg'); + src: local('Liberation Sans Bold'), local('LiberationSans-Bold'), url('hinted-LiberationSans-Bold.eot?#iefix') format('embedded-opentype'), url('hinted-LiberationSans-Bold.woff2') format('woff2'), url('hinted-LiberationSans-Bold.woff') format('woff'), url('hinted-LiberationSans-Bold.ttf') format('truetype'), url('hinted-LiberationSans-Bold.svg#LiberationSans-Bold') format('svg'); font-weight: bold; font-style: normal; } @@ -37,12 +25,7 @@ @font-face { font-family: 'Liberation Sans'; src: url('hinted-LiberationSans-BoldItalic.eot'); - src: url('hinted-LiberationSans-BoldItalic.eot?#iefix') format('embedded-opentype'), - url('hinted-LiberationSans-BoldItalic.woff2') format('woff2'), - url('hinted-LiberationSans-BoldItalic.woff') format('woff'), - url('hinted-LiberationSans-BoldItalic.ttf') format('truetype'), - url('hinted-LiberationSans-BoldItalic.svg#LiberationSans-BoldItalic') format('svg'); + src: local('Liberation Sans Bold Italic'), local('LiberationSans-BoldItalic'), url('hinted-LiberationSans-BoldItalic.eot?#iefix') format('embedded-opentype'), url('hinted-LiberationSans-BoldItalic.woff2') format('woff2'), url('hinted-LiberationSans-BoldItalic.woff') format('woff'), url('hinted-LiberationSans-BoldItalic.ttf') format('truetype'), url('hinted-LiberationSans-BoldItalic.svg#LiberationSans-BoldItalic') format('svg'); font-weight: bold; font-style: italic; -} - +} \ No newline at end of file diff --git a/resources/less/metager/general/general.less b/resources/less/metager/general/general.less index 061be8e221e2c7bdf82647c3b8e76ea1ce1ef1ad..015cbc00ecf8067ed3415fe7dafe7179fac35813 100644 --- a/resources/less/metager/general/general.less +++ b/resources/less/metager/general/general.less @@ -6,7 +6,7 @@ @a-hover-color: red; html, body, * { - font-family: @metager-font!important; + font-family: @metager-font; } /* Main Containers */ diff --git a/resources/less/metager/variables.less b/resources/less/metager/variables.less index 367fb6b1e3845d8644516d3e35b4fac8e5091654..11522db7220581b0c458ba9201ae4ed0a66dd955 100644 --- a/resources/less/metager/variables.less +++ b/resources/less/metager/variables.less @@ -12,12 +12,11 @@ @background-color: white; @background-color-mobile: #FAFAFA; // Default Font -@metager-font: -'Font Awesome 5 Free', +@metager-font: "Liberation Sans", "Helvetica Neue", -Helvetica, -Arial, +"Helvetica", +"Arial", sans-serif; // General text color. @text-color: @color-black; diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php index fe2d24f1d8ef722a06f3bd827d0829c7ca3f12d0..8af60f4e51df9b746a5defd40af5aceb2194aefe 100644 --- a/resources/views/layouts/staticPages.blade.php +++ b/resources/views/layouts/staticPages.blade.php @@ -13,12 +13,12 @@ <link href="/favicon.ico" rel="icon" type="image/x-icon" /> <link href="/favicon.ico" rel="shortcut icon" type="image/x-icon" /> <link rel="search" type="application/opensearchdescription+xml" title="{{ trans('staticPages.opensearch') }}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}"> - <link href="/fonts/liberationsans/stylesheet.css" rel="stylesheet"> - <link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" /> - <link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" /> <link type="text/css" rel="stylesheet" href="{{ mix('css/bootstrap.css') }}" /> <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" /> <link type="text/css" rel="stylesheet" href="{{ mix('css/utility.css') }}" /> + <link href="/fonts/liberationsans/stylesheet.css" rel="stylesheet"> + <link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome.css') }}" /> + <link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" /> <script src="{{ mix('js/lib.js') }}"></script> <script src="{{ mix('js/utility.js') }}"></script> @if (isset($css))