TT#45378 Integrate new standard font

- Separate stylus file for font definition
- Fonts become part of the regular asset management

Change-Id: I5bc6ed28db4ecf23af3a6ac63b778276a0ac4fed
changes/78/24078/6
raxelsen 7 years ago committed by Hans-Peter Herzog
parent 8c4375583c
commit 5998565369

@ -1,6 +1,5 @@
import './themes/app.fonts.styl'
import './themes/app.mat.styl'
import 'quasar-extras/roboto-font';
import 'quasar-extras/material-icons'
import 'quasar-extras/fontawesome'
import 'quasar-extras/animate'
@ -26,7 +25,7 @@ Vue.use(Quasar);
Vue.use(VueResource);
Vue.use(RtcEngineCall);
Vue.use(VueScrollTo);
Vue.use(Vuelidate)
Vue.use(Vuelidate);
sync(store, router);

@ -0,0 +1,29 @@
@font-face
font-family Muli
font-weight normal
src: url('custom-fonts/Muli-Regular.ttf')
@font-face
font-family Muli
font-weight 100
src url('custom-fonts/Muli-Light.ttf')
@font-face
font-family Muli
font-weight 300
src url('custom-fonts/Muli-Light.ttf')
@font-face
font-family Muli
font-weight 400
src url('custom-fonts/Muli-Regular.ttf')
@font-face
font-family Muli
font-weight 500
src url('custom-fonts/Muli-Regular.ttf')
@font-face
font-family Muli
font-weight 700
src url('custom-fonts/Muli-Bold.ttf')

@ -10,7 +10,6 @@
// Quasar's default Stylus variable values. Stylus variables specific
// to the themes belong in either the app.ios.styl or app.mat.styl files.
// App Shared Color Variables
// --------------------------------------------------
// It's highly recommended to change the default colors
@ -45,3 +44,5 @@ $csc-subtitle-line-height = 2rem
$item-base-color = $primary
$item-highlight-color = alpha($item-base-color, 15%)
$typography-font-family = 'Muli', '-apple-system', 'Helvetica Neue', Helvetica, Arial, sans-serif

Loading…
Cancel
Save