diff --git a/pillar/web/static/assets/font/config.json b/pillar/web/static/assets/font/config.json index e5c8ac20..ec69233f 100644 --- a/pillar/web/static/assets/font/config.json +++ b/pillar/web/static/assets/font/config.json @@ -872,12 +872,6 @@ "code": 61930, "src": "fontawesome" }, - { - "uid": "31972e4e9d080eaa796290349ae6c1fd", - "css": "users", - "code": 59502, - "src": "fontawesome" - }, { "uid": "c8585e1e5b0467f28b70bce765d5840c", "css": "clipboard-copy", @@ -990,6 +984,30 @@ "code": 59394, "src": "entypo" }, + { + "uid": "347c38a8b96a509270fdcabc951e7571", + "css": "database", + "code": 61888, + "src": "fontawesome" + }, + { + "uid": "3a6f0140c3a390bdb203f56d1bfdefcb", + "css": "speed", + "code": 59471, + "src": "entypo" + }, + { + "uid": "4c1ef492f1d2c39a2250ae457cee2a6e", + "css": "social-instagram", + "code": 61805, + "src": "fontawesome" + }, + { + "uid": "e36d581e4f2844db345bddc205d15dda", + "css": "users", + "code": 59507, + "src": "elusive" + }, { "uid": "053a214a098a9453877363eeb45f004e", "css": "log-in", diff --git a/pillar/web/static/assets/font/pillar-font.woff b/pillar/web/static/assets/font/pillar-font.woff index c7854274..e50fb0f9 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 0c09ffb5..c3174053 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/src/styles/font-pillar.sass b/src/styles/font-pillar.sass index e17a8309..b38534e1 100644 --- a/src/styles/font-pillar.sass +++ b/src/styles/font-pillar.sass @@ -3,8 +3,33 @@ /* Makes it possible to override the path before importing font-pillar.sass */ $pillar-font-path: "../font" !default -/* Font aliases */ -.pi /* blank item with the right spacing */ +/* Font properties. */ +@font-face + font-family: 'pillar-font' + src: url('#{$pillar-font-path}/pillar-font.woff?54788822') format("woff"), url('#{$pillar-font-path}/pillar-font.woff2?54788822') format("woff2") + font-weight: normal + font-style: normal + +[class^="pi-"]:before, [class*=" pi-"]:before + font-family: "pillar-font" + font-style: normal + font-weight: normal + speak: none + display: inline-block + text-decoration: inherit + width: 1em + margin-right: .2em + text-align: center + font-variant: normal + text-transform: none + line-height: 1em + margin-left: .2em + -webkit-font-smoothing: antialiased + -moz-osx-font-smoothing: grayscale + +/* Icon aliases. */ +/* Empty icons, multiple names for the same/unasigned icon, etc. */ +.pi, .pi-blank &:after content: '' font-family: "pillar-font" @@ -27,6 +52,9 @@ $pillar-font-path: "../font" !default &:before position: relative +.pi-svnman:before + content: '\f1c0' + .pi-license-cc-zero:before content: '\e85a' .pi-license-cc-sa:before @@ -59,47 +87,17 @@ $pillar-font-path: "../font" !default &:before left: 27px + /* - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Here begins the CSS code generated by fontello.com, converted to * - * Sass and replaced the path with our variable $pillar-font-path. * - * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * Here begins the CSS code generated by fontello.com by using * + * the config.json file in /pillar/web/static/assets/font * + * Just convert the icon classes from pillar-font.css to Sass * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * When adding icons, only add/overwrite icon classes e.g. .pi-bla * + * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -@font-face - font-family: 'pillar-font' - src: url('#{$pillar-font-path}/pillar-font.woff?55726379') format("woff"), url('#{$pillar-font-path}/pillar-font.woff2?55726379') format("woff2") - font-weight: normal - font-style: normal - -[class^="pi-"]:before, [class*=" pi-"]:before - font-family: "pillar-font" - font-style: normal - font-weight: normal - speak: none - display: inline-block - text-decoration: inherit - width: 1em - margin-right: .2em - text-align: center - - /* opacity: .8; - /* For safety - reset parent styles, that can break glyph codes - font-variant: normal - text-transform: none - /* fix buttons height, for twitter bootstrap - line-height: 1em - /* Animation center compensation - margins should be symmetric - /* remove if not needed - margin-left: .2em - /* you can be more comfortable with increased icons size - /* font-size: 120%; - /* Font smoothing. That was taken from TWBS - -webkit-font-smoothing: antialiased - -moz-osx-font-smoothing: grayscale - /* Uncomment for 3D effect - /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); - .pi-collection-plus:before content: '\e800' @@ -495,6 +493,11 @@ $pillar-font-path: "../font" !default /* '' +.pi-speed:before + content: '\e84f' + +/* '' + .pi-attention:before content: '\e850' @@ -645,11 +648,6 @@ $pillar-font-path: "../font" !default /* '' -.pi-users:before - content: '\e86e' - -/* '' - .pi-flamenco:before content: '\e86f' @@ -670,6 +668,11 @@ $pillar-font-path: "../font" !default /* '' +.pi-users:before + content: '\e873' + +/* '' + .pi-pause:before content: '\f00e' @@ -705,6 +708,16 @@ $pillar-font-path: "../font" !default /* '' +.pi-social-instagram:before + content: '\f16d' + +/* '' + +.pi-database:before + content: '\f1c0' + +/* '' + .pi-newspaper:before content: '\f1ea'