add woff2 and compile styles

kulbida · Jul 9, 2015 · bf5f416 · bf5f416
1 parent 15d3fc7
commit bf5f416
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 4 deletions.
diff --git a/cms/static/cms/css/cms.base.css b/cms/static/cms/css/cms.base.css
diff --git a/cms/static/cms/fonts/django-cms-iconfont.eot b/cms/static/cms/fonts/django-cms-iconfont.eot
diff --git a/cms/static/cms/fonts/django-cms-iconfont.ttf b/cms/static/cms/fonts/django-cms-iconfont.ttf
diff --git a/cms/static/cms/fonts/django-cms-iconfont.woff b/cms/static/cms/fonts/django-cms-iconfont.woff
diff --git a/cms/static/cms/fonts/django-cms-iconfont.woff2 b/cms/static/cms/fonts/django-cms-iconfont.woff2
diff --git a/cms/static/cms/sass/components/_iconography.scss b/cms/static/cms/sass/components/_iconography.scss
@@ -6,9 +6,10 @@
     font-family: "django-cms-iconfont";
     src: url("../fonts/django-cms-iconfont.eot?v=3.2.0");
     src: url("../fonts/django-cms-iconfont.eot?v=3.2.0#iefix") format("eot"),
-        url("../fonts/django-cms-iconfont.woff?v=3.2.0") format("woff"),
-        url("../fonts/django-cms-iconfont.ttf?v=3.2.0") format("truetype"),
-        url("../fonts/django-cms-iconfont.svg?v=3.2.0#django-cms-iconfont") format("svg");
+         url("../fonts/django-cms-iconfont.woff2?v=3.2.0") format("woff2"),
+         url("../fonts/django-cms-iconfont.woff?v=3.2.0") format("woff"),
+         url("../fonts/django-cms-iconfont.ttf?v=3.2.0") format("truetype"),
+         url("../fonts/django-cms-iconfont.svg?v=3.2.0#django-cms-iconfont") format("svg");
     font-weight: normal;
     font-style: normal;
 }

diff --git a/cms/static/cms/sass/libs/_iconfont.scss b/cms/static/cms/sass/libs/_iconfont.scss
@@ -6,6 +6,7 @@
     font-family: "<%= fontName %>";
     src: url("<%= fontPath %><%= fontName %>.eot?v=3.2.0");
     src: url("<%= fontPath %><%= fontName %>.eot?v=3.2.0#iefix") format("eot"),
+         url("<%= fontPath %><%= fontName %>.woff2?v=3.2.0") format("woff2"),
          url("<%= fontPath %><%= fontName %>.woff?v=3.2.0") format("woff"),
          url("<%= fontPath %><%= fontName %>.ttf?v=3.2.0") format("truetype"),
          url("<%= fontPath %><%= fontName %>.svg?v=3.2.0#<%= fontName %>") format("svg");