Skip to content
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
4 changes: 2 additions & 2 deletions src/components/BrowserFilter/BrowserFilter.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
&:hover svg {
fill: white;
}

&.disabled {
cursor: not-allowed;
color: #66637A;
Expand Down Expand Up @@ -98,7 +98,7 @@
padding: 11px 0;
text-align: center;

> a {
> button {
margin-right: 10px;

&:last-child {
Expand Down
3 changes: 1 addition & 2 deletions src/components/BrowserMenu/BrowserMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,10 @@
}

.item {
padding: 6px 14px;
padding: 4px 14px;
white-space: nowrap;
cursor: pointer;
color: white;
height: 26px;

&:hover {
background: $blue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ export default class ColumnsConfiguration extends React.Component {
onClick={this.showAll.bind(this)} />
<Button
color='white'
value='Autosort'
value='Auto-sort'
onClick={this.autoSort.bind(this)} />
</div>
</div>
Expand Down
20 changes: 9 additions & 11 deletions src/components/Modal/Modal.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,24 @@ let Modal = (({

let footer = customFooter || (
<div style={{textAlign: buttonsInCenter ? 'center' : 'right'}} className={styles.footer}>
{showCancel ? <Button
{showCancel && <Button
value={cancelText}
onClick={onCancel}
disabled={!canCancel} /> : null}
<Button
disabled={!canCancel} /> }
{ showContinue && <Button
primary={true}
value={confirmText}
value={continueText}
color={buttonColors[type]}
disabled={!!disabled}
onClick={onConfirm}
progress={progress} />
{
showContinue === true ?
onClick={onContinue}
progress={progress} /> }
<Button
primary={true}
value={continueText}
value={confirmText}
color={buttonColors[type]}
disabled={!!disabled}
onClick={onContinue}
progress={progress} />: null}
onClick={onConfirm}
progress={progress} />
</div>
);

Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/Modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
position: absolute;
font-size: 14px;
color: white;
top: 49px;
top: 52px;
left: 28px;
}

Expand Down
Loading