From f48533b70fd1f33c704dd9dadeb8b52033ed1d12 Mon Sep 17 00:00:00 2001 From: SleepWalker Date: Tue, 5 Jan 2016 23:06:19 +0200 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=B0=D1=8F=20=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20=D1=81=D1=81=D1=83=D0=BF=D0=BE?= =?UTF-8?q?=D1=80=D1=82=D0=B0=20=D0=B3=D0=B5=D0=BD=D0=B5=D1=80=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8=20=D1=88=D1=80=D0=B8=D1=84=D1=82=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=B8=D0=B7=20=D0=B8=D0=BA=D0=BE=D0=BD=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + src/components/ui/icons.js | 12 ++++++++++++ src/icons.font.json | 6 ++++++ src/{components => }/icons/flag_belarus.svg | 0 src/{components => }/icons/flag_russian.svg | 0 src/{components => }/icons/flag_ukraine.svg | 0 src/{components => }/icons/flag_united_kingdom.svg | 0 src/{components/icons => icons/webfont}/arrow.svg | 0 src/{components/icons => icons/webfont}/caret.svg | 0 .../icons => icons/webfont}/checkmark.svg | 0 src/{components/icons => icons/webfont}/close.svg | 0 .../icons => icons/webfont}/envelope.svg | 0 src/{components/icons => icons/webfont}/key.svg | 0 src/{components/icons => icons/webfont}/user.svg | 0 webpack.config.js | 13 ++++--------- 15 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 src/components/ui/icons.js create mode 100644 src/icons.font.json rename src/{components => }/icons/flag_belarus.svg (100%) rename src/{components => }/icons/flag_russian.svg (100%) rename src/{components => }/icons/flag_ukraine.svg (100%) rename src/{components => }/icons/flag_united_kingdom.svg (100%) rename src/{components/icons => icons/webfont}/arrow.svg (100%) rename src/{components/icons => icons/webfont}/caret.svg (100%) rename src/{components/icons => icons/webfont}/checkmark.svg (100%) rename src/{components/icons => icons/webfont}/close.svg (100%) rename src/{components/icons => icons/webfont}/envelope.svg (100%) rename src/{components/icons => icons/webfont}/key.svg (100%) rename src/{components/icons => icons/webfont}/user.svg (100%) diff --git a/package.json b/package.json index 321f5dc..ea3efbb 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "eslint": "^1.10.3", "eslint-plugin-react": "^3.13.1", "extract-text-webpack-plugin": "^0.9.1", + "fontgen-loader": "^0.1.9", "html-webpack-plugin": "^1.7.0", "imports-loader": "^0.6.4", "karma": "*", diff --git a/src/components/ui/icons.js b/src/components/ui/icons.js new file mode 100644 index 0000000..077c740 --- /dev/null +++ b/src/components/ui/icons.js @@ -0,0 +1,12 @@ +import icons from 'icons.font.json'; + +const baseClass = 'icon'; + +export default Object.keys(icons) + .filter((icon) => icon !== baseClass) + .reduce((acc, icon) => { + acc[icon.replace(`${baseClass}-`, '')] = `${icons[baseClass]} ${icons[icon]}`; + + return acc; + }, {}) + ; diff --git a/src/icons.font.json b/src/icons.font.json new file mode 100644 index 0000000..5f3c2ed --- /dev/null +++ b/src/icons.font.json @@ -0,0 +1,6 @@ +{ + "files": ["icons/webfont/*"], + "fontName": "ely-account-icons", + "fixedWidth": true, + "normalize": true +} diff --git a/src/components/icons/flag_belarus.svg b/src/icons/flag_belarus.svg similarity index 100% rename from src/components/icons/flag_belarus.svg rename to src/icons/flag_belarus.svg diff --git a/src/components/icons/flag_russian.svg b/src/icons/flag_russian.svg similarity index 100% rename from src/components/icons/flag_russian.svg rename to src/icons/flag_russian.svg diff --git a/src/components/icons/flag_ukraine.svg b/src/icons/flag_ukraine.svg similarity index 100% rename from src/components/icons/flag_ukraine.svg rename to src/icons/flag_ukraine.svg diff --git a/src/components/icons/flag_united_kingdom.svg b/src/icons/flag_united_kingdom.svg similarity index 100% rename from src/components/icons/flag_united_kingdom.svg rename to src/icons/flag_united_kingdom.svg diff --git a/src/components/icons/arrow.svg b/src/icons/webfont/arrow.svg similarity index 100% rename from src/components/icons/arrow.svg rename to src/icons/webfont/arrow.svg diff --git a/src/components/icons/caret.svg b/src/icons/webfont/caret.svg similarity index 100% rename from src/components/icons/caret.svg rename to src/icons/webfont/caret.svg diff --git a/src/components/icons/checkmark.svg b/src/icons/webfont/checkmark.svg similarity index 100% rename from src/components/icons/checkmark.svg rename to src/icons/webfont/checkmark.svg diff --git a/src/components/icons/close.svg b/src/icons/webfont/close.svg similarity index 100% rename from src/components/icons/close.svg rename to src/icons/webfont/close.svg diff --git a/src/components/icons/envelope.svg b/src/icons/webfont/envelope.svg similarity index 100% rename from src/components/icons/envelope.svg rename to src/icons/webfont/envelope.svg diff --git a/src/components/icons/key.svg b/src/icons/webfont/key.svg similarity index 100% rename from src/components/icons/key.svg rename to src/icons/webfont/key.svg diff --git a/src/components/icons/user.svg b/src/icons/webfont/user.svg similarity index 100% rename from src/components/icons/user.svg rename to src/icons/webfont/user.svg diff --git a/webpack.config.js b/webpack.config.js index 463f338..5de2781 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -21,7 +21,7 @@ var isTest = process.argv.some(function(arg) { return arg.indexOf('karma') !== -1; }); -const CSS_LOADER = 'style!css?modules&importLoaders=1&localIdentName=[path][name]-[local]!postcss'; +const CSS_LOADER = 'style!css?modules&importLoaders=2&localIdentName=[path][name]-[local]!postcss'; var webpackConfig = { entry: { @@ -107,15 +107,10 @@ var webpackConfig = { plugins: ['transform-runtime', ['react-intl', {messagesDir: './dist/messages/'}]] } }, - { // DEPRECATED - test: /i18n\/.*\.less$/, - loader: CSS_LOADER + '!less' - }, - { // DEPRECATED - test: /\.less$/, + { + test: /\.font.(js|json)$/, extractInProduction: true, - exclude: /i18n\/.*\.less$/, - loader: CSS_LOADER + '!less' + loader: CSS_LOADER + '!fontgen?types=woff,eot,ttf' } ] },