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

Merge pull request #3916 from MaximilianKrambach/os3/fonts

Browse Source 
Switch heading fonts to roboto-condensed
This commit is contained in:
Sean 2018-10-16 14:47:10 +02:00 committed by GitHub
commit 313df50575
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/styles.scss
View File

@ -5,6 +5,7 @@
@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'; @import '../node_modules/roboto-fontface/css/roboto/roboto-fontface.css';
@import '../node_modules/roboto-fontface/css/roboto-condensed/roboto-condensed-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 */
@ -20,6 +21,14 @@ mat-icon {
font-family: MaterialIcons-Regular; font-family: MaterialIcons-Regular;
} }
h1,
h2,
h3,
h4,
h5 {
font-family: Roboto-condensed, Arial, Helvetica, sans-serif;
}
body { body {
// background: #e8eaed; // background: #e8eaed;
margin: 0 auto; margin: 0 auto;