entrouvert
/
gadjo
15
0
Fork 0
Code Issues Pull Requests 2 Releases Activity

style: switch to Open Sans (#14574)

This commit is contained in:
Frédéric Péters 2017-01-18 17:52:54 +01:00
parent 00308c8355
commit 240a8bfc6d
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gadjo/finders.py
View File

@ -36,7 +36,7 @@ class XStaticStorage(FileSystemStorage):
class XStaticFinder(BaseFinder):
storage_class = XStaticStorage
gadjo_deps = ['jquery', 'jquery_ui', 'font_awesome']
gadjo_deps = ['jquery', 'jquery_ui', 'font_awesome', 'opensans']
def __init__(self, apps=None, *args, **kwargs):
# The list of apps that are handled

13
gadjo/static/css/_opensans.scss Normal file
View File

@ -0,0 +1,13 @@
@font-face {
font-family: 'Open Sans';
src: url('../xstatic/fonts/Regular/OpenSans-Regular.eot?#iefix') format('embedded-opentype'), url('../xstatic/fonts/Regular/OpenSans-Regular.woff') format('woff'), url('../xstatic/fonts/Regular/OpenSans-Regular.ttf') format('truetype'), url('../xstatic/fonts/Regular/OpenSans-Regular.svg#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'Open Sans';
src: url('../xstatic/fonts/Bold/OpenSans-Bold.eot?#iefix') format('embedded-opentype'), url('../xstatic/fonts/Bold/OpenSans-Bold.woff') format('woff'), url('../xstatic/fonts/Bold/OpenSans-Bold.ttf') format('truetype'), url('../xstatic/fonts/Bold/OpenSans-Bold.svg#fontawesomeregular') format('svg');
font-weight: bold;
font-style: normal;
}

4
gadjo/static/css/gadjo.scss
View File

@ -1,10 +1,12 @@
@import 'opensans';
@import 'utils';
/* generalities */
html, body {
margin: 0;
font-family: "Bitstream Vera Sans", "Verdana", sans-serif;
font-family: "Open Sans", sans-serif;
font-size: 12px;
background: #f2f2f2;
color: #3c3c33;
}

1
setup.py
View File

@ -208,6 +208,7 @@ setup(
'XStatic_Font_Awesome',
'XStatic_jQuery',
'XStatic_jquery_ui',
'XStatic_OpenSans',
],
setup_requires=[
'Pillow',