Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Material icons #212

Merged
merged 7 commits into from
Jun 2, 2021
6 changes: 5 additions & 1 deletion build/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ exports.cssLoaders = function (options) {
loader: 'css-loader',
options: {
minimize: process.env.NODE_ENV === 'production',
url: process.env.NODE_ENV !== 'production',
sourceMap: options.sourceMap
}
}
Expand All @@ -35,8 +34,13 @@ exports.cssLoaders = function (options) {

// Extract CSS when that option is specified
// (which is the case during production build)
// Remarks: Unfortunately ExtractTextPlugin is not able to rewrite url paths to resources
// referenced in the extracted css. As a workaround, override publicPath, which will work because all
// css resources end up in /static/css. For more information see
// https://github.com/webpack-contrib/extract-text-webpack-plugin/issues/27
if (options.extract) {
return ExtractTextPlugin.extract({
publicPath: '../../',
use: loaders,
fallback: 'vue-style-loader'
})
Expand Down
3 changes: 0 additions & 3 deletions embedded.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Wegue WebGIS Embedded</title>

<link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons' rel="stylesheet">

</head>
<body>
<div id="container" class="" style="width: 800px; height: 600px; padding: 20px;">
Expand Down
3 changes: 0 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Wegue WebGIS</title>

<link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons' rel="stylesheet">

</head>
<body>
<div id="app"></div>
Expand Down
12 changes: 12 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"@babel/preset-env": "^7.0.0",
"@babel/register": "^7.0.0",
"@babel/runtime-corejs3": "^7.13.10",
"@mdi/font": "^5.9.55",
"@vue/test-utils": "^1.0.3",
"autoprefixer": "^9.8.0",
"babel-eslint": "^9.0.0",
Expand Down Expand Up @@ -72,6 +73,7 @@
"karma-sourcemap-loader": "^0.3.7",
"karma-spec-reporter": "^0.0.32",
"karma-webpack": "^3.0.5",
"material-icons": "^0.5.4",
"mocha": "^6.2.3",
"opn": "^6.0.0",
"optimize-css-assets-webpack-plugin": "^2.0.0",
Expand Down
2 changes: 2 additions & 0 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import Vue from 'vue';
import Vuetify from 'vuetify';
import PortalVue from 'portal-vue'
import '@mdi/font/css/materialdesignicons.css'
import 'material-icons/iconfont/material-icons.css'
import '../node_modules/ol/ol.css';
import WguApp from '../app/WguApp';
import UrlUtil from './util/Url';
Expand Down