From fecd9af6661a6b8a9ded58876c47befc7725a9b3 Mon Sep 17 00:00:00 2001 From: Enrico Fasoli Date: Fri, 20 Nov 2015 17:24:06 +0100 Subject: [PATCH] cleanup, load font-css internally --- cli.js | 19 ------------------- package.json | 7 +++---- webapp/app.jsx | 1 + webapp/raleway.css | 24 ++++++++++++++++++++++++ webapp/template.html | 1 - 5 files changed, 28 insertions(+), 24 deletions(-) delete mode 100755 cli.js create mode 100644 webapp/raleway.css diff --git a/cli.js b/cli.js deleted file mode 100755 index 44f1e49..0000000 --- a/cli.js +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env node - -var cli = require('commander') -var ipfs = require('ipfs-api')('localhost','5001') -var BoardsAPI = require('../lib/boards-api.js') - -var boards = new BoardsAPI(ipfs) - -boards.init(function(err){ - if(err){ - console.log(err) - } -}) - -cli - .version(require('package.json').version) - .description('command line interface for IPFS boards') - -cli.parse(process.argv) diff --git a/package.json b/package.json index 956ad22..0c446ed 100644 --- a/package.json +++ b/package.json @@ -24,11 +24,10 @@ "babel-loader": "~6.2.0", "babel-preset-es2015": "~6.1.18", "babel-preset-react": "~6.1.18", - "commander": "~2.9.0", "css-loader": "~0.23.0", "eslint": "~1.9.0", "eslint-plugin-react": "~3.9.0", - "file-loader": "^0.8.4", + "file-loader": "~0.8.4", "font-awesome": "^4.4.0", "gulp": "~3.9.0", "gulp-clean": "~0.3.1", @@ -39,8 +38,8 @@ "json-loader": "~0.5.3", "lodash.sortedindex": "~3.1.1", "moment": "~2.10.6", - "react": "~0.14.2", - "react-dom": "~0.14.2", + "react": "~0.14.3", + "react-dom": "~0.14.3", "react-markdown": "~1.0.5", "react-router": "~1.0.0", "style-loader": "~0.13.0", diff --git a/webapp/app.jsx b/webapp/app.jsx index d7c99b3..fd7910f 100644 --- a/webapp/app.jsx +++ b/webapp/app.jsx @@ -15,6 +15,7 @@ var BoardsAPI = require('boards-api.js') require('normalize.css') require('skeleton.css') require('style.css') +require('raleway.css') require('font-awesome.min.css') var opt, s = localStorage.getItem('ipfs-boards-settings') diff --git a/webapp/raleway.css b/webapp/raleway.css new file mode 100644 index 0000000..5801800 --- /dev/null +++ b/webapp/raleway.css @@ -0,0 +1,24 @@ +/* latin */ +@font-face { + font-family: 'Raleway'; + font-style: normal; + font-weight: 300; + src: local('Raleway Light'), local('Raleway-Light'), url(http://fonts.gstatic.com/s/raleway/v9/-_Ctzj9b56b8RgXW8FArifk_vArhqVIZ0nv9q090hN8.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; +} +/* latin */ +@font-face { + font-family: 'Raleway'; + font-style: normal; + font-weight: 400; + src: local('Raleway'), url(http://fonts.gstatic.com/s/raleway/v9/0dTEPzkLWceF7z0koJaX1A.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; +} +/* latin */ +@font-face { + font-family: 'Raleway'; + font-style: normal; + font-weight: 600; + src: local('Raleway SemiBold'), local('Raleway-SemiBold'), url(http://fonts.gstatic.com/s/raleway/v9/xkvoNo9fC8O2RDydKj12b_k_vArhqVIZ0nv9q090hN8.woff2) format('woff2'); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2212, U+2215, U+E0FF, U+EFFD, U+F000; +} diff --git a/webapp/template.html b/webapp/template.html index 1f3f483..5994619 100644 --- a/webapp/template.html +++ b/webapp/template.html @@ -4,7 +4,6 @@ {%= o.htmlWebpackPlugin.options.title %} -