Adjust selection colours/display (#4811)

* Adjust selection colours to match with mui

* allow -> disable (simplify selections)

* Only use top-border

* Overlay selection line

* Slightly more muted unselected

* Restore address icon
This commit is contained in:
Jaco Greeff 2017-03-08 12:00:27 +01:00 committed by GitHub
parent f0f2d00924
commit f16b53d92a
4 changed files with 21 additions and 21 deletions

View File

@ -110,12 +110,6 @@
overflow: hidden;
text-overflow: ellipsis;
font-size: 0.9em;
.address {
&:hover {
cursor: text;
}
}
}
.accountName {

View File

@ -28,15 +28,15 @@ import styles from './accountCard.css';
export default class AccountCard extends Component {
static propTypes = {
account: PropTypes.object.isRequired,
allowAddressClick: PropTypes.bool,
balance: PropTypes.object,
className: PropTypes.string,
disableAddressClick: PropTypes.bool,
onClick: PropTypes.func,
onFocus: PropTypes.func
};
static defaultProps = {
allowAddressClick: false
disableAddressClick: false
};
state = {
@ -138,14 +138,14 @@ export default class AccountCard extends Component {
}
handleAddressClick = (event) => {
const { allowAddressClick } = this.props;
const { disableAddressClick } = this.props;
// Don't stop the event if address click is allowed
if (allowAddressClick) {
return this.onClick(event);
// Stop the event if address click is disallowed
if (disableAddressClick) {
return this.preventEvent(event);
}
return this.preventEvent(event);
return this.onClick(event);
}
handleKeyDown = (event) => {

View File

@ -348,7 +348,6 @@ class AddressSelect extends Component {
return (
<AccountCard
account={ account }
allowAddressClick
balance={ balance }
className={ styles.account }
key={ `account_${index}` }

View File

@ -16,7 +16,6 @@
*/
.item {
border: 2px solid transparent;
cursor: pointer;
display: flex;
flex: 1;
@ -25,7 +24,6 @@
width: 100%;
&:hover {
border-color: transparent;
filter: none;
opacity: 1;
}
@ -35,7 +33,7 @@
width: 100%;
&:hover {
background-color: rgba(255, 255, 255, 0.5);
background-color: rgba(255, 255, 255, 0.15);
}
}
@ -68,15 +66,24 @@
}
.selected {
border-color: rgba(255, 255, 255, 0.25);
filter: none;
&.default {
border-color: rgba(255, 255, 255, 0.75);
&::after {
background: rgb(0, 151, 167);
content: '';
height: 4px;
left: 0;
position: absolute;
right: 0;
top: 0;
}
&.default::after {
background: rgb(167, 151, 0);
}
}
.unselected {
filter: grayscale(10%);
filter: grayscale(50%);
opacity: 0.75;
}