Commit d60eab37 authored by Phil Höfer's avatar Phil Höfer
Browse files

Merge branch '825-replace-liberation-sans-with-arimo' into 'development'

Resolve "Replace Liberation Sans with Arimo"

Closes #825

See merge request !1343
parents 8114278a ce6ead8e
/* Liberation Sans Font */
@font-face {
font-family: "Liberation Sans";
src: url("./LiberationSans-Regular.ttf") format("truetype");
}
\ No newline at end of file
/* Default Font */ /* Default Font */
body { body {
font-family: Liberation Sans, sans-serif; font-family: Arimo, Liberation Sans, sans-serif;
} }
/* Main Containers */ /* Main Containers */
...@@ -105,7 +105,7 @@ a { ...@@ -105,7 +105,7 @@ a {
.logo { .logo {
color: @metager-orange; color: @metager-orange;
font-family: Liberation Sans, sans-serif; font-family: Arimo, Liberation Sans, sans-serif;
font-style: italic; font-style: italic;
font-weight: bold; font-weight: bold;
white-space: nowrap; white-space: nowrap;
...@@ -326,4 +326,4 @@ li.nodot { ...@@ -326,4 +326,4 @@ li.nodot {
// Used on labels which initiate visual change (e.g. open-sidebar-button) // Used on labels which initiate visual change (e.g. open-sidebar-button)
.navigation-element { .navigation-element {
cursor: pointer; cursor: pointer;
} }
\ No newline at end of file
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
// //
@body-bg: rgb(250, 250, 250); @body-bg: rgb(250, 250, 250);
@input-border-focus: @metager-orange; @input-border-focus: @metager-orange;
@font-family-sans-serif: "Liberation Sans", @font-family-sans-serif: Arimo, "Liberation Sans",
"Helvetica Neue", "Helvetica Neue",
Helvetica, Helvetica,
Arial, Arial,
...@@ -55,4 +55,4 @@ sans-serif; ...@@ -55,4 +55,4 @@ sans-serif;
@product-price-color: @color-strong-grey; @product-price-color: @color-strong-grey;
@product-price-background-color: fade(@color-white, 90%); @product-price-background-color: fade(@color-white, 90%);
@lsprev-or-lsnext-i-background-color: @color-black; @lsprev-or-lsnext-i-background-color: @color-black;
@searchbar-background-color: white; @searchbar-background-color: white;
\ No newline at end of file
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<meta name="mn" content="{{ $metager->getVerificationCount() }}" /> <meta name="mn" content="{{ $metager->getVerificationCount() }}" />
<link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}"> <link rel="search" type="application/opensearchdescription+xml" title="{!! trans('resultPage.opensearch') !!}" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), action('StartpageController@loadPlugin', ['params' => base64_encode(serialize(Request::all()))])) }}">
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" /> <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
<link type="text/css" rel="stylesheet" href="/fonts/liberation-fonts/liberation-fonts.css" /> <link type="text/css" rel="stylesheet" href="/fonts/arimo/stylesheet.css" />
<meta name="referrer" content="origin"> <meta name="referrer" content="origin">
<meta name="age-meta-label" content="age=18"/> <meta name="age-meta-label" content="age=18"/>
@include('parts.utility') @include('parts.utility')
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<link href="/favicon.ico" rel="icon" type="image/x-icon" /> <link href="/favicon.ico" rel="icon" type="image/x-icon" />
<link href="/favicon.ico" rel="shortcut 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 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 type="text/css" rel="stylesheet" href="/fonts/liberation-fonts/liberation-fonts.css" /> <link type="text/css" rel="stylesheet" href="/fonts/arimo/stylesheet.css" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" /> <link type="text/css" rel="stylesheet" href="{{ mix('css/themes/default.css') }}" />
<link type="text/css" rel="stylesheet" href="{{ mix('css/utility.css') }}" /> <link type="text/css" rel="stylesheet" href="{{ mix('css/utility.css') }}" />
<script src="{{ mix('js/lib.js') }}"></script> <script src="{{ mix('js/lib.js') }}"></script>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment