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

Merge pull request #1740 from normanjaeckel/FontsRepo 

Used our own repository for Open Sans font.
This commit is contained in:
Oskar Hahn 2015-12-07 10:26:37 +01:00
parent 586f781f8d 1b1e8f8ba2
commit 87c63f0d19
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -31,6 +31,6 @@
"ckeditor": "~4.5.4",
"angular-ckeditor": "~1.0.0",
"roboto-condensed": "~0.3.0",
"opensans-webfont-for-bower": "a4b3b75afa"
"open-sans-fontface": "https://github.com/OpenSlides/open-sans.git#1.4.2.post1"
}
}

2
openslides/core/static/css/app.css
View File

@ -9,7 +9,7 @@
}
body {
font-family: "open_sansregular",Helvetica,Arial,sans-serif;
font-family: "Open Sans",Helvetica,Arial,sans-serif;
font-weight: 400;
font-size: 14px;
line-height: 1.5;