Update account dropdowns (#2959)

* Simplify & consolidate address items

* Adjust dropdown background
This commit is contained in:
Jaco Greeff 2016-10-31 12:58:25 +01:00 committed by Gav Wood
parent 7af20a5db0
commit d086251e89
5 changed files with 35 additions and 25 deletions

View File

@ -158,6 +158,7 @@ export default class Details extends Component {
return ( return (
<Select <Select
className={ styles.tokenSelect }
label='type of token transfer' label='type of token transfer'
hint='type of token to transfer' hint='type of token to transfer'
value={ tag } value={ tag }

View File

@ -42,9 +42,16 @@
margin-right: 0.5em; margin-right: 0.5em;
} }
.tokenSelect {
}
.token { .token {
height: 32px; height: 32px;
margin-top: 14px; padding: 4px 0;
}
.tokenSelect .token {
margin-top: 10px;
} }
.token img { .token img {

View File

@ -15,26 +15,24 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>. /* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/ */
.account { .account {
max-height: 36px;
padding: 4px 0 0 0; padding: 4px 0 0 0;
line-height: 32px;
margin-top: 11px;
} }
.details { .name {
height: 32px;
line-height: 32px;
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
text-transform: uppercase;
padding: 0 0 0 1em;
} }
.image { .image {
display: inline-block; display: inline-block;
max-height: 32px; height: 32px;
} width: 32px;
margin: 0;
.name { z-index: 10;
line-height: 32px;
vertical-align: top;
text-transform: uppercase;
} }
.icon { .icon {
@ -50,3 +48,8 @@
.container { .container {
position: relative; position: relative;
} }
.menuItem {
min-height: 0 !important;
line-height: inherit !important;
}

View File

@ -104,21 +104,19 @@ export default class AddressSelect extends Component {
renderSelectEntry = (entry) => { renderSelectEntry = (entry) => {
const item = ( const item = (
<div className={ styles.account }> <div className={ styles.account }>
<div className={ styles.image }> <IdentityIcon
<IdentityIcon className={ styles.image }
inline center inline center
address={ entry.address } /> address={ entry.address } />
</div> <IdentityName
<div className={ styles.details }> className={ styles.name }
<div className={ styles.name }> address={ entry.address } />
<IdentityName address={ entry.address } />
</div>
</div>
</div> </div>
); );
return ( return (
<MenuItem <MenuItem
className={ styles.menuItem }
key={ entry.address } key={ entry.address }
value={ entry.address } value={ entry.address }
label={ item }> label={ item }>

View File

@ -22,16 +22,17 @@ import lightBaseTheme from 'material-ui/styles/baseThemes/lightBaseTheme';
const lightTheme = getMuiTheme(lightBaseTheme); const lightTheme = getMuiTheme(lightBaseTheme);
const muiTheme = getMuiTheme(darkBaseTheme); const muiTheme = getMuiTheme(darkBaseTheme);
muiTheme.stepper.textColor = '#eee';
muiTheme.stepper.disabledTextColor = '#777';
muiTheme.inkBar.backgroundColor = 'transparent'; muiTheme.inkBar.backgroundColor = 'transparent';
muiTheme.paper.backgroundColor = 'rgba(0, 0, 0, 0.95)';
muiTheme.raisedButton.primaryTextColor = 'white'; muiTheme.raisedButton.primaryTextColor = 'white';
muiTheme.snackbar.backgroundColor = 'rgba(255, 30, 30, 0.9)'; muiTheme.snackbar.backgroundColor = 'rgba(255, 30, 30, 0.9)';
muiTheme.snackbar.textColor = 'rgba(255, 255, 255, 0.75)'; muiTheme.snackbar.textColor = 'rgba(255, 255, 255, 0.75)';
muiTheme.stepper.textColor = '#eee';
muiTheme.stepper.disabledTextColor = '#777';
muiTheme.tabs = lightTheme.tabs; muiTheme.tabs = lightTheme.tabs;
muiTheme.tabs.backgroundColor = 'transparent'; muiTheme.tabs.backgroundColor = 'transparent';
muiTheme.tabs.selectedTextColor = 'white'; muiTheme.tabs.selectedTextColor = 'white';
muiTheme.tabs.textColor = 'rgba(255, 255, 255, 0.5)'; // 'rgb(0, 151, 167)'; muiTheme.tabs.textColor = 'rgba(255, 255, 255, 0.5)';
muiTheme.textField.floatingLabelColor = 'rgba(255, 255, 255, 0.5)'; muiTheme.textField.floatingLabelColor = 'rgba(255, 255, 255, 0.5)';
muiTheme.textField.hintColor = 'rgba(255, 255, 255, 0.5)'; muiTheme.textField.hintColor = 'rgba(255, 255, 255, 0.5)';
muiTheme.textField.disabledTextColor = muiTheme.textField.textColor; muiTheme.textField.disabledTextColor = muiTheme.textField.textColor;