Skip to content

Commit c500192

Browse files
oldjoldj
committed
调整图标等。
1 parent 3c21eb0 commit c500192

File tree

10 files changed

+72
-46
lines changed

10 files changed

+72
-46
lines changed

‎app/ui/bundle.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ui/content/content.jsx‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
'use strict'
77

88
import React from 'react'
9+
import { Icon } from 'antd'
910
import classnames from 'classnames'
1011
import Editor from './editor'
1112
import './content.less'
@@ -19,7 +20,7 @@ export default class Content extends React.Component {
1920
}
2021
}
2122

22-
setValue(v) {
23+
setValue (v) {
2324
this.props.setHostsContent(v)
2425
}
2526

@@ -29,21 +30,23 @@ export default class Content extends React.Component {
2930
return (
3031
<div id="sh-content">
3132
<div className="inform">
32-
<span
33-
className={classnames({
34-
loading: 1,
35-
show: this.state.is_loading
36-
})}
37-
>loading...</span>
38-
<i
33+
<span
34+
className={classnames({
35+
loading: 1,
36+
show: this.state.is_loading
37+
})}
38+
>loading...</span>
39+
<Icon
40+
type="global"
3941
className={classnames({
4042
show: current.where === 'remote',
4143
iconfont: 1,
4244
'icon-earth': 1
4345
})}
4446
title={lang.remote_hosts}
4547
/>
46-
<i
48+
<Icon
49+
type="lock"
4750
className={classnames({
4851
show: this.props.readonly,
4952
iconfont: 1,

‎ui/frame/edit.jsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -282,9 +282,9 @@ export default class EditPrompt extends React.Component {
282282
<div ref="body">
283283
<div className="ln">
284284
<RadioGroup onChange={e => this.setState({where: e.target.value})} value={this.state.where}>
285-
<RadioButton value="local">{lang.where_local}</RadioButton>
286-
<RadioButton value="remote">{lang.where_remote}</RadioButton>
287-
<RadioButton value="group">{lang.where_group}</RadioButton>
285+
<RadioButton value="local"><Icon type="file-text" /> {lang.where_local}</RadioButton>
286+
<RadioButton value="remote"><Icon type="global" /> {lang.where_remote}</RadioButton>
287+
<RadioButton value="group"><Icon type="copy" /> {lang.where_group}</RadioButton>
288288
</RadioGroup>
289289
</div>
290290

‎ui/frame/frame.jsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export default class MyFrame extends React.Component {
6060
if (!this.props.show) {
6161
return null
6262
}
63-
let {show, title, body, lang} = this.props
63+
let {show, title, body, lang, width} = this.props
6464

6565
return (
6666
<Modal
@@ -69,6 +69,7 @@ export default class MyFrame extends React.Component {
6969
onOk={this.onOK.bind(this)}
7070
onCancel={this.onCancel.bind(this)}
7171
wrapClassName="frame"
72+
width={width}
7273
footer={[
7374
<Button key="back" size="large" onClick={this.onCancel.bind(this)}>
7475
{lang.cancel}
@@ -80,9 +81,9 @@ export default class MyFrame extends React.Component {
8081
>
8182
<div className="prompt-body">{body}</div>
8283
{/*<div className="prompt">*/}
83-
{/*<div className="head">{this.props.head}</div>*/}
84-
{/*<div className="body">{this.props.body}</div>*/}
85-
{/*<div className="foot">{this.renderFootButtons()}</div>*/}
84+
{/*<div className="head">{this.props.head}</div>*/}
85+
{/*<div className="body">{this.props.body}</div>*/}
86+
{/*<div className="foot">{this.renderFootButtons()}</div>*/}
8687
{/*</div>*/}
8788
</Modal>
8889
)

‎ui/frame/frame.less‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
top: 50%;
1919
left: 50%;
2020
transform: translate(-50%, -50%);
21-
min-width: 520px;
21+
//min-width: 520px;
2222
//max-width: 600px;
2323
//background: #fff;
2424
//box-shadow: 0 0 4px 4px rgba(0, 0, 0, 0.1);
@@ -62,3 +62,10 @@
6262
}
6363
}
6464
}
65+
66+
67+
.frame.sudo-prompt {
68+
.ant-modal {
69+
width: 300px;
70+
}
71+
}

‎ui/frame/sudo.jsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
'use strict'
77

88
import React from 'react'
9+
import {Input} from 'antd'
910
import Agent from '../Agent'
1011
import MyFrame from './frame'
1112
import './sudo.less'
@@ -67,11 +68,10 @@ export default class SudoPrompt extends React.Component {
6768
<div className="ln">
6869
<div className="title">{lang.sudo_pswd}</div>
6970
<div className="cnt">
70-
<input
71+
<Input
7172
type="password"
7273
ref="pswd"
73-
onKeyDown={e => (e.keyCode === 13 && this.onOK() ||
74-
e.keyCode === 27 && this.onCancel())}
74+
onKeyDown={e => (e.keyCode === 13 && this.onOK() || e.keyCode === 27 && this.onCancel())}
7575
/>
7676
</div>
7777
</div>
@@ -84,11 +84,12 @@ export default class SudoPrompt extends React.Component {
8484
return (
8585
<MyFrame
8686
show={this.state.show}
87-
head={lang.input_sudo_pswd}
87+
title={lang.input_sudo_pswd}
8888
body={this.body()}
8989
onOK={() => this.onOK()}
9090
onCancel={() => this.onCancel()}
9191
lang={lang}
92+
width="400"
9293
/>
9394
)
9495
}

‎ui/frame/sudo.less‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +0,0 @@
1-
@import "frame";
2-
3-
.frame {
4-
.prompt {
5-
width: 480px;
6-
}
7-
}

‎ui/panel/buttons.jsx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
'use strict'
77

88
import React from 'react'
9+
import { Icon } from 'antd'
910
import classnames from 'classnames'
1011
import Agent from '../Agent'
1112
import './buttons.less'
@@ -93,14 +94,16 @@ export default class Buttons extends React.Component {
9394
className="btn-add"
9495
href="#"
9596
onClick={() => Buttons.btnAdd()}
96-
>+</a>
97+
>
98+
<Icon type="plus" className="iconfont" />
99+
</a>
97100
</div>
98101

99102
<div className="right">
100-
<i
103+
<Icon
104+
type="search"
101105
className={classnames({
102106
iconfont: 1,
103-
'icon-search': 1,
104107
'on': this.state.search_on
105108
})}
106109
onClick={() => this.btnSearch()}

‎ui/panel/list-item.jsx‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import React from 'react'
99
import classnames from 'classnames'
10+
import { Icon } from 'antd'
1011
import Agent from '../Agent'
1112
import isInViewport from 'wheel-js/src/browser/isInViewport'
1213
import './list-item.less'
@@ -22,7 +23,7 @@ export default class ListItem extends React.Component {
2223
getTitle () {
2324
let {lang} = this.props
2425
return this.is_sys ? lang.sys_hosts_title : this.props.data.title ||
25-
lang.untitled
26+
lang.untitled
2627
}
2728

2829
beSelected () {
@@ -66,6 +67,17 @@ export default class ListItem extends React.Component {
6667
'data-id': data.id || ''
6768
}
6869

70+
let icon_type
71+
if (sys) {
72+
icon_type = 'desktop'
73+
} else if (data.where === 'remote') {
74+
icon_type = 'global'
75+
} else if (data.where === 'group') {
76+
icon_type = 'copy'
77+
} else {
78+
icon_type = 'file-text'
79+
}
80+
6981
return (
7082
<div className={classnames({
7183
'list-item': 1
@@ -94,15 +106,20 @@ export default class ListItem extends React.Component {
94106
/>
95107
</div>
96108
)}
97-
<i className={classnames({
98-
'iconfont': 1
99-
, 'item-icon': 1
100-
, 'icon-warn': !!data.error
101-
, 'icon-file': !sys && !data.error && data.where !== 'group'
102-
, 'icon-files': data.where === 'group'
103-
, 'icon-sysserver': sys && !data.error
104-
})}
105-
title={data.error || ''}
109+
{/*<i className={classnames({*/}
110+
{/*'iconfont': 1*/}
111+
{/*, 'item-icon': 1*/}
112+
{/*, 'icon-warn': !!data.error*/}
113+
{/*, 'icon-file': !sys && !data.error && data.where !== 'group'*/}
114+
{/*, 'icon-files': data.where === 'group'*/}
115+
{/*, 'icon-sysserver': sys && !data.error*/}
116+
{/*})}*/}
117+
{/*title={data.error || ''}*/}
118+
{/*/>*/}
119+
<Icon
120+
type={icon_type}
121+
className="iconfont item-icon"
122+
title={data.error || ''}
106123
/>
107124
<span>{this.getTitle()}</span>
108125
</div>

‎ui/panel/list-item.less‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#sh-list {
22
.list-item {
33
position: relative;
4-
padding: 7px 10px 7px 15px;
4+
padding: 7px 10px 7px 12px;
55
cursor: pointer;
66

77
&.hidden {
@@ -10,10 +10,11 @@
1010

1111
&.sys-hosts {
1212
font-size: 14px;
13-
padding: 8px 10px 8px 13px;
13+
padding: 8px 10px 8px 10px;
1414

15-
i {
15+
i.item-icon {
1616
width: 22px;
17+
font-size: 12px;
1718
}
1819
}
1920

@@ -43,7 +44,7 @@
4344
margin-right: 5px;
4445

4546
&.item-icon {
46-
font-size: 12px;
47+
font-size: 10px;
4748
}
4849

4950
&.switch {

0 commit comments

Comments
 (0)