Mastodon/Whalebird-desktop-client-mac-linux-windows
1
0
Fork 0
mirror of https://github.com/h3poteto/whalebird-desktop synced 2025-01-28 16:20:21 +01:00
Code Issues Releases Wiki Activity

Merge pull request #128 from h3poteto/change-fonts

Browse Source 
Use Noto Sans as default font
This commit is contained in:
AkiraFukushima 2018-03-25 21:15:53 +09:00 committed by GitHub
commit d30cbbb855
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.electron-vue/webpack.renderer.config.js
View File

@ -128,8 +128,11 @@ let rendererConfig = {
new webpack.NoEmitOnErrorsPlugin(),
new GoogleFontsPlugin({
fonts: [
{ family: "Source Sans Pro" }
]
{ family: "Source Sans Pro" },
{ family: "Noto Sans" },
{ family: "Noto Serif" }
],
local: process.env.NODE_ENV === 'production' ? true : false
})
],
output: {

56
package-lock.json generated
View File

@ -2105,7 +2105,8 @@
"buffer-crc32": {
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
"dev": true
},
"buffer-indexof": {
"version": "1.1.1",
@ -4524,6 +4525,7 @@
"version": "0.1.12",
"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
"integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
"dev": true,
"requires": {
"iconv-lite": "0.4.19"
}
@ -5590,6 +5592,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
"dev": true,
"requires": {
"pend": "1.2.0"
}
@ -6977,6 +6980,7 @@
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/google-fonts-webpack-plugin/-/google-fonts-webpack-plugin-0.4.4.tgz",
"integrity": "sha512-+e2D9/DVBG9EDydRovzoqMZ658SsTBGbC0c65GyZqkwNvdj8vRSYQKXqbz7/yt7QaXsCPT1MpH45r3ivWOitcw==",
"dev": true,
"requires": {
"lodash": "4.17.5",
"node-fetch": "1.7.3",
@ -6987,12 +6991,14 @@
"source-list-map": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz",
"integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE="
"integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=",
"dev": true
},
"webpack-sources": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz",
"integrity": "sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=",
"dev": true,
"requires": {
"source-list-map": "1.1.2",
"source-map": "0.5.7"
@ -7002,6 +7008,7 @@
"version": "2.9.1",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
"integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
"dev": true,
"requires": {
"buffer-crc32": "0.2.13",
"fd-slicer": "1.0.1"
@ -7683,25 +7690,25 @@
"dev": true
},
"html-minifier": {
"version": "3.5.10",
"resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.10.tgz",
"integrity": "sha512-5c8iAyeIGAiuFhVjJ0qy1lgvyQxxuZgjeOuMnoK/wjEyy8DF3xKUnE9pO+6H7VMir976K6SGlZV8ZEmIOea/Zg==",
"version": "3.5.12",
"resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.12.tgz",
"integrity": "sha512-+N778qLf0RWBscD0TPGoYdeGNDZ0s76/0pQhY1/409EOudcENkm9IbSkk37RDyPdg/09GVHTKotU4ya93RF1Gg==",
"dev": true,
"requires": {
"camel-case": "3.0.0",
"clean-css": "4.1.11",
"commander": "2.14.1",
"commander": "2.15.1",
"he": "1.1.1",
"ncname": "1.0.0",
"param-case": "2.1.1",
"relateurl": "0.2.7",
"uglify-js": "3.3.13"
"uglify-js": "3.3.16"
},
"dependencies": {
"commander": {
"version": "2.14.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
"integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==",
"version": "2.15.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
"dev": true
}
}
@ -7713,7 +7720,7 @@
"dev": true,
"requires": {
"bluebird": "3.5.1",
"html-minifier": "3.5.10",
"html-minifier": "3.5.12",
"loader-utils": "0.2.17",
"lodash": "4.17.5",
"pretty-error": "2.1.1",
@ -7844,7 +7851,8 @@
"iconv-lite": {
"version": "0.4.19",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz",
"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ=="
"integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==",
"dev": true
},
"icss-replace-symbols": {
"version": "1.1.0",
@ -8433,7 +8441,8 @@
"is-stream": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
"dev": true
},
"is-svg": {
"version": "2.1.0",
@ -10262,6 +10271,7 @@
"version": "1.7.3",
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
"integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
"dev": true,
"requires": {
"encoding": "0.1.12",
"is-stream": "1.1.0"
@ -11329,7 +11339,8 @@
"pend": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA="
"integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
"dev": true
},
"performance-now": {
"version": "2.1.0",
@ -13710,7 +13721,8 @@
"source-map": {
"version": "0.5.7",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
"integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
"dev": true
},
"source-map-resolve": {
"version": "0.3.1",
@ -14525,19 +14537,19 @@
"integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c="
},
"uglify-js": {
"version": "3.3.13",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.13.tgz",
"integrity": "sha512-7rdn/bDOG1ElSTPdh7AI5TCjLv63ZD4k8BBadN3ssIkhlaQL2c0yRxmXCyOYhZK0wZTgGgUSnYQ4CGu+Jos5cA==",
"version": "3.3.16",
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.3.16.tgz",
"integrity": "sha512-FMh5SRqJRGhv9BbaTffENIpDDQIoPDR8DBraunGORGhySArsXlw9++CN+BWzPBLpoI4RcSnpfGPnilTxWL3Vvg==",
"dev": true,
"requires": {
"commander": "2.14.1",
"commander": "2.15.1",
"source-map": "0.6.1"
},
"dependencies": {
"commander": {
"version": "2.14.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.14.1.tgz",
"integrity": "sha512-+YR16o3rK53SmWHU3rEM3tPAh2rwb1yPcQX5irVn7mb0gXbwuCCrnkbV5+PBfETdfg1vui07nM6PCG1zndcjQw==",
"version": "2.15.1",
"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
"dev": true
},
"source-map": {

2
package.json
View File

@ -64,7 +64,6 @@
"electron-log": "^2.2.14",
"electron-window-state": "^4.1.1",
"element-ui": "^2.2.1",
"google-fonts-webpack-plugin": "^0.4.4",
"is-empty": "^1.2.0",
"mastodon-api": "^1.3.0",
"moment": "^2.21.0",
@ -108,6 +107,7 @@
"eslint-plugin-standard": "^3.0.1",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.11.2",
"google-fonts-webpack-plugin": "^0.4.4",
"html-webpack-plugin": "^2.30.1",
"inject-loader": "^3.0.0",
"karma": "^1.3.0",

2
src/renderer/components/Authorize.vue
View File

@ -51,7 +51,7 @@ export default {
</script>
<style lang="scss">
body { font-family: 'Source Sans Pro', sans-serif; }
body { font-family: 'Noto Sans', 'Source Sans Pro', sans-serif; }
html, body, #app, #authorize {
height: 100%;

2
src/renderer/components/GlobalHeader.vue
View File

@ -64,7 +64,7 @@ export default {
</script>
<style lang="scss">
body { font-family: 'Source Sans Pro', sans-serif; }
body { font-family: 'Noto Sans', 'Source Sans Pro', sans-serif; }
html, body, #app, #global_header {
height: 100%;

2
src/renderer/components/Login.vue
View File

@ -31,7 +31,7 @@ export default {
</script>
<style lang="scss">
body { font-family: 'Source Sans Pro', sans-serif; }
body { font-family: 'Noto Sans', 'Source Sans Pro', sans-serif; }
html, body, #app {
height: 100%;