diff options
-rw-r--r-- | package-lock.json | 14 | ||||
-rw-r--r-- | package.json | 2 | ||||
-rw-r--r-- | public/index.html | 1 | ||||
-rw-r--r-- | src/components/Global/StatusIcon.vue | 20 | ||||
-rw-r--r-- | vue.config.js | 6 |
5 files changed, 20 insertions, 23 deletions
diff --git a/package-lock.json b/package-lock.json index 0ff2ba2f..dc2daf48 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1038,16 +1038,16 @@ } }, "@carbon/icon-helpers": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/@carbon/icon-helpers/-/icon-helpers-10.4.0.tgz", - "integrity": "sha512-52H97nT0Hv3mneNaDXBELt/shrO9AUZIpX5TuxRUcdva0xqLNnjhsLw0PTytjQRw3yNCLmDw8hOutzlReXCleQ==" + "version": "10.9.0", + "resolved": "https://registry.npmjs.org/@carbon/icon-helpers/-/icon-helpers-10.9.0.tgz", + "integrity": "sha512-JtmCXV7iIc+N5RqQQy+MGT8T+5KcF7+BUKADvHnJKZ8o+ncF5gI4hmrP450dQD76mikI4fqQ0dQflaosesdSPw==" }, "@carbon/icons-vue": { - "version": "10.6.1", - "resolved": "https://registry.npmjs.org/@carbon/icons-vue/-/icons-vue-10.6.1.tgz", - "integrity": "sha512-z9Lp+9PpMCNmXr+uVJx6wOTD6PWYHnyYwmLTJQxm0Y4RHCJtJ9K2xNZTBejC40FbMgJTmtOFTILZ9F1YJp/d2w==", + "version": "10.19.0", + "resolved": "https://registry.npmjs.org/@carbon/icons-vue/-/icons-vue-10.19.0.tgz", + "integrity": "sha512-/wUkLiZhIkTiAo4FsFwl6WKspB27rJ+zCkgtpCtoQI83Iwz+Io2JugmQcyCLclHUj1jtjgul1FHwxzDc/kOYiQ==", "requires": { - "@carbon/icon-helpers": "10.4.0" + "@carbon/icon-helpers": "^10.9.0" } }, "@cnakazawa/watch": { diff --git a/package.json b/package.json index 1bc62f5b..bd8f11b5 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "i18n:report": "vue-cli-service i18n:report --src './src/**/*.?(js|vue)' --locales './src/locales/**/*.json'" }, "dependencies": { - "@carbon/icons-vue": "10.6.1", + "@carbon/icons-vue": "10.19.0", "@novnc/novnc": "1.2.0", "axios": "0.19.0", "bootstrap": "4.4.1", diff --git a/public/index.html b/public/index.html index 022b9c31..c355ece4 100644 --- a/public/index.html +++ b/public/index.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html lang="en"> <head> + <meta http-equiv="Content-Security-Policy"> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width,initial-scale=1.0"> diff --git a/src/components/Global/StatusIcon.vue b/src/components/Global/StatusIcon.vue index bf58722a..4b2b47dd 100644 --- a/src/components/Global/StatusIcon.vue +++ b/src/components/Global/StatusIcon.vue @@ -36,24 +36,26 @@ export default { <style lang="scss" scoped> .status-icon { vertical-align: text-bottom; + &.info { - fill: theme-color('info'); + color: theme-color('info'); } &.success { - fill: theme-color('success'); + color: theme-color('success'); } &.danger { - fill: theme-color('danger'); + color: theme-color('danger'); } &.secondary { - fill: gray('600'); - - svg { - transform: rotate(-45deg); - } + color: gray('600'); + transform: rotate(-45deg); } &.warning { - fill: theme-color('warning'); + color: theme-color('warning'); + } + + svg { + fill: currentColor; } } </style> diff --git a/vue.config.js b/vue.config.js index ca8e9f08..6cb0df7e 100644 --- a/vue.config.js +++ b/vue.config.js @@ -85,12 +85,6 @@ module.exports = { ); } }, - chainWebpack: config => { - if (process.env.NODE_ENV === 'production') { - config.plugins.delete('prefetch'); - config.plugins.delete('preload'); - } - }, pluginOptions: { i18n: { localeDir: 'locales', |