diff --git a/maloja/server.py b/maloja/server.py index 4063dec..86cf068 100644 --- a/maloja/server.py +++ b/maloja/server.py @@ -206,7 +206,7 @@ def login(): @webserver.route("/.") @webserver.route("/media/.") def static(name,ext): - assert ext in ["txt","ico","jpeg","jpg","png","less","js"] + assert ext in ["txt","ico","jpeg","jpg","png","less","js","ttf"] response = static_file(ext + "/" + name + "." + ext,root=STATICFOLDER) response.set_header("Cache-Control", "public, max-age=3600") return response diff --git a/maloja/web/static/css/grisonsfont.css b/maloja/web/static/css/grisonsfont.css index e424fbf..c454368 100644 --- a/maloja/web/static/css/grisonsfont.css +++ b/maloja/web/static/css/grisonsfont.css @@ -1,45 +1,7 @@ -/* cyrillic-ext */ + @font-face { font-family: 'Ubuntu'; font-style: normal; font-weight: 400; - src: local('Ubuntu Regular'), local('Ubuntu-Regular'), url(https://fonts.gstatic.com/s/ubuntu/v14/4iCs6KVjbNBYlgoKcg72j00.woff2) format('woff2'); -} -/* cyrillic */ -@font-face { - font-family: 'Ubuntu'; - font-style: normal; - font-weight: 400; - src: local('Ubuntu Regular'), local('Ubuntu-Regular'), url(https://fonts.gstatic.com/s/ubuntu/v14/4iCs6KVjbNBYlgoKew72j00.woff2) format('woff2'); - unicode-range: U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116; -} -/* greek-ext */ -@font-face { - font-family: 'Ubuntu'; - font-style: normal; - font-weight: 400; - src: local('Ubuntu Regular'), local('Ubuntu-Regular'), url(https://fonts.gstatic.com/s/ubuntu/v14/4iCs6KVjbNBYlgoKcw72j00.woff2) format('woff2'); - unicode-range: U+1F00-1FFF; -} -/* greek */ -@font-face { - font-family: 'Ubuntu'; - font-style: normal; - font-weight: 400; - src: local('Ubuntu Regular'), local('Ubuntu-Regular'), url(https://fonts.gstatic.com/s/ubuntu/v14/4iCs6KVjbNBYlgoKfA72j00.woff2) format('woff2'); - unicode-range: U+0370-03FF; -} -/* latin-ext */ -@font-face { - font-family: 'Ubuntu'; - font-style: normal; - font-weight: 400; - src: local('Ubuntu Regular'), local('Ubuntu-Regular'), url(https://fonts.gstatic.com/s/ubuntu/v14/4iCs6KVjbNBYlgoKcQ72j00.woff2) format('woff2'); -} -/* latin */ -@font-face { - font-family: 'Ubuntu'; - font-style: normal; - font-weight: 400; - src: local('Ubuntu Regular'), local('Ubuntu-Regular'), url(https://fonts.gstatic.com/s/ubuntu/v14/4iCs6KVjbNBYlgoKfw72.woff2) format('woff2'); + src: local('Ubuntu Regular'), local('Ubuntu-Regular'), url('/Ubuntu-Regular.ttf') format('woff2'); } diff --git a/maloja/web/static/ttf/Ubuntu-Bold.ttf b/maloja/web/static/ttf/Ubuntu-Bold.ttf new file mode 100644 index 0000000..c2293d5 Binary files /dev/null and b/maloja/web/static/ttf/Ubuntu-Bold.ttf differ diff --git a/maloja/web/static/ttf/Ubuntu-BoldItalic.ttf b/maloja/web/static/ttf/Ubuntu-BoldItalic.ttf new file mode 100644 index 0000000..ce6e784 Binary files /dev/null and b/maloja/web/static/ttf/Ubuntu-BoldItalic.ttf differ diff --git a/maloja/web/static/ttf/Ubuntu-Italic.ttf b/maloja/web/static/ttf/Ubuntu-Italic.ttf new file mode 100644 index 0000000..a599244 Binary files /dev/null and b/maloja/web/static/ttf/Ubuntu-Italic.ttf differ diff --git a/maloja/web/static/ttf/Ubuntu-Light.ttf b/maloja/web/static/ttf/Ubuntu-Light.ttf new file mode 100644 index 0000000..b310d15 Binary files /dev/null and b/maloja/web/static/ttf/Ubuntu-Light.ttf differ diff --git a/maloja/web/static/ttf/Ubuntu-LightItalic.ttf b/maloja/web/static/ttf/Ubuntu-LightItalic.ttf new file mode 100644 index 0000000..ad0741b Binary files /dev/null and b/maloja/web/static/ttf/Ubuntu-LightItalic.ttf differ diff --git a/maloja/web/static/ttf/Ubuntu-Medium.ttf b/maloja/web/static/ttf/Ubuntu-Medium.ttf new file mode 100644 index 0000000..7340a40 Binary files /dev/null and b/maloja/web/static/ttf/Ubuntu-Medium.ttf differ diff --git a/maloja/web/static/ttf/Ubuntu-MediumItalic.ttf b/maloja/web/static/ttf/Ubuntu-MediumItalic.ttf new file mode 100644 index 0000000..36ac1ae Binary files /dev/null and b/maloja/web/static/ttf/Ubuntu-MediumItalic.ttf differ diff --git a/maloja/web/static/ttf/Ubuntu-Regular.ttf b/maloja/web/static/ttf/Ubuntu-Regular.ttf new file mode 100644 index 0000000..f98a2da Binary files /dev/null and b/maloja/web/static/ttf/Ubuntu-Regular.ttf differ