diff --git a/README.md b/README.md index 615524b..1c345c0 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ Maputnik is written in ES6 and is using [React](https://github.com/facebook/reac We ensure building and developing Maputnik works with - Linux, OSX and Windows -- Node 5.11 +- Node >4 Install the deps, start the dev server and open the web browser on `http://localhost:8888/`. diff --git a/src/app.jsx b/src/app.jsx index 907a74d..85a9d09 100644 --- a/src/app.jsx +++ b/src/app.jsx @@ -13,6 +13,7 @@ import { loadDefaultStyle, SettingsStore, StyleStore } from './stylestore.js' import { WorkspaceDrawer } from './workspace.jsx' import theme from './theme.js' +import './index.scss' export default class App extends React.Component { static childContextTypes = { diff --git a/src/fonts/Roboto-Regular.ttf b/src/fonts/Roboto-Regular.ttf new file mode 100755 index 0000000..8c082c8 Binary files /dev/null and b/src/fonts/Roboto-Regular.ttf differ diff --git a/src/index.scss b/src/index.scss index fa9caa6..d16354e 100644 --- a/src/index.scss +++ b/src/index.scss @@ -1,3 +1,9 @@ +@font-face { + font-family: 'Roboto'; + src: url('./fonts/Roboto-Regular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} .app { } diff --git a/src/template.html b/src/template.html index 4805eb9..5af5b39 100644 --- a/src/template.html +++ b/src/template.html @@ -4,7 +4,6 @@ <%= htmlWebpackPlugin.options.title %> -
Loading...
diff --git a/webpack.loaders.js b/webpack.loaders.js index 75fd232..02596f2 100644 --- a/webpack.loaders.js +++ b/webpack.loaders.js @@ -14,19 +14,8 @@ module.exports = [ } }, { - test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, - exclude: /(node_modules|bower_components)/, - loader: "file" - }, - { - test: /\.(woff|woff2)$/, - exclude: /(node_modules|bower_components)/, - loader: "url?prefix=font/&limit=5000" - }, - { - test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, - exclude: /(node_modules|bower_components)/, - loader: "url?limit=10000&mimetype=application/octet-stream" + test: /\.(eot|svg|ttf|woff|woff2)$/, + loader: 'file?name=fonts/[name].[ext]' }, { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/,