git ssb

16+

Dominic / patchbay



Commit eb32370bf8cbd70b2d74afd663eeb9616fa35a03

Merge branch 'master' of github.com:ssbc/patchbay

mix irving committed on 6/1/2017, 8:25:20 AM
Parent: 09c0a2e49ccc68a4cdc3a98da00657c1aff6158b
Parent: 9ec32b65bdd8f625866616dc536cf25c26c163bc

Files changed

app/styles/css/font-awesome.jschanged
package.jsonchanged
app/styles/css/font-awesome.jsView
@@ -1,12 +1,13 @@
11 const nest = require('depnest')
22 const fs = require('fs')
3-const { join } = require('path')
3 +const { join, dirname } = require('path')
44 const { assign } = Object
5 +const styleResolve = require('style-resolve')
56
6-// const css = fs.readFileSync(join(__dirname, '../../../node_modules/font-awesome/css/font-awesome.min.css'), 'utf8')
7-const css = fs.readFileSync(join(__dirname, '../../../node_modules/font-awesome/css/font-awesome.css'), 'utf8')
8- .replace(/\.{2}/g, '../font-awesome')
7 +const fontCssPath = styleResolve.sync('font-awesome')
8 +const css = fs.readFileSync(fontCssPath, 'utf8')
9 + .replace(/\.{2}/g, (match) => join(dirname(fontCssPath), match))
910
1011 // TODO: for patchlite, may have to convert font urls into url(data:base64: ....) format
1112
1213 exports.gives = nest('styles.css')
package.jsonView
@@ -63,8 +63,9 @@
6363 "read-directory": "^2.0.0",
6464 "setimmediate": "^1.0.5",
6565 "ssb-horcrux": "^0.1.3",
6666 "ssb-mentions": "^0.1.1",
67 + "style-resolve": "^1.0.1",
6768 "suggest-box": "^2.2.3",
6869 "text-node-searcher": "^1.1.1",
6970 "xtend": "^4.0.1"
7071 },

Built with git-ssb-web