From 41c9426929c599396c8d9e8ab8ac5120a1310988 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 3 Mar 2018 09:49:47 +0900 Subject: [PATCH] nanka iroior --- .gitignore | 1 - package.json | 2 +- src/web/app/boot.js | 1 + .../app/common/views/components/switch.vue | 3 +- .../app/common/views/widgets/server.info.vue | 2 +- .../app/desktop/views/components/settings.vue | 34 +++++++++++++++---- .../desktop/views/components/ui.header.vue | 7 ++-- .../app/desktop/views/components/window.vue | 6 ++-- webpack/webpack.config.ts | 4 +-- 9 files changed, 41 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 1c05ba5f2c..6c8b99c856 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,3 @@ run.bat api-docs.json package-lock.json version.json -/.cache-loader diff --git a/package.json b/package.json index b125139c6e..98f875b504 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,6 @@ "bcryptjs": "2.4.3", "body-parser": "1.18.2", "bootstrap-vue": "^2.0.0-rc.1", - "cache-loader": "1.2.0", "cafy": "3.2.1", "chai": "4.1.2", "chai-http": "3.0.0", @@ -180,6 +179,7 @@ "typescript-eslint-parser": "13.0.0", "uglify-es": "3.3.9", "uglifyjs-webpack-plugin": "1.2.0", + "url-loader": "^0.6.2", "uuid": "3.2.1", "vhost": "3.0.2", "vue": "2.5.13", diff --git a/src/web/app/boot.js b/src/web/app/boot.js index 91830b6c03..a6d0f3aad9 100644 --- a/src/web/app/boot.js +++ b/src/web/app/boot.js @@ -35,6 +35,7 @@ // Note: The default language is English let lang = navigator.language.split('-')[0]; if (!/^(en|ja)$/.test(lang)) lang = 'en'; + if (localStorage.getItem('lang')) lang = localStorage.getItem('lang'); // Detect the user agent const ua = navigator.userAgent.toLowerCase(); diff --git a/src/web/app/common/views/components/switch.vue b/src/web/app/common/views/components/switch.vue index bfb951dfa1..e6cdfa152c 100644 --- a/src/web/app/common/views/components/switch.vue +++ b/src/web/app/common/views/components/switch.vue @@ -157,6 +157,7 @@ export default Vue.extend({ > .label margin-left 8px display block + font-size 15px cursor pointer transition inherit @@ -168,7 +169,7 @@ export default Vue.extend({ > p margin 0 - font-size 90% + //font-size 90% color #9daab3 diff --git a/src/web/app/common/views/widgets/server.info.vue b/src/web/app/common/views/widgets/server.info.vue index bed6a1b743..d243629506 100644 --- a/src/web/app/common/views/widgets/server.info.vue +++ b/src/web/app/common/views/widgets/server.info.vue @@ -1,6 +1,6 @@