Skip to content

Commit 51d083b

Browse files
authored
fix: minor UI layout issues (#2270)
1 parent e9fa9ae commit 51d083b

File tree

15 files changed

+98
-159
lines changed

15 files changed

+98
-159
lines changed

src/components/BrowserFilter/BrowserFilter.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
&:hover svg {
2323
fill: white;
2424
}
25-
25+
2626
&.disabled {
2727
cursor: not-allowed;
2828
color: #66637A;
@@ -98,7 +98,7 @@
9898
padding: 11px 0;
9999
text-align: center;
100100

101-
> a {
101+
> button {
102102
margin-right: 10px;
103103

104104
&:last-child {

src/components/BrowserMenu/BrowserMenu.scss

+1-2
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,10 @@
9090
}
9191

9292
.item {
93-
padding: 6px 14px;
93+
padding: 4px 14px;
9494
white-space: nowrap;
9595
cursor: pointer;
9696
color: white;
97-
height: 26px;
9897

9998
&:hover {
10099
background: $blue;

src/components/ColumnsConfiguration/ColumnsConfiguration.react.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export default class ColumnsConfiguration extends React.Component {
137137
onClick={this.showAll.bind(this)} />
138138
<Button
139139
color='white'
140-
value='Autosort'
140+
value='Auto-sort'
141141
onClick={this.autoSort.bind(this)} />
142142
</div>
143143
</div>

src/components/Modal/Modal.react.js

+9-11
Original file line numberDiff line numberDiff line change
@@ -55,26 +55,24 @@ let Modal = (({
5555

5656
let footer = customFooter || (
5757
<div style={{textAlign: buttonsInCenter ? 'center' : 'right'}} className={styles.footer}>
58-
{showCancel ? <Button
58+
{showCancel && <Button
5959
value={cancelText}
6060
onClick={onCancel}
61-
disabled={!canCancel} /> : null}
62-
<Button
61+
disabled={!canCancel} /> }
62+
{ showContinue && <Button
6363
primary={true}
64-
value={confirmText}
64+
value={continueText}
6565
color={buttonColors[type]}
6666
disabled={!!disabled}
67-
onClick={onConfirm}
68-
progress={progress} />
69-
{
70-
showContinue === true ?
67+
onClick={onContinue}
68+
progress={progress} /> }
7169
<Button
7270
primary={true}
73-
value={continueText}
71+
value={confirmText}
7472
color={buttonColors[type]}
7573
disabled={!!disabled}
76-
onClick={onContinue}
77-
progress={progress} />: null}
74+
onClick={onConfirm}
75+
progress={progress} />
7876
</div>
7977
);
8078

src/components/Modal/Modal.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
position: absolute;
4444
font-size: 14px;
4545
color: white;
46-
top: 49px;
46+
top: 52px;
4747
left: 28px;
4848
}
4949

0 commit comments

Comments
 (0)