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

closes #579 Change default fonts in preferences #626

Merged
merged 9 commits into from
Sep 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ jobs:
working_directory: /var/opt/app
steps:
- checkout
- run:
name: python
command: |
apt-get update
apt-get install -y python build-essential libfontconfig-dev
- restore_cache:
name: Restoring cache - node_modules
keys:
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ We'd love you to contribute to Whalebird.
$ git clone https://github.com/h3poteto/whalebird-desktop.git
$ cd whalebird-desktop

# Install font config
$ sudo apt-get install libfontconfig-dev

# install dependencies
$ npm install

Expand Down
189 changes: 187 additions & 2 deletions package-lock.json

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

7 changes: 5 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
"pack:renderer": "cross-env NODE_ENV=production webpack --progress --colors --config .electron-vue/webpack.renderer.config.js",
"test": "npm run unit && npm run e2e",
"unit": "karma start test/unit/karma.conf.js",
"postinstall": "npm run lint:fix",
"mocha": "BABEL_ENV=test mocha --require babel-register --recursive ./test/mocha/**/*.js"
"postinstall": "npm run lint:fix && npm run electron-rebuild",
"mocha": "BABEL_ENV=test mocha --require babel-register --recursive ./test/mocha/**/*.js",
"electron-rebuild": "./node_modules/.bin/electron-rebuild"
},
"build": {
"productName": "Whalebird",
Expand Down Expand Up @@ -104,6 +105,7 @@
"electron-window-state": "^4.1.1",
"element-ui": "^2.4.7",
"emojilib": "^2.3.0",
"font-manager": "^0.3.0",
"hawk": "^7.0.7",
"hoek": "^5.0.3",
"i18next": "^11.5.0",
Expand Down Expand Up @@ -153,6 +155,7 @@
"electron-debug": "^1.4.0",
"electron-devtools-installer": "^2.2.4",
"electron-packager": "^12.0.2",
"electron-rebuild": "^1.8.2",
"eslint": "^5.2.0",
"eslint-config-standard": "^12.0.0-alpha.0",
"eslint-friendly-formatter": "^4.0.1",
Expand Down
1 change: 1 addition & 0 deletions src/config/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
"wrapper_mask_color": "Modal wrapper"
},
"font_size": "Schriftgröße",
"font_family": "Font family",
"display_style": {
"title": "Anzeigestil",
"display_name_and_username": "Anzeige- und Benutzername",
Expand Down
1 change: 1 addition & 0 deletions src/config/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
"wrapper_mask_color": "Modal wrapper"
},
"font_size": "Font size",
"font_family": "Font family",
"display_style": {
"title": "Display style of username",
"display_name_and_username": "Display name and username",
Expand Down
1 change: 1 addition & 0 deletions src/config/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
"wrapper_mask_color": "Modal wrapper"
},
"font_size": "Taille des caractères",
"font_family": "Font family",
"display_style": {
"title": "Format d'affichage",
"display_name_and_username": "Nom et utilisateur⋅trice",
Expand Down
1 change: 1 addition & 0 deletions src/config/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
"wrapper_mask_color": "モーダル背景"
},
"font_size": "フォントサイズ",
"font_family": "フォント",
"display_style": {
"title": "ユーザ名の表示形式",
"display_name_and_username": "表示名+ユーザー名",
Expand Down
Loading