ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3915 from MaximilianKrambach/os3/fonts

Browse Source 
os3: Change default font to Roboto
This commit is contained in:
Sean 2018-10-11 15:07:34 +02:00 committed by GitHub
commit db29d1cab1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/package.json
View File

@ -34,6 +34,7 @@
"@ngx-translate/http-loader": "^3.0.1", "@ngx-translate/http-loader": "^3.0.1",
"core-js": "^2.5.4", "core-js": "^2.5.4",
"ngx-mat-select-search": "^1.4.0", "ngx-mat-select-search": "^1.4.0",
"roboto-fontface": "^0.10.0",
"rxjs": "^6.3.3", "rxjs": "^6.3.3",
"uuid": "^3.3.2", "uuid": "^3.3.2",
"zone.js": "^0.8.26" "zone.js": "^0.8.26"

3
client/src/styles.scss
View File

@ -4,6 +4,7 @@
/** Import brand theme and (new) component themes */ /** Import brand theme and (new) component themes */
@import './assets/styles/openslides-theme'; @import './assets/styles/openslides-theme';
@import './app/site/site.component.scss-theme'; @import './app/site/site.component.scss-theme';
@import '../node_modules/roboto-fontface/css/roboto/roboto-fontface.css';
@mixin openslides-components-theme($theme) { @mixin openslides-components-theme($theme) {
@include os-site-theme($theme); @include os-site-theme($theme);
/** More components are added here */ /** More components are added here */
@ -12,7 +13,7 @@
@include angular-material-theme($openslides-theme); @include angular-material-theme($openslides-theme);
@include openslides-components-theme($openslides-theme); @include openslides-components-theme($openslides-theme);
* { * {
font-family: Arial, Helvetica, sans-serif !important; font-family: Roboto, Arial, Helvetica, sans-serif;
} }
body { body {