diff --git a/MANIFEST.in b/MANIFEST.in
index 320f187..af3cdd3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,5 @@
include README.txt
-recursive-include xstatic/pkg/roboto_fontface *
-
+recursive-include xstatic *
global-exclude *.pyc
global-exclude *.pyo
global-exclude *.orig
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..46526e2
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,20 @@
+[metadata]
+name = XStatic-roboto-fontface
+description = roboto-fontface 0.5.0 (XStatic packaging standard)
+description-file = README.rst
+maintainer = Rob Cresswell
+maintainer-email = robert.cresswell@outlook.com
+home-page = https://github.com/choffmeister/roboto-fontface-bower
+keywords = roboto_fontface xstatic
+license = Apache-2.0
+zip_safe = False
+namespace_packages =
+ xstatic
+ xstatic.pkg
+
+[files]
+packages =
+ xstatic
+
+[bdist_wheel]
+universal = True
diff --git a/setup.py b/setup.py
index ff7c138..2427b46 100644
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,10 @@
-
+from setuptools import setup, find_packages
from xstatic.pkg import roboto_fontface as xs
# The README.txt file should be written in reST so that PyPI can use
# it to generate your project's PyPI page.
long_description = open('README.txt').read()
-from setuptools import setup, find_packages
-
setup(
name=xs.PACKAGE_NAME,
version=xs.PACKAGE_VERSION,
@@ -20,7 +18,7 @@ setup(
url=xs.HOMEPAGE,
platforms=xs.PLATFORMS,
packages=find_packages(),
- namespace_packages=['xstatic', 'xstatic.pkg', ],
+ namespace_packages=['xstatic', 'xstatic.pkg'],
include_package_data=True,
zip_safe=False,
install_requires=[],
diff --git a/xstatic/pkg/roboto_fontface/__init__.py b/xstatic/pkg/roboto_fontface/__init__.py
index c0714e9..c5375e0 100644
--- a/xstatic/pkg/roboto_fontface/__init__.py
+++ b/xstatic/pkg/roboto_fontface/__init__.py
@@ -15,9 +15,9 @@ NAME = __name__.split('.')[-1] # package name (e.g. 'foo' or 'foo_bar')
# please use a all-lowercase valid python
# package name
-VERSION = '0.4.3' # version of the packaged files, please use the upstream
+VERSION = '0.5.0' # version of the packaged files, please use the upstream
# version number
-BUILD = '2' # our package build number, so we can release new builds
+BUILD = '0' # our package build number, so we can release new builds
# with fixes for xstatic stuff.
PACKAGE_VERSION = VERSION + '.' + BUILD # version used for PyPi
@@ -28,14 +28,14 @@ CLASSIFIERS = []
KEYWORDS = 'roboto_fontface xstatic'
# XStatic-* package maintainer:
-MAINTAINER = 'Diana Whitten'
-MAINTAINER_EMAIL = 'hurgleburgler@gmail.com'
+MAINTAINER = 'Rob Cresswell'
+MAINTAINER_EMAIL = 'robert.cresswell@outlook.com'
# this refers to the project homepage of the stuff we packaged:
HOMEPAGE = 'https://github.com/choffmeister/roboto-fontface-bower'
# this refers to all files:
-LICENSE = '(same as %s)' % DISPLAY_NAME
+LICENSE = 'Apache-2.0'
from os.path import join, dirname
BASE_DIR = join(dirname(__file__), 'data')
diff --git a/xstatic/pkg/roboto_fontface/data/README.md b/xstatic/pkg/roboto_fontface/data/README.md
index e01b8fe..7e8e9c1 100644
--- a/xstatic/pkg/roboto_fontface/data/README.md
+++ b/xstatic/pkg/roboto_fontface/data/README.md
@@ -14,6 +14,26 @@ $ npm install roboto-fontface --save
$ bower install roboto-fontface --save
```
+
+## Usage
+
+There're several files in the `css/` subdirectory. Import them in your project
+to have access to "Roboto" font face:
+
+* `css/roboto/roboto-fontface.css` - whole font family compiled to CSS
+* `css/roboto/sass/roboto-fontface.scss` - whole font family in SCSS
+* `css/roboto/less/roboto-fontface.less` - whole font family in LESS
+
+* `css/roboto-condensed/roboto-condensed-fontface.css` - whole font family compiled to CSS
+* `css/roboto-condensed/sass/roboto-condensed-fontface.scss` - whole font family in SCSS
+* `css/roboto-condensed/less/roboto-condensed-fontface.less` - whole font family in LESS
+
+Importing whole family may be unnecessary and lead to huge build, so if you are
+using SCSS or LESS, you can import only individual weights by importing for example:
+
+* `css/roboto/sass/roboto-fontface-black.scss`
+* `css/roboto/sass/roboto-fontface-black-italic.scss`
+
## Hinting
Some of the included font files have [hinting](http://en.wikipedia.org/wiki/Font_hinting).
diff --git a/xstatic/pkg/roboto_fontface/data/css/mixins.less b/xstatic/pkg/roboto_fontface/data/css/mixins.less
new file mode 100644
index 0000000..dad81b8
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/mixins.less
@@ -0,0 +1,32 @@
+@roboto-font-path: '../../../fonts';
+
+.roboto-font(@variant, @type, @weight, @style) {
+
+ @font-full-path: '@{roboto-font-path}/@{variant}/@{variant}';
+
+ @font-face {
+ font-family: '@{variant}';
+ src: url('@{font-full-path}-@{type}.eot');
+ src: local('@{variant} @{type}'),
+ local('@{variant}-@{type}'),
+ url('@{font-full-path}-@{type}.eot?#iefix') format('embedded-opentype'),
+ url('@{font-full-path}-@{type}.woff2') format('woff2'),
+ url('@{font-full-path}-@{type}.woff') format('woff'),
+ url('@{font-full-path}-@{type}.ttf') format('truetype'),
+ url('@{font-full-path}-@{type}.svg#@{variant}') format('svg');
+ font-weight: @weight;
+ font-style: @style;
+ }
+
+ @font-face {
+ font-family: '@{variant}-@{type}';
+ src: url('@{font-full-path}-@{type}.eot');
+ src: local('@{variant} @{type}'),
+ local('@{variant}-@{type}'),
+ url('@{font-full-path}-@{type}.eot?#iefix') format('embedded-opentype'),
+ url('@{font-full-path}-@{type}.woff2') format('woff2'),
+ url('@{font-full-path}-@{type}.woff') format('woff'),
+ url('@{font-full-path}-@{type}.ttf') format('truetype'),
+ url('@{font-full-path}-@{type}.svg#@{variant}') format('svg');
+ }
+}
diff --git a/xstatic/pkg/roboto_fontface/data/css/mixins.scss b/xstatic/pkg/roboto_fontface/data/css/mixins.scss
new file mode 100644
index 0000000..fec67d2
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/mixins.scss
@@ -0,0 +1,32 @@
+$roboto-font-path: '../../../fonts' !default;
+
+@mixin roboto-font($variant, $type, $weight, $style) {
+
+ $font-full-path: '#{$roboto-font-path}/#{$variant}/#{$variant}';
+
+ @font-face {
+ font-family: '#{$variant}';
+ src: url('#{$font-full-path}-#{$type}.eot');
+ src: local('#{$variant} #{$type}'),
+ local('#{$variant}-#{$type}'),
+ url('#{$font-full-path}-#{$type}.eot?#iefix') format('embedded-opentype'),
+ url('#{$font-full-path}-#{$type}.woff2') format('woff2'),
+ url('#{$font-full-path}-#{$type}.woff') format('woff'),
+ url('#{$font-full-path}-#{$type}.ttf') format('truetype'),
+ url('#{$font-full-path}-#{$type}.svg##{$variant}') format('svg');
+ font-weight: $weight;
+ font-style: $style;
+ }
+
+ @font-face {
+ font-family: '#{$variant}-#{$type}';
+ src: url('#{$font-full-path}/#{$variant}-#{$type}.eot');
+ src: local('#{$variant} #{$type}'),
+ local('#{$variant}-#{$type}'),
+ url('#{$font-full-path}-#{$type}.eot?#iefix') format('embedded-opentype'),
+ url('#{$font-full-path}-#{$type}.woff2') format('woff2'),
+ url('#{$font-full-path}-#{$type}.woff') format('woff'),
+ url('#{$font-full-path}-#{$type}.ttf') format('truetype'),
+ url('#{$font-full-path}-#{$type}.svg##{$variant}') format('svg');
+ }
+}
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-bold-italic.less b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-bold-italic.less
new file mode 100644
index 0000000..eb1ca48
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-bold-italic.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto-Condensed','BoldItalic', 700, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-bold.less b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-bold.less
new file mode 100644
index 0000000..9277be6
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-bold.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto-Condensed','Bold', 700, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-light-italic.less b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-light-italic.less
new file mode 100644
index 0000000..ee4188b
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-light-italic.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto-Condensed','LightItalic', 300, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-light.less b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-light.less
new file mode 100644
index 0000000..f013afb
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-light.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto-Condensed','Light', 300, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-regular-italic.less b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-regular-italic.less
new file mode 100644
index 0000000..321b477
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-regular-italic.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto-Condensed','RegularItalic', 400, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-regular.less b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-regular.less
new file mode 100644
index 0000000..eb31a6e
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface-regular.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto-Condensed','Regular', 400, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface.less b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface.less
new file mode 100644
index 0000000..18a3c41
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/less/roboto-condensed-fontface.less
@@ -0,0 +1,6 @@
+@import "roboto-condensed-fontface-regular";
+@import "roboto-condensed-fontface-regular-italic";
+@import "roboto-condensed-fontface-light";
+@import "roboto-condensed-fontface-light-italic";
+@import "roboto-condensed-fontface-bold";
+@import "roboto-condensed-fontface-bold-italic";
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/roboto-condensed-fontface.css b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/roboto-condensed-fontface.css
new file mode 100644
index 0000000..dfe1398
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/roboto-condensed-fontface.css
@@ -0,0 +1,83 @@
+@font-face {
+ font-family: "Roboto-Condensed";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed-Regular.eot");
+ src: local("Roboto-Condensed Regular"), local("Roboto-Condensed-Regular"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Regular.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Regular.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Regular.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Regular.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Regular.svg#Roboto-Condensed") format("svg");
+ font-weight: 400;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: "Roboto-Condensed-Regular";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed/Roboto-Condensed-Regular.eot");
+ src: local("Roboto-Condensed Regular"), local("Roboto-Condensed-Regular"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Regular.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Regular.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Regular.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Regular.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Regular.svg#Roboto-Condensed") format("svg");
+}
+
+@font-face {
+ font-family: "Roboto-Condensed";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed-RegularItalic.eot");
+ src: local("Roboto-Condensed RegularItalic"), local("Roboto-Condensed-RegularItalic"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-RegularItalic.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-RegularItalic.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-RegularItalic.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-RegularItalic.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-RegularItalic.svg#Roboto-Condensed") format("svg");
+ font-weight: 400;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: "Roboto-Condensed-RegularItalic";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed/Roboto-Condensed-RegularItalic.eot");
+ src: local("Roboto-Condensed RegularItalic"), local("Roboto-Condensed-RegularItalic"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-RegularItalic.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-RegularItalic.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-RegularItalic.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-RegularItalic.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-RegularItalic.svg#Roboto-Condensed") format("svg");
+}
+
+@font-face {
+ font-family: "Roboto-Condensed";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed-Light.eot");
+ src: local("Roboto-Condensed Light"), local("Roboto-Condensed-Light"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Light.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Light.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Light.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Light.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Light.svg#Roboto-Condensed") format("svg");
+ font-weight: 300;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: "Roboto-Condensed-Light";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed/Roboto-Condensed-Light.eot");
+ src: local("Roboto-Condensed Light"), local("Roboto-Condensed-Light"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Light.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Light.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Light.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Light.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Light.svg#Roboto-Condensed") format("svg");
+}
+
+@font-face {
+ font-family: "Roboto-Condensed";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed-LightItalic.eot");
+ src: local("Roboto-Condensed LightItalic"), local("Roboto-Condensed-LightItalic"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-LightItalic.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-LightItalic.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-LightItalic.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-LightItalic.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-LightItalic.svg#Roboto-Condensed") format("svg");
+ font-weight: 300;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: "Roboto-Condensed-LightItalic";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed/Roboto-Condensed-LightItalic.eot");
+ src: local("Roboto-Condensed LightItalic"), local("Roboto-Condensed-LightItalic"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-LightItalic.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-LightItalic.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-LightItalic.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-LightItalic.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-LightItalic.svg#Roboto-Condensed") format("svg");
+}
+
+@font-face {
+ font-family: "Roboto-Condensed";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed-Bold.eot");
+ src: local("Roboto-Condensed Bold"), local("Roboto-Condensed-Bold"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Bold.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Bold.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Bold.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Bold.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Bold.svg#Roboto-Condensed") format("svg");
+ font-weight: 700;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: "Roboto-Condensed-Bold";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed/Roboto-Condensed-Bold.eot");
+ src: local("Roboto-Condensed Bold"), local("Roboto-Condensed-Bold"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Bold.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Bold.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Bold.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Bold.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-Bold.svg#Roboto-Condensed") format("svg");
+}
+
+@font-face {
+ font-family: "Roboto-Condensed";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.eot");
+ src: local("Roboto-Condensed BoldItalic"), local("Roboto-Condensed-BoldItalic"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.svg#Roboto-Condensed") format("svg");
+ font-weight: 700;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: "Roboto-Condensed-BoldItalic";
+ src: url("../../fonts/Roboto-Condensed/Roboto-Condensed/Roboto-Condensed-BoldItalic.eot");
+ src: local("Roboto-Condensed BoldItalic"), local("Roboto-Condensed-BoldItalic"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.eot?#iefix") format("embedded-opentype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.woff2") format("woff2"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.woff") format("woff"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.ttf") format("truetype"), url("../../fonts/Roboto-Condensed/Roboto-Condensed-BoldItalic.svg#Roboto-Condensed") format("svg");
+}
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-bold-italic.scss b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-bold-italic.scss
new file mode 100644
index 0000000..cf43231
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-bold-italic.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto-Condensed','BoldItalic', 700, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-bold.scss b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-bold.scss
new file mode 100644
index 0000000..f394697
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-bold.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto-Condensed','Bold', 700, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-light-italic.scss b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-light-italic.scss
new file mode 100644
index 0000000..c0d3463
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-light-italic.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto-Condensed','LightItalic', 300, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-light.scss b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-light.scss
new file mode 100644
index 0000000..94c4647
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-light.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto-Condensed','Light', 300, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-regular-italic.scss b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-regular-italic.scss
new file mode 100644
index 0000000..a819ccc
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-regular-italic.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto-Condensed','RegularItalic', 400, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-regular.scss b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-regular.scss
new file mode 100644
index 0000000..25cdec5
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface-regular.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto-Condensed','Regular', 400, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface.scss b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface.scss
new file mode 100644
index 0000000..18a3c41
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto-condensed/sass/roboto-condensed-fontface.scss
@@ -0,0 +1,6 @@
+@import "roboto-condensed-fontface-regular";
+@import "roboto-condensed-fontface-regular-italic";
+@import "roboto-condensed-fontface-light";
+@import "roboto-condensed-fontface-light-italic";
+@import "roboto-condensed-fontface-bold";
+@import "roboto-condensed-fontface-bold-italic";
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-fontface.css b/xstatic/pkg/roboto_fontface/data/css/roboto-fontface.css
deleted file mode 100644
index 74f3e73..0000000
--- a/xstatic/pkg/roboto_fontface/data/css/roboto-fontface.css
+++ /dev/null
@@ -1,263 +0,0 @@
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-Thin.eot');
- src: url('../fonts/Roboto-Thin.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Thin.woff2') format('woff2'),
- url('../fonts/Roboto-Thin.woff') format('woff'),
- url('../fonts/Roboto-Thin.ttf') format('truetype'),
- url('../fonts/Roboto-Thin.svg#Roboto') format('svg');
- font-weight: 100;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Roboto-Thin';
- src: url('../fonts/Roboto-Thin.eot');
- src: url('../fonts/Roboto-Thin.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Thin.woff2') format('woff2'),
- url('../fonts/Roboto-Thin.woff') format('woff'),
- url('../fonts/Roboto-Thin.ttf') format('truetype'),
- url('../fonts/Roboto-Thin.svg#Roboto') format('svg');
-}
-
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-ThinItalic.eot');
- src: url('../fonts/Roboto-ThinItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-ThinItalic.woff2') format('woff2'),
- url('../fonts/Roboto-ThinItalic.woff') format('woff'),
- url('../fonts/Roboto-ThinItalic.ttf') format('truetype'),
- url('../fonts/Roboto-ThinItalic.svg#Roboto') format('svg');
- font-weight: 100;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Roboto-ThinItalic';
- src: url('../fonts/Roboto-ThinItalic.eot');
- src: url('../fonts/Roboto-ThinItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-ThinItalic.woff2') format('woff2'),
- url('../fonts/Roboto-ThinItalic.woff') format('woff'),
- url('../fonts/Roboto-ThinItalic.ttf') format('truetype'),
- url('../fonts/Roboto-ThinItalic.svg#Roboto') format('svg');
-}
-
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-Light.eot');
- src: url('../fonts/Roboto-Light.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Light.woff2') format('woff2'),
- url('../fonts/Roboto-Light.woff') format('woff'),
- url('../fonts/Roboto-Light.ttf') format('truetype'),
- url('../fonts/Roboto-Light.svg#Roboto') format('svg');
- font-weight: 300;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Roboto-Light';
- src: url('../fonts/Roboto-Light.eot');
- src: url('../fonts/Roboto-Light.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Light.woff2') format('woff2'),
- url('../fonts/Roboto-Light.woff') format('woff'),
- url('../fonts/Roboto-Light.ttf') format('truetype'),
- url('../fonts/Roboto-Light.svg#Roboto') format('svg');
-}
-
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-LightItalic.eot');
- src: url('../fonts/Roboto-LightItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-LightItalic.woff2') format('woff2'),
- url('../fonts/Roboto-LightItalic.woff') format('woff'),
- url('../fonts/Roboto-LightItalic.ttf') format('truetype'),
- url('../fonts/Roboto-LightItalic.svg#Roboto') format('svg');
- font-weight: 300;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Roboto-LightItalic';
- src: url('../fonts/Roboto-LightItalic.eot');
- src: url('../fonts/Roboto-LightItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-LightItalic.woff2') format('woff2'),
- url('../fonts/Roboto-LightItalic.woff') format('woff'),
- url('../fonts/Roboto-LightItalic.ttf') format('truetype'),
- url('../fonts/Roboto-LightItalic.svg#Roboto') format('svg');
-}
-
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-Regular.eot');
- src: url('../fonts/Roboto-Regular.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Regular.woff2') format('woff2'),
- url('../fonts/Roboto-Regular.woff') format('woff'),
- url('../fonts/Roboto-Regular.ttf') format('truetype'),
- url('../fonts/Roboto-Regular.svg#Roboto') format('svg');
- font-weight: 400;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Roboto-Regular';
- src: url('../fonts/Roboto-Regular.eot');
- src: url('../fonts/Roboto-Regular.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Regular.woff2') format('woff2'),
- url('../fonts/Roboto-Regular.woff') format('woff'),
- url('../fonts/Roboto-Regular.ttf') format('truetype'),
- url('../fonts/Roboto-Regular.svg#Roboto') format('svg');
-}
-
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-RegularItalic.eot');
- src: url('../fonts/Roboto-RegularItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-RegularItalic.woff2') format('woff2'),
- url('../fonts/Roboto-RegularItalic.woff') format('woff'),
- url('../fonts/Roboto-RegularItalic.ttf') format('truetype'),
- url('../fonts/Roboto-RegularItalic.svg#Roboto') format('svg');
- font-weight: 400;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Roboto-RegularItalic';
- src: url('../fonts/Roboto-RegularItalic.eot');
- src: url('../fonts/Roboto-RegularItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-RegularItalic.woff2') format('woff2'),
- url('../fonts/Roboto-RegularItalic.woff') format('woff'),
- url('../fonts/Roboto-RegularItalic.ttf') format('truetype'),
- url('../fonts/Roboto-RegularItalic.svg#Roboto') format('svg');
-}
-
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-Medium.eot');
- src: url('../fonts/Roboto-Medium.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Medium.woff2') format('woff2'),
- url('../fonts/Roboto-Medium.woff') format('woff'),
- url('../fonts/Roboto-Medium.ttf') format('truetype'),
- url('../fonts/Roboto-Medium.svg#Roboto') format('svg');
- font-weight: 500;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Roboto-Medium';
- src: url('../fonts/Roboto-Medium.eot');
- src: url('../fonts/Roboto-Medium.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Medium.woff2') format('woff2'),
- url('../fonts/Roboto-Medium.woff') format('woff'),
- url('../fonts/Roboto-Medium.ttf') format('truetype'),
- url('../fonts/Roboto-Medium.svg#Roboto') format('svg');
-}
-
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-MediumItalic.eot');
- src: url('../fonts/Roboto-MediumItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-MediumItalic.woff2') format('woff2'),
- url('../fonts/Roboto-MediumItalic.woff') format('woff'),
- url('../fonts/Roboto-MediumItalic.ttf') format('truetype'),
- url('../fonts/Roboto-MediumItalic.svg#Roboto') format('svg');
- font-weight: 500;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Roboto-MediumItalic';
- src: url('../fonts/Roboto-MediumItalic.eot');
- src: url('../fonts/Roboto-MediumItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-MediumItalic.woff2') format('woff2'),
- url('../fonts/Roboto-MediumItalic.woff') format('woff'),
- url('../fonts/Roboto-MediumItalic.ttf') format('truetype'),
- url('../fonts/Roboto-MediumItalic.svg#Roboto') format('svg');
-}
-
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-Bold.eot');
- src: url('../fonts/Roboto-Bold.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Bold.woff2') format('woff2'),
- url('../fonts/Roboto-Bold.woff') format('woff'),
- url('../fonts/Roboto-Bold.ttf') format('truetype'),
- url('../fonts/Roboto-Bold.svg#Roboto') format('svg');
- font-weight: 700;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Roboto-Bold';
- src: url('../fonts/Roboto-Bold.eot');
- src: url('../fonts/Roboto-Bold.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Bold.woff2') format('woff2'),
- url('../fonts/Roboto-Bold.woff') format('woff'),
- url('../fonts/Roboto-Bold.ttf') format('truetype'),
- url('../fonts/Roboto-Bold.svg#Roboto') format('svg');
-}
-
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-BoldItalic.eot');
- src: url('../fonts/Roboto-BoldItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-BoldItalic.woff2') format('woff2'),
- url('../fonts/Roboto-BoldItalic.woff') format('woff'),
- url('../fonts/Roboto-BoldItalic.ttf') format('truetype'),
- url('../fonts/Roboto-BoldItalic.svg#Roboto') format('svg');
- font-weight: 700;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Roboto-BoldItalic';
- src: url('../fonts/Roboto-BoldItalic.eot');
- src: url('../fonts/Roboto-BoldItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-BoldItalic.woff2') format('woff2'),
- url('../fonts/Roboto-BoldItalic.woff') format('woff'),
- url('../fonts/Roboto-BoldItalic.ttf') format('truetype'),
- url('../fonts/Roboto-BoldItalic.svg#Roboto') format('svg');
-}
-
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-Black.eot');
- src: url('../fonts/Roboto-Black.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Black.woff2') format('woff2'),
- url('../fonts/Roboto-Black.woff') format('woff'),
- url('../fonts/Roboto-Black.ttf') format('truetype'),
- url('../fonts/Roboto-Black.svg#Roboto') format('svg');
- font-weight: 900;
- font-style: normal;
-}
-
-@font-face {
- font-family: 'Roboto-Black';
- src: url('../fonts/Roboto-Black.eot');
- src: url('../fonts/Roboto-Black.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-Black.woff2') format('woff2'),
- url('../fonts/Roboto-Black.woff') format('woff'),
- url('../fonts/Roboto-Black.ttf') format('truetype'),
- url('../fonts/Roboto-Black.svg#Roboto') format('svg');
-}
-
-@font-face {
- font-family: 'Roboto';
- src: url('../fonts/Roboto-BlackItalic.eot');
- src: url('../fonts/Roboto-BlackItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-BlackItalic.woff2') format('woff2'),
- url('../fonts/Roboto-BlackItalic.woff') format('woff'),
- url('../fonts/Roboto-BlackItalic.ttf') format('truetype'),
- url('../fonts/Roboto-BlackItalic.svg#Roboto') format('svg');
- font-weight: 900;
- font-style: italic;
-}
-
-@font-face {
- font-family: 'Roboto-BlackItalic';
- src: url('../fonts/Roboto-BlackItalic.eot');
- src: url('../fonts/Roboto-BlackItalic.eot?#iefix') format('embedded-opentype'),
- url('../fonts/Roboto-BlackItalic.woff2') format('woff2'),
- url('../fonts/Roboto-BlackItalic.woff') format('woff'),
- url('../fonts/Roboto-BlackItalic.ttf') format('truetype'),
- url('../fonts/Roboto-BlackItalic.svg#Roboto') format('svg');
-}
\ No newline at end of file
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-fontface.less b/xstatic/pkg/roboto_fontface/data/css/roboto-fontface.less
deleted file mode 100644
index ad8be20..0000000
--- a/xstatic/pkg/roboto_fontface/data/css/roboto-fontface.less
+++ /dev/null
@@ -1,37 +0,0 @@
-@roboto-font-path: '../fonts';
-
-.roboto-font(@type, @weight, @style) {
- @font-face {
- font-family: 'Roboto';
- src: url('@{roboto-font-path}/Roboto-@{type}.eot');
- src: url('@{roboto-font-path}/Roboto-@{type}.eot?#iefix') format('embedded-opentype'),
- url('@{roboto-font-path}/Roboto-@{type}.woff2') format('woff2'),
- url('@{roboto-font-path}/Roboto-@{type}.woff') format('woff'),
- url('@{roboto-font-path}/Roboto-@{type}.ttf') format('truetype'),
- url('@{roboto-font-path}/Roboto-@{type}.svg#Roboto') format('svg');
- font-weight: @weight;
- font-style: @style;
- }
-
- @font-face {
- font-family: 'Roboto-@{type}';
- src: url('@{roboto-font-path}/Roboto-@{type}.eot');
- src: url('@{roboto-font-path}/Roboto-@{type}.eot?#iefix') format('embedded-opentype'),
- url('@{roboto-font-path}/Roboto-@{type}.woff2') format('woff2'),
- url('@{roboto-font-path}/Roboto-@{type}.woff') format('woff'),
- url('@{roboto-font-path}/Roboto-@{type}.ttf') format('truetype'),
- url('@{roboto-font-path}/Roboto-@{type}.svg#Roboto') format('svg');
- }
-}
-
-.roboto-font-pair(@type, @weight) {
- .roboto-font('@{type}', @weight, normal);
- .roboto-font('@{type}Italic', @weight, italic);
-}
-
-.roboto-font-pair('Thin', 100);
-.roboto-font-pair('Light', 300);
-.roboto-font-pair('Regular', 400);
-.roboto-font-pair('Medium', 500);
-.roboto-font-pair('Bold', 700);
-.roboto-font-pair('Black', 900);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto-fontface.scss b/xstatic/pkg/roboto_fontface/data/css/roboto-fontface.scss
deleted file mode 100644
index 28df00e..0000000
--- a/xstatic/pkg/roboto_fontface/data/css/roboto-fontface.scss
+++ /dev/null
@@ -1,37 +0,0 @@
-$roboto-font-path: '../fonts' !default;
-
-@mixin roboto-font($type, $weight, $style: normal) {
- @font-face {
- font-family: 'Roboto';
- src: url('#{$roboto-font-path}/Roboto-#{$type}.eot');
- src: url('#{$roboto-font-path}/Roboto-#{$type}.eot?#iefix') format('embedded-opentype'),
- url('#{$roboto-font-path}/Roboto-#{$type}.woff2') format('woff2'),
- url('#{$roboto-font-path}/Roboto-#{$type}.woff') format('woff'),
- url('#{$roboto-font-path}/Roboto-#{$type}.ttf') format('truetype'),
- url('#{$roboto-font-path}/Roboto-#{$type}.svg#Roboto') format('svg');
- font-weight: $weight;
- font-style: $style;
- }
-
- @font-face {
- font-family: 'Roboto-#{$type}';
- src: url('#{$roboto-font-path}/Roboto-#{$type}.eot');
- src: url('#{$roboto-font-path}/Roboto-#{$type}.eot?#iefix') format('embedded-opentype'),
- url('#{$roboto-font-path}/Roboto-#{$type}.woff2') format('woff2'),
- url('#{$roboto-font-path}/Roboto-#{$type}.woff') format('woff'),
- url('#{$roboto-font-path}/Roboto-#{$type}.ttf') format('truetype'),
- url('#{$roboto-font-path}/Roboto-#{$type}.svg#Roboto') format('svg');
- }
-}
-
-@mixin roboto-font-pair($type, $weight) {
- @include roboto-font($type, $weight);
- @include roboto-font(#{$type}Italic, $weight, italic);
-}
-
-@include roboto-font-pair('Thin', 100);
-@include roboto-font-pair('Light', 300);
-@include roboto-font-pair('Regular', 400);
-@include roboto-font-pair('Medium', 500);
-@include roboto-font-pair('Bold', 700);
-@include roboto-font-pair('Black', 900);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-black-italic.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-black-italic.less
new file mode 100644
index 0000000..6dddf93
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-black-italic.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','BlackItalic', 900, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-black.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-black.less
new file mode 100644
index 0000000..754e184
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-black.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','Black', 900, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-bold-italic.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-bold-italic.less
new file mode 100644
index 0000000..522f9af
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-bold-italic.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','BoldItalic', 700, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-bold.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-bold.less
new file mode 100644
index 0000000..811f872
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-bold.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','Bold', 700, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-light-italic.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-light-italic.less
new file mode 100644
index 0000000..d903521
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-light-italic.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','LightItalic', 300, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-light.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-light.less
new file mode 100644
index 0000000..0282aae
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-light.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','Light', 300, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-medium-italic.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-medium-italic.less
new file mode 100644
index 0000000..4056356
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-medium-italic.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','MediumItalic', 500, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-medium.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-medium.less
new file mode 100644
index 0000000..32f27ad
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-medium.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','Medium', 500, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-regular-italic.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-regular-italic.less
new file mode 100644
index 0000000..a2a6705
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-regular-italic.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','RegularItalic', 400, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-regular.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-regular.less
new file mode 100644
index 0000000..d0957b1
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-regular.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','Regular', 400, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-thin-italic.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-thin-italic.less
new file mode 100644
index 0000000..4df9bb1
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-thin-italic.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','ThinItalic', 100, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-thin.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-thin.less
new file mode 100644
index 0000000..94983f1
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface-thin.less
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+.roboto-font('Roboto','Thin', 100, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface.less b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface.less
new file mode 100644
index 0000000..64ef2b6
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/less/roboto-fontface.less
@@ -0,0 +1,12 @@
+@import "roboto-fontface-regular";
+@import "roboto-fontface-regular-italic";
+@import "roboto-fontface-light";
+@import "roboto-fontface-light-italic";
+@import "roboto-fontface-thin";
+@import "roboto-fontface-thin-italic";
+@import "roboto-fontface-medium";
+@import "roboto-fontface-medium-italic";
+@import "roboto-fontface-bold";
+@import "roboto-fontface-bold-italic";
+@import "roboto-fontface-black";
+@import "roboto-fontface-black-italic";
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/roboto-fontface.css b/xstatic/pkg/roboto_fontface/data/css/roboto/roboto-fontface.css
new file mode 100644
index 0000000..91b8b81
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/roboto-fontface.css
@@ -0,0 +1,167 @@
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-Thin.eot');
+ src: local('Roboto Thin'), local('Roboto-Thin'), url('../../fonts/roboto/Roboto-Thin.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Thin.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Thin.woff') format('woff'), url('../../fonts/roboto/Roboto-Thin.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Thin.svg#Roboto') format('svg');
+ font-weight: 100;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Roboto-Thin';
+ src: url('../../fonts/roboto/Roboto-Thin.eot');
+ src: local('Roboto Thin'), local('Roboto-Thin'), url('../../fonts/roboto/Roboto-Thin.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Thin.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Thin.woff') format('woff'), url('../../fonts/roboto/Roboto-Thin.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Thin.svg#Roboto') format('svg');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-ThinItalic.eot');
+ src: local('Roboto ThinItalic'), local('Roboto-ThinItalic'), url('../../fonts/roboto/Roboto-ThinItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-ThinItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-ThinItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-ThinItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-ThinItalic.svg#Roboto') format('svg');
+ font-weight: 100;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Roboto-ThinItalic';
+ src: url('../../fonts/roboto/Roboto-ThinItalic.eot');
+ src: local('Roboto ThinItalic'), local('Roboto-ThinItalic'), url('../../fonts/roboto/Roboto-ThinItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-ThinItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-ThinItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-ThinItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-ThinItalic.svg#Roboto') format('svg');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-Light.eot');
+ src: local('Roboto Light'), local('Roboto-Light'), url('../../fonts/roboto/Roboto-Light.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Light.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Light.woff') format('woff'), url('../../fonts/roboto/Roboto-Light.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Light.svg#Roboto') format('svg');
+ font-weight: 300;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Roboto-Light';
+ src: url('../../fonts/roboto/Roboto-Light.eot');
+ src: local('Roboto Light'), local('Roboto-Light'), url('../../fonts/roboto/Roboto-Light.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Light.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Light.woff') format('woff'), url('../../fonts/roboto/Roboto-Light.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Light.svg#Roboto') format('svg');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-LightItalic.eot');
+ src: local('Roboto LightItalic'), local('Roboto-LightItalic'), url('../../fonts/roboto/Roboto-LightItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-LightItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-LightItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-LightItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-LightItalic.svg#Roboto') format('svg');
+ font-weight: 300;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Roboto-LightItalic';
+ src: url('../../fonts/roboto/Roboto-LightItalic.eot');
+ src: local('Roboto LightItalic'), local('Roboto-LightItalic'), url('../../fonts/roboto/Roboto-LightItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-LightItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-LightItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-LightItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-LightItalic.svg#Roboto') format('svg');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-Regular.eot');
+ src: local('Roboto Regular'), local('Roboto-Regular'), url('../../fonts/roboto/Roboto-Regular.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Regular.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Regular.woff') format('woff'), url('../../fonts/roboto/Roboto-Regular.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Regular.svg#Roboto') format('svg');
+ font-weight: 400;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Roboto-Regular';
+ src: url('../../fonts/roboto/Roboto-Regular.eot');
+ src: local('Roboto Regular'), local('Roboto-Regular'), url('../../fonts/roboto/Roboto-Regular.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Regular.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Regular.woff') format('woff'), url('../../fonts/roboto/Roboto-Regular.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Regular.svg#Roboto') format('svg');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-RegularItalic.eot');
+ src: local('Roboto RegularItalic'), local('Roboto-RegularItalic'), url('../../fonts/roboto/Roboto-RegularItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-RegularItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-RegularItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-RegularItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-RegularItalic.svg#Roboto') format('svg');
+ font-weight: 400;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Roboto-RegularItalic';
+ src: url('../../fonts/roboto/Roboto-RegularItalic.eot');
+ src: local('Roboto RegularItalic'), local('Roboto-RegularItalic'), url('../../fonts/roboto/Roboto-RegularItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-RegularItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-RegularItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-RegularItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-RegularItalic.svg#Roboto') format('svg');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-Medium.eot');
+ src: local('Roboto Medium'), local('Roboto-Medium'), url('../../fonts/roboto/Roboto-Medium.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Medium.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Medium.woff') format('woff'), url('../../fonts/roboto/Roboto-Medium.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Medium.svg#Roboto') format('svg');
+ font-weight: 500;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Roboto-Medium';
+ src: url('../../fonts/roboto/Roboto-Medium.eot');
+ src: local('Roboto Medium'), local('Roboto-Medium'), url('../../fonts/roboto/Roboto-Medium.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Medium.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Medium.woff') format('woff'), url('../../fonts/roboto/Roboto-Medium.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Medium.svg#Roboto') format('svg');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-MediumItalic.eot');
+ src: local('Roboto MediumItalic'), local('Roboto-MediumItalic'), url('../../fonts/roboto/Roboto-MediumItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-MediumItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-MediumItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-MediumItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-MediumItalic.svg#Roboto') format('svg');
+ font-weight: 500;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Roboto-MediumItalic';
+ src: url('../../fonts/roboto/Roboto-MediumItalic.eot');
+ src: local('Roboto MediumItalic'), local('Roboto-MediumItalic'), url('../../fonts/roboto/Roboto-MediumItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-MediumItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-MediumItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-MediumItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-MediumItalic.svg#Roboto') format('svg');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-Bold.eot');
+ src: local('Roboto Bold'), local('Roboto-Bold'), url('../../fonts/roboto/Roboto-Bold.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Bold.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Bold.woff') format('woff'), url('../../fonts/roboto/Roboto-Bold.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Bold.svg#Roboto') format('svg');
+ font-weight: 700;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Roboto-Bold';
+ src: url('../../fonts/roboto/Roboto-Bold.eot');
+ src: local('Roboto Bold'), local('Roboto-Bold'), url('../../fonts/roboto/Roboto-Bold.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Bold.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Bold.woff') format('woff'), url('../../fonts/roboto/Roboto-Bold.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Bold.svg#Roboto') format('svg');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-BoldItalic.eot');
+ src: local('Roboto BoldItalic'), local('Roboto-BoldItalic'), url('../../fonts/roboto/Roboto-BoldItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-BoldItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-BoldItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-BoldItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-BoldItalic.svg#Roboto') format('svg');
+ font-weight: 700;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Roboto-BoldItalic';
+ src: url('../../fonts/roboto/Roboto-BoldItalic.eot');
+ src: local('Roboto BoldItalic'), local('Roboto-BoldItalic'), url('../../fonts/roboto/Roboto-BoldItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-BoldItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-BoldItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-BoldItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-BoldItalic.svg#Roboto') format('svg');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-Black.eot');
+ src: local('Roboto Black'), local('Roboto-Black'), url('../../fonts/roboto/Roboto-Black.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Black.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Black.woff') format('woff'), url('../../fonts/roboto/Roboto-Black.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Black.svg#Roboto') format('svg');
+ font-weight: 900;
+ font-style: normal;
+}
+
+@font-face {
+ font-family: 'Roboto-Black';
+ src: url('../../fonts/roboto/Roboto-Black.eot');
+ src: local('Roboto Black'), local('Roboto-Black'), url('../../fonts/roboto/Roboto-Black.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-Black.woff2') format('woff2'), url('../../fonts/roboto/Roboto-Black.woff') format('woff'), url('../../fonts/roboto/Roboto-Black.ttf') format('truetype'), url('../../fonts/roboto/Roboto-Black.svg#Roboto') format('svg');
+}
+
+@font-face {
+ font-family: 'Roboto';
+ src: url('../../fonts/roboto/Roboto-BlackItalic.eot');
+ src: local('Roboto BlackItalic'), local('Roboto-BlackItalic'), url('../../fonts/roboto/Roboto-BlackItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-BlackItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-BlackItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-BlackItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-BlackItalic.svg#Roboto') format('svg');
+ font-weight: 900;
+ font-style: italic;
+}
+
+@font-face {
+ font-family: 'Roboto-BlackItalic';
+ src: url('../../fonts/roboto/Roboto-BlackItalic.eot');
+ src: local('Roboto BlackItalic'), local('Roboto-BlackItalic'), url('../../fonts/roboto/Roboto-BlackItalic.eot?#iefix') format('embedded-opentype'), url('../../fonts/roboto/Roboto-BlackItalic.woff2') format('woff2'), url('../../fonts/roboto/Roboto-BlackItalic.woff') format('woff'), url('../../fonts/roboto/Roboto-BlackItalic.ttf') format('truetype'), url('../../fonts/roboto/Roboto-BlackItalic.svg#Roboto') format('svg');
+}
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-black-italic.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-black-italic.scss
new file mode 100644
index 0000000..a0534e6
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-black-italic.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','BlackItalic', 900, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-black.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-black.scss
new file mode 100644
index 0000000..f8b9836
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-black.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','Black', 900, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-bold-italic.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-bold-italic.scss
new file mode 100644
index 0000000..6003e30
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-bold-italic.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','BoldItalic', 700, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-bold.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-bold.scss
new file mode 100644
index 0000000..c78192b
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-bold.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','Bold', 700, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-light-italic.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-light-italic.scss
new file mode 100644
index 0000000..6f12be8
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-light-italic.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','LightItalic', 300, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-light.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-light.scss
new file mode 100644
index 0000000..d53d126
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-light.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','Light', 300, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-medium-italic.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-medium-italic.scss
new file mode 100644
index 0000000..60f20d4
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-medium-italic.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','MediumItalic', 500, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-medium.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-medium.scss
new file mode 100644
index 0000000..d3780fc
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-medium.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','Medium', 500, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-regular-italic.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-regular-italic.scss
new file mode 100644
index 0000000..c1ce83c
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-regular-italic.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','RegularItalic', 400, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-regular.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-regular.scss
new file mode 100644
index 0000000..4b9bfba
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-regular.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','Regular', 400, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-thin-italic.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-thin-italic.scss
new file mode 100644
index 0000000..df63cf4
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-thin-italic.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','ThinItalic', 100, italic);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-thin.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-thin.scss
new file mode 100644
index 0000000..33b07cb
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface-thin.scss
@@ -0,0 +1,3 @@
+@import "../../mixins";
+
+@include roboto-font('Roboto','Thin', 100, normal);
diff --git a/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface.scss b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface.scss
new file mode 100644
index 0000000..64ef2b6
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/css/roboto/sass/roboto-fontface.scss
@@ -0,0 +1,12 @@
+@import "roboto-fontface-regular";
+@import "roboto-fontface-regular-italic";
+@import "roboto-fontface-light";
+@import "roboto-fontface-light-italic";
+@import "roboto-fontface-thin";
+@import "roboto-fontface-thin-italic";
+@import "roboto-fontface-medium";
+@import "roboto-fontface-medium-italic";
+@import "roboto-fontface-bold";
+@import "roboto-fontface-bold-italic";
+@import "roboto-fontface-black";
+@import "roboto-fontface-black-italic";
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.eot
new file mode 100644
index 0000000..bbc67d8
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.eot differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.svg
new file mode 100644
index 0000000..417a2a9
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.svg
@@ -0,0 +1,643 @@
+
+
+
\ No newline at end of file
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.ttf
new file mode 100644
index 0000000..87256d3
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.ttf differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.woff
new file mode 100644
index 0000000..235c963
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.woff differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.woff2
new file mode 100644
index 0000000..dd0eb2b
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Bold.woff2 differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.eot
new file mode 100644
index 0000000..5a95d1a
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.eot differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.svg
new file mode 100644
index 0000000..f468ca3
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.svg
@@ -0,0 +1,643 @@
+
+
+
\ No newline at end of file
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.ttf
new file mode 100644
index 0000000..059feb3
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.ttf differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.woff
new file mode 100644
index 0000000..df69b95
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.woff differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.woff2
new file mode 100644
index 0000000..3a37029
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-BoldItalic.woff2 differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.eot
new file mode 100644
index 0000000..d492665
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.eot differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.svg
new file mode 100644
index 0000000..6ce1343
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.svg
@@ -0,0 +1,643 @@
+
+
+
\ No newline at end of file
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.ttf
new file mode 100644
index 0000000..321c450
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.ttf differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.woff
new file mode 100644
index 0000000..c414478
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.woff differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.woff2
new file mode 100644
index 0000000..b2726ed
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Light.woff2 differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.eot
new file mode 100644
index 0000000..c169648
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.eot differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.svg
new file mode 100644
index 0000000..8a8b4cb
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.svg
@@ -0,0 +1,643 @@
+
+
+
\ No newline at end of file
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.ttf
new file mode 100644
index 0000000..905604d
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.ttf differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.woff
new file mode 100644
index 0000000..5536e16
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.woff differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.woff2
new file mode 100644
index 0000000..4fe4e36
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-LightItalic.woff2 differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.eot
new file mode 100644
index 0000000..5710fe6
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.eot differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.svg
new file mode 100644
index 0000000..0ce4985
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.svg
@@ -0,0 +1,644 @@
+
+
+
\ No newline at end of file
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.ttf
new file mode 100644
index 0000000..be9f6f8
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.ttf differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.woff
new file mode 100644
index 0000000..ec28f95
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.woff differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.woff2
new file mode 100644
index 0000000..3bb6bd3
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-Regular.woff2 differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.eot
new file mode 100644
index 0000000..985364f
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.eot differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.svg
new file mode 100644
index 0000000..e3e72dd
--- /dev/null
+++ b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.svg
@@ -0,0 +1,644 @@
+
+
+
\ No newline at end of file
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.ttf
new file mode 100644
index 0000000..d804301
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.ttf differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.woff
new file mode 100644
index 0000000..67804e1
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.woff differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.woff2
new file mode 100644
index 0000000..a26889a
Binary files /dev/null and b/xstatic/pkg/roboto_fontface/data/fonts/roboto-condensed/Roboto-Condensed-RegularItalic.woff2 differ
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Black.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Black.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Black.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Black.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Black.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Black.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Black.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Black.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Black.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Black.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Black.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Black.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Black.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Black.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Black.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Black.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Black.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Black.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Black.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Black.woff2
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-BlackItalic.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BlackItalic.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-BlackItalic.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BlackItalic.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-BlackItalic.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BlackItalic.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-BlackItalic.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BlackItalic.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-BlackItalic.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BlackItalic.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-BlackItalic.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BlackItalic.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-BlackItalic.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BlackItalic.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-BlackItalic.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BlackItalic.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-BlackItalic.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BlackItalic.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-BlackItalic.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BlackItalic.woff2
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Bold.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Bold.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Bold.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Bold.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Bold.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Bold.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Bold.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Bold.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Bold.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Bold.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Bold.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Bold.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Bold.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Bold.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Bold.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Bold.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Bold.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Bold.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Bold.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Bold.woff2
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-BoldItalic.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BoldItalic.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-BoldItalic.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BoldItalic.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-BoldItalic.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BoldItalic.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-BoldItalic.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BoldItalic.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-BoldItalic.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BoldItalic.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-BoldItalic.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BoldItalic.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-BoldItalic.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BoldItalic.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-BoldItalic.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BoldItalic.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-BoldItalic.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BoldItalic.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-BoldItalic.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-BoldItalic.woff2
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Light.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Light.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Light.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Light.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Light.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Light.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Light.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Light.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Light.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Light.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Light.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Light.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Light.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Light.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Light.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Light.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Light.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Light.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Light.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Light.woff2
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-LightItalic.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-LightItalic.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-LightItalic.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-LightItalic.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-LightItalic.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-LightItalic.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-LightItalic.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-LightItalic.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-LightItalic.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-LightItalic.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-LightItalic.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-LightItalic.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-LightItalic.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-LightItalic.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-LightItalic.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-LightItalic.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-LightItalic.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-LightItalic.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-LightItalic.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-LightItalic.woff2
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Medium.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Medium.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Medium.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Medium.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Medium.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Medium.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Medium.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Medium.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Medium.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Medium.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Medium.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Medium.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Medium.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Medium.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Medium.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Medium.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Medium.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Medium.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Medium.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Medium.woff2
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-MediumItalic.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-MediumItalic.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-MediumItalic.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-MediumItalic.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-MediumItalic.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-MediumItalic.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-MediumItalic.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-MediumItalic.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-MediumItalic.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-MediumItalic.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-MediumItalic.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-MediumItalic.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-MediumItalic.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-MediumItalic.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-MediumItalic.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-MediumItalic.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-MediumItalic.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-MediumItalic.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-MediumItalic.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-MediumItalic.woff2
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Regular.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Regular.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Regular.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Regular.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Regular.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Regular.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Regular.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Regular.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Regular.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Regular.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Regular.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Regular.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Regular.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Regular.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Regular.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Regular.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Regular.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Regular.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Regular.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Regular.woff2
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-RegularItalic.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-RegularItalic.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-RegularItalic.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-RegularItalic.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-RegularItalic.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-RegularItalic.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-RegularItalic.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-RegularItalic.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-RegularItalic.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-RegularItalic.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-RegularItalic.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-RegularItalic.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-RegularItalic.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-RegularItalic.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-RegularItalic.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-RegularItalic.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-RegularItalic.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-RegularItalic.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-RegularItalic.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-RegularItalic.woff2
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Thin.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Thin.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Thin.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Thin.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Thin.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Thin.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Thin.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Thin.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Thin.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Thin.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Thin.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Thin.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Thin.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Thin.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Thin.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Thin.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-Thin.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Thin.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-Thin.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-Thin.woff2
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-ThinItalic.eot b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-ThinItalic.eot
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-ThinItalic.eot
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-ThinItalic.eot
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-ThinItalic.svg b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-ThinItalic.svg
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-ThinItalic.svg
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-ThinItalic.svg
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-ThinItalic.ttf b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-ThinItalic.ttf
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-ThinItalic.ttf
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-ThinItalic.ttf
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-ThinItalic.woff b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-ThinItalic.woff
old mode 100755
new mode 100644
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-ThinItalic.woff
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-ThinItalic.woff
diff --git a/xstatic/pkg/roboto_fontface/data/fonts/Roboto-ThinItalic.woff2 b/xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-ThinItalic.woff2
similarity index 100%
rename from xstatic/pkg/roboto_fontface/data/fonts/Roboto-ThinItalic.woff2
rename to xstatic/pkg/roboto_fontface/data/fonts/roboto/Roboto-ThinItalic.woff2