m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 19:26:13 +02:00
Code

Merge branch 'master' into networkDropdownFix

Browse Source
This commit is contained in:
Frankie 2016-06-28 17:59:22 -07:00
commit af999e2bee
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -9,6 +9,8 @@
- Wallet titles are now properly truncated in transaction confirmation. - Wallet titles are now properly truncated in transaction confirmation.
- Fix formatting on terms & conditions page. - Fix formatting on terms & conditions page.
- Now enforce 30 character limit on wallet names. - Now enforce 30 character limit on wallet names.
- Fix out-of-place positioning of pending transaction badges on wallet list.
- Change network status icons to reflect current design.
## 2.4.4 2016-06-23 ## 2.4.4 2016-06-23

4
ui/app/app.js
View File

@ -213,14 +213,14 @@ App.prototype.renderNetworkDropdown = function () {
label: 'Main Ethereum Network', label: 'Main Ethereum Network',
closeMenu: () => this.setState({ isNetworkMenuOpen: false }), closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
action: () => props.dispatch(actions.setProviderType('mainnet')), action: () => props.dispatch(actions.setProviderType('mainnet')),
icon: h('.menu-icon.ether-icon'), icon: h('.menu-icon.diamond'),
}), }),
h(DropMenuItem, { h(DropMenuItem, {
label: 'Morden Test Network', label: 'Morden Test Network',
closeMenu: () => this.setState({ isNetworkMenuOpen: false }), closeMenu: () => this.setState({ isNetworkMenuOpen: false }),
action: () => props.dispatch(actions.setProviderType('testnet')), action: () => props.dispatch(actions.setProviderType('testnet')),
icon: h('.menu-icon.morden-icon'), icon: h('.menu-icon.red-dot'),
}), }),
h(DropMenuItem, { h(DropMenuItem, {

4
ui/app/components/network.js
View File

@ -47,9 +47,9 @@ Network.prototype.render = function () {
(function () { (function () {
switch (iconName) { switch (iconName) {
case 'ethereum-network': case 'ethereum-network':
return h('.menu-icon.ether-icon') return h('.menu-icon.diamond')
case 'morden-test-network': case 'morden-test-network':
return h('.menu-icon.morden-icon') return h('.menu-icon.red-dot')
default: default:
return h('i.fa.fa-question-circle.fa-lg', { return h('i.fa.fa-question-circle.fa-lg', {
ariaHidden: true, ariaHidden: true,

24
ui/app/css/lib.css
View File

@ -168,27 +168,25 @@ hr.horizontal-line {
} }
.red-dot { .red-dot {
position: inherit; background: #E91550;
background: red;
color: white; color: white;
border-radius: 10px; border-radius: 10px;
height: 12px; }
min-width: 12px;
margin-left: 6px; .diamond {
display: flex; transform: rotate(45deg);
align-items: center; background: #038789;
justify-content: center;
padding: 4px;
} }
.pending-dot { .pending-dot {
background: red; background: red;
left: 57px; left: 14px;
top: 14px;
color: white; color: white;
border-radius: 10px; border-radius: 10px;
height: 20px; height: 20px;
min-width: 20px; min-width: 20px;
position: absolute; position: relative;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -202,8 +200,8 @@ hr.horizontal-line {
.menu-icon { .menu-icon {
display: inline-block; display: inline-block;
width: 14px; height: 9px;
height: 14px; min-width: 9px;
margin: 13px; margin: 13px;
} }
.ether-icon { .ether-icon {