diff --git a/src/styles/_base.sass b/src/styles/_base.sass index b40235a7..598c570b 100644 --- a/src/styles/_base.sass +++ b/src/styles/_base.sass @@ -878,6 +878,15 @@ label, label.control-label &:before position: relative +.pi-license-cc-zero:before + content: '\e85a' +.pi-license-cc-sa:before + content: '\e858' +.pi-license-cc-nd:before + content: '\e859' +.pi-license-cc-nc:before + content: '\e857' + .pi-license-cc-0 @extend .pi-license-cc-zero position: relative diff --git a/src/styles/blog.sass b/src/styles/blog.sass index a0b9171a..c716898a 100644 --- a/src/styles/blog.sass +++ b/src/styles/blog.sass @@ -12,7 +12,6 @@ /* CSS comes from fontello.com using static/assets/font/config.json */ -@import _font-pillar @import plugins/js_perfectscrollbar diff --git a/src/styles/_font-pillar.sass b/src/styles/font-pillar.sass similarity index 100% rename from src/styles/_font-pillar.sass rename to src/styles/font-pillar.sass diff --git a/src/styles/main.sass b/src/styles/main.sass index 455a4afe..f19733a3 100644 --- a/src/styles/main.sass +++ b/src/styles/main.sass @@ -19,9 +19,9 @@ /* services, about, etc */ @import _pages -/* CSS comes from fontello.com using static/assets/font/config.json */ -@import _font-pillar @import plugins/_jstree @import plugins/js_perfectscrollbar @import plugins/_js_select2 + +/* CSS for pillar-font comes from fontello.com using static/assets/font/config.json */ diff --git a/src/styles/project-main.sass b/src/styles/project-main.sass index 4afd8650..1caccf58 100644 --- a/src/styles/project-main.sass +++ b/src/styles/project-main.sass @@ -12,8 +12,6 @@ @import _notifications @import _search -@import _font-pillar - @import plugins/_jstree @import plugins/js_perfectscrollbar @import plugins/_js_select2 diff --git a/src/styles/theatre.sass b/src/styles/theatre.sass index bcb0ea86..12efbf69 100644 --- a/src/styles/theatre.sass +++ b/src/styles/theatre.sass @@ -2,7 +2,6 @@ @import _config @import _utils -@import _font-pillar @import _base @import _comments @import _notifications diff --git a/src/templates/layout.jade b/src/templates/layout.jade index 3ce599fe..d6d93d1b 100644 --- a/src/templates/layout.jade +++ b/src/templates/layout.jade @@ -48,6 +48,7 @@ html(lang="en") | {% block head %}{% endblock %} | {% block css %} + link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css', v=040820161) }}", rel="stylesheet") | {% if title == 'blog' %} link(href="{{ url_for('static_pillar', filename='assets/css/blog.css', v=040820161) }}", rel="stylesheet") | {% else %} diff --git a/src/templates/projects/view.jade b/src/templates/projects/view.jade index 4c1bd9b1..59745f5e 100644 --- a/src/templates/projects/view.jade +++ b/src/templates/projects/view.jade @@ -37,6 +37,7 @@ link(href="//cdnjs.cloudflare.com/ajax/libs/jstree/3.3.1/themes/default/style.mi | {% endblock %} | {% block css %} +link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css', v=040820161) }}", rel="stylesheet") link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css', v=040820161) }}", rel="stylesheet") | {% endblock %} diff --git a/src/templates/projects/view_theatre.jade b/src/templates/projects/view_theatre.jade index e89ddcb6..2d5c7ec3 100644 --- a/src/templates/projects/view_theatre.jade +++ b/src/templates/projects/view_theatre.jade @@ -35,6 +35,7 @@ li | {% endblock %} | {% block css %} +link(href="{{ url_for('static_pillar', filename='assets/css/font-pillar.css', v=040820161) }}", rel="stylesheet") link(href="{{ url_for('static_pillar', filename='assets/css/theatre.css', v=2016) }}", rel="stylesheet") | {% endblock %}