Skip to content

Commit 1318abd

Browse files
committed
Windowsに合わせてUI修正(Font/Username/Key input:Command key -> Control key)
1 parent 76a031a commit 1318abd

4 files changed

Lines changed: 16 additions & 9 deletions

File tree

browser/main/HomePage.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class HomePage extends React.Component {
4343
}
4444

4545
// Search inputがfocusされていたら大体のキー入力は無視される。
46-
if (top.isInputFocused() && !e.metaKey) {
46+
if (top.isInputFocused() && !(e.metaKey || e.ctrlKey)) {
4747
if (e.keyCode === 13 || e.keyCode === 27) top.escape()
4848
return
4949
}
@@ -54,7 +54,7 @@ class HomePage extends React.Component {
5454
if (e.keyCode === 27) {
5555
detail.handleCancelButtonClick()
5656
}
57-
if ((e.keyCode === 13 && e.metaKey) || (e.keyCode === 83 && e.metaKey)) {
57+
if ((e.keyCode === 13 && (e.metaKey || e.ctrlKey)) || (e.keyCode === 83 && (e.metaKey || e.ctrlKey))) {
5858
detail.handleSaveButtonClick()
5959
}
6060
break
@@ -72,14 +72,14 @@ class HomePage extends React.Component {
7272
if (e.keyCode === 27) {
7373
detail.handleDeleteCancelButtonClick()
7474
}
75-
if (e.keyCode === 13 && e.metaKey) {
75+
if (e.keyCode === 13 && (e.metaKey || e.ctrlKey)) {
7676
detail.handleDeleteConfirmButtonClick()
7777
}
7878
break
7979
}
8080

8181
// `detail`の`openDeleteConfirmMenu`が`true`なら呼ばれない。
82-
if (e.keyCode === 27 || (e.keyCode === 70 && e.metaKey)) {
82+
if (e.keyCode === 27 || (e.keyCode === 70 && (e.metaKey || e.ctrlKey))) {
8383
top.focusInput()
8484
}
8585

@@ -91,7 +91,7 @@ class HomePage extends React.Component {
9191
list.selectNextArticle()
9292
}
9393

94-
if (e.keyCode === 65 || e.keyCode === 13 && e.metaKey) {
94+
if (e.keyCode === 65 || e.keyCode === 13 && (e.metaKey || e.ctrlKey)) {
9595
nav.handleNewPostButtonClick()
9696
e.preventDefault()
9797
}

browser/main/HomePage/ArticleNavigator.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ import Preferences from 'boost/components/modal/Preferences'
77
import CreateNewFolder from 'boost/components/modal/CreateNewFolder'
88

99
import remote from 'remote'
10-
let userName = remote.getGlobal('process').env.USER
10+
let mainEnv = remote.getGlobal('process').env
11+
let userName = mainEnv.USER != null
12+
? mainEnv.USER
13+
: mainEnv.USERNAME
1114

1215
const BRAND_COLOR = '#18AF90'
1316

browser/styles/finder/index.styl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ global-reset()
77
iptBgColor = #E6E6E6
88
iptFocusBorderColor = #369DCD
99

10+
DEFAULT_FONTS = 'Lato', 'MS Gothic', 'Malgun Gothic', 'Sans-serif'
11+
1012
body
11-
font-family "Lato"
13+
font-family DEFAULT_FONTS
1214
color textColor
1315
font-size fontSize
1416
width 100%

browser/styles/main/index.styl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ global-reset()
77
@import './containers/*'
88
@import './HomeContainer'
99

10+
DEFAULT_FONTS = 'Lato', 'MS Gothic', 'Malgun Gothic', 'Sans-serif'
11+
1012
*
1113
-webkit-app-region no-drag
1214
-webkit-user-select none
@@ -17,13 +19,13 @@ html, body
1719
overflow hidden
1820

1921
body
20-
font-family "Lato"
22+
font-family DEFAULT_FONTS
2123
color textColor
2224
font-size fontSize
2325
font-weight 400
2426

2527
button, input, select
26-
font-family "Lato"
28+
font-family DEFAULT_FONTS
2729

2830
div, span, a, button, input, textarea
2931
box-sizing border-box

0 commit comments

Comments
 (0)