diff --git a/package.json b/package.json index 8f817c6..ec95c69 100644 --- a/package.json +++ b/package.json @@ -40,6 +40,7 @@ "babel-polyfill": "^6.23.0", "bulma": "^0.4.2", "dexie": "^1.5.1", + "font-awesome": "^4.7.0", "inferno": "^3.6.1", "inferno-component": "^3.6.1", "inferno-devtools": "^3.6.1", diff --git a/src/components/management/SearchBox/index.jsx b/src/components/management/SearchBox/index.jsx index 9715230..a03ccfd 100644 --- a/src/components/management/SearchBox/index.jsx +++ b/src/components/management/SearchBox/index.jsx @@ -263,7 +263,9 @@ export class SearchBox extends Component { - S + + + { this.displaySearchHeader() } diff --git a/src/index.jsx b/src/index.jsx index 58a7880..bedaf94 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -1,4 +1,4 @@ -// import './assets/fonts/fonts.scss'; +// import 'font-awesome/scss/font-awesome.scss'; import './sass/main.scss'; import Inferno from 'inferno'; diff --git a/src/sass/main.scss b/src/sass/main.scss index 3ca3320..b42d136 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -1,3 +1,5 @@ @import 'variables'; +$fa-font-path: "~font-awesome/fonts/"; +@import "~font-awesome/scss/font-awesome"; @import '../../node_modules/bulma/bulma'; @import 'styles'; diff --git a/webpack.config.js b/webpack.config.js index b78df96..7786391 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -68,61 +68,18 @@ const webpackConfig = { ] } , { - test: (/\.woff$/) - , exclude: (/node_modules/) + test: (/\.(png|woff|woff2|eot|ttf|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/) , use: [ { loader: 'url-loader' , options: { - limit: 65000 + limit: 100000 , mimetype: 'application/font-woff' , name: './assets/fonts/[name].[ext]' } } ] } - , { - test: (/\.woff2$/) - , exclude: (/node_modules/) - , use: [ - { - loader: 'url-loader' - , options: { - limit: 65000 - , mimetype: 'application/font-woff2' - , name: './assets/fonts/[name].[ext]' - } - } - ] - } - , { - test: (/\.[ot]tf$/) - , exclude: (/node_modules/) - , use: [ - { - loader: 'url-loader' - , options: { - limit: 65000 - , mimetype: 'application/octet-stream' - , name: './assets/fonts/[name].[ext]' - } - } - ] - } - , { - test: (/\.eot$/) - , exclude: (/node_modules/) - , use: [ - { - loader: 'url-loader' - , options: { - limit: 65000 - , mimetype: 'application/vnd.ms-fontobject' - , name: './assets/fonts/[name].[ext]' - } - } - ] - } ] } , resolve: { diff --git a/yarn.lock b/yarn.lock index dcf9f80..2a700c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -322,17 +322,7 @@ babel-runtime@^6.22.0: core-js "^2.4.0" regenerator-runtime "^0.10.0" -babel-template@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.24.1.tgz#04ae514f1f93b3a2537f2a0f60a5a45fb8308333" - dependencies: - babel-runtime "^6.22.0" - babel-traverse "^6.24.1" - babel-types "^6.24.1" - babylon "^6.11.0" - lodash "^4.2.0" - -babel-template@^6.25.0: +babel-template@^6.24.1, babel-template@^6.25.0: version "6.25.0" resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.25.0.tgz#665241166b7c2aa4c619d71e192969552b10c071" dependencies: @@ -342,21 +332,7 @@ babel-template@^6.25.0: babylon "^6.17.2" lodash "^4.2.0" -babel-traverse@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.24.1.tgz#ab36673fd356f9a0948659e7b338d5feadb31695" - dependencies: - babel-code-frame "^6.22.0" - babel-messages "^6.23.0" - babel-runtime "^6.22.0" - babel-types "^6.24.1" - babylon "^6.15.0" - debug "^2.2.0" - globals "^9.0.0" - invariant "^2.2.0" - lodash "^4.2.0" - -babel-traverse@^6.25.0: +babel-traverse@^6.24.1, babel-traverse@^6.25.0: version "6.25.0" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.25.0.tgz#2257497e2fcd19b89edc13c4c91381f9512496f1" dependencies: @@ -370,16 +346,7 @@ babel-traverse@^6.25.0: invariant "^2.2.0" lodash "^4.2.0" -babel-types@^6.24.1: - version "6.24.1" - resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.24.1.tgz#a136879dc15b3606bda0d90c1fc74304c2ff0975" - dependencies: - babel-runtime "^6.22.0" - esutils "^2.0.2" - lodash "^4.2.0" - to-fast-properties "^1.0.1" - -babel-types@^6.25.0: +babel-types@^6.24.1, babel-types@^6.25.0: version "6.25.0" resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.25.0.tgz#70afb248d5660e5d18f811d91c8303b54134a18e" dependencies: @@ -388,10 +355,6 @@ babel-types@^6.25.0: lodash "^4.2.0" to-fast-properties "^1.0.1" -babylon@^6.11.0, babylon@^6.15.0: - version "6.17.0" - resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.0.tgz#37da948878488b9c4e3c4038893fa3314b3fc932" - babylon@^6.17.2: version "6.17.4" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.17.4.tgz#3e8b7402b88d22c3423e137a1577883b15ff869a" @@ -1301,6 +1264,10 @@ flatten@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782" +font-awesome@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" + for-in@^0.1.3: version "0.1.8" resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1" @@ -1878,13 +1845,7 @@ kind-of@^2.0.1: dependencies: is-buffer "^1.0.2" -kind-of@^3.0.2: - version "3.2.0" - resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.0.tgz#b58abe4d5c044ad33726a8c1525b48cf891bff07" - dependencies: - is-buffer "^1.1.5" - -kind-of@^3.2.2: +kind-of@^3.0.2, kind-of@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" dependencies: