diff --git a/pillar/web/static/assets/font/config.json b/pillar/web/static/assets/font/config.json index c7a4da2e..4a56670d 100644 --- a/pillar/web/static/assets/font/config.json +++ b/pillar/web/static/assets/font/config.json @@ -932,6 +932,12 @@ "code": 61930, "src": "fontawesome" }, + { + "uid": "31972e4e9d080eaa796290349ae6c1fd", + "css": "users", + "code": 59502, + "src": "fontawesome" + }, { "uid": "03e6e1bfe72275c6eaa0d0898fde6c1d", "css": "chatbubble-working", @@ -1005,7 +1011,7 @@ { "uid": "c8388cae1ba05fec948ec5af83771377", "css": "people-outline", - "code": 59399, + "code": 59407, "src": "custom_icons", "selected": false, "svg": { diff --git a/pillar/web/static/assets/font/pillar-font.woff b/pillar/web/static/assets/font/pillar-font.woff index 38d4895c..e0aee502 100644 Binary files a/pillar/web/static/assets/font/pillar-font.woff and b/pillar/web/static/assets/font/pillar-font.woff differ diff --git a/pillar/web/static/assets/font/pillar-font.woff2 b/pillar/web/static/assets/font/pillar-font.woff2 index 80c1e8cb..42c6b64b 100644 Binary files a/pillar/web/static/assets/font/pillar-font.woff2 and b/pillar/web/static/assets/font/pillar-font.woff2 differ diff --git a/readme.md b/readme.md index 8f7797ce..424fc27d 100644 --- a/readme.md +++ b/readme.md @@ -2,5 +2,22 @@ Pillar ====== This is the latest iteration on the Attract project. We are building a unified -framework called Pillar. Pillar will combine Blender Cloud and Attract. You +framework called Pillar. Pillar will combine Blender Cloud and Attract. You can see Pillar in action on the [Blender Cloud](https://cloud.bender.org). + +## Custom fonts + +The icons on the website are drawn using a custom font, stored in +[pillar/web/static/font](pillar/web/static/font). +This font is generated via [Fontello](http://fontello.com/) by uploading +[pillar/web/static/font/config.json](pillar/web/static/font/config.json). + +Note that we only use the WOFF and WOFF2 formats, and discard the others +supplied by Fontello. + +After replacing the font files & `config.json`, edit the Fontello-supplied +`font.css` to remove all font formats except `woff` and `woff2`. Then upload +it to [css2sass](http://css2sass.herokuapp.com/) to convert it to SASS, and +place it in [src/styles/_font-pillar.sass](src/styles/_font-pillar.sass). + +Don't forget to Gulp! diff --git a/src/styles/_font-pillar.sass b/src/styles/_font-pillar.sass index 0a370398..3078b5ca 100644 --- a/src/styles/_font-pillar.sass +++ b/src/styles/_font-pillar.sass @@ -1,7 +1,7 @@ @font-face font-family: 'pillar-font' - src: url('../font/pillar-font.woff2?89968090') format('woff2') - src: url('../font/pillar-font.woff?89968090') format('woff') + src: url('../font/pillar-font.woff2?89968091') format('woff2') + src: url('../font/pillar-font.woff?89968091') format('woff') font-weight: normal font-style: normal @@ -588,6 +588,11 @@ /* '' +.pi-users:before + content: '\e86e' + +/* '' + .pi-pause:before content: '\f00e'