Skip to content

Commit

Permalink
fix: remove online fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
juanpicado committed Jan 12, 2019
1 parent 7b2751c commit 29c6e56
Show file tree
Hide file tree
Showing 8 changed files with 226 additions and 28 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ build/
*.yaml
Dockerfile
*.rpi
*.html
*.scss
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
"react-hot-loader": "4.2.0",
"react-router": "4.3.1",
"react-router-dom": "4.2.2",
"resolve-url-loader": "3.0.0",
"rimraf": "2.6.2",
"sass-loader": "7.1.0",
"source-map-loader": "0.2.4",
Expand All @@ -150,6 +151,7 @@
"stylelint-scss": "3.3.1",
"stylelint-webpack-plugin": "0.10.5",
"supertest": "3.3.0",
"typeface-roboto": "0.0.54",
"url-loader": "1.1.1",
"verdaccio-auth-memory": "0.0.4",
"verdaccio-memory": "1.0.3",
Expand Down
2 changes: 1 addition & 1 deletion src/webui/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import Header from './components/Header';
import { Container, Content } from './components/Layout';
import Route from './router';
import API from './utils/api';

import './styles/typeface-roboto.scss';
import './styles/main.scss';
import 'normalize.css';

Expand Down
1 change: 1 addition & 0 deletions src/webui/styles/typeface-roboto.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import '~typeface-roboto';
2 changes: 1 addition & 1 deletion src/webui/styles/variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ $seconday-color:#20232a;
// Scaffolding
// -------------------------

$body-bg: $white;
$body-bg: $white;
$text-color: $eclipse;

// Typography
Expand Down
4 changes: 0 additions & 4 deletions src/webui/template/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
<%= htmlWebpackPlugin.options.title %>
</title>
<link rel="icon" type="image/png" href="<%= htmlWebpackPlugin.options.verdaccioURL %>/-/static/favicon.ico" />
<!-- Robot Font -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" />
<!-- Material Icons Font -->
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<script>
window.VERDACCIO_API_URL = '<%= htmlWebpackPlugin.options.verdaccioURL %>/-/verdaccio/';
Expand Down
24 changes: 5 additions & 19 deletions tools/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,32 +63,18 @@ module.exports = {
]
},
{
test: /\.(ttf|eot|woff|woff2)$/,
test: /\.(woff|woff2|eot|ttf|otf)$/,
loader: 'url-loader',
options: {
limit: 50000,
name: 'fonts/[hash].[ext]',
name: 'fonts/[name].[ext]',
limit: 50,
},
},
{
test: /\.scss$/,
exclude: /node_modules/,
use: [
{
loader: 'style-loader',
},
{
loader: 'css-loader',
options: {
sourceMap: true,
module: true,
localIdentName: '[path][name]__[local]--[hash:base64:5]',
},
},
{
loader: 'sass-loader',
},
],
loader: `style-loader!css-loader?module&sourceMap=false&localIdentName=[path][name]__[local]--[hash:base64:5]
!resolve-url-loader?keepQuery!sass-loader?sourceMap`
},
{
test: /\.css$/,
Expand Down
Loading

0 comments on commit 29c6e56

Please sign in to comment.