m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Integrate old QR component with new modal layout

Browse Source
This commit is contained in:
sdtsui 2017-08-21 10:27:56 -07:00
parent b836d0483d
commit 877faaf096
4 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/app/components/modals/account-details-modal.js
View File

@ -52,22 +52,26 @@ AccountDetailsModal.prototype.render = function () {
h('div', {}, [ h('div', {}, [
]), ]),
h('div', {}, [
h(QrView, { h(QrView, {
Qr: { Qr: {
message: this.props.selectedIdentity.name, message: this.props.selectedIdentity.name,
data: this.props.selectedIdentity.address, data: this.props.selectedIdentity.address,
} }
}, []), }, []),
]),
h('div', {}, [ h('div', {}, [
'Account Display', 'Account Display',
]), ]),
h('div', {}, [ // divider
'divider', h('div', {
]), style: {
width: '100%',
height: '1px',
margin: '10px 0px',
backgroundColor: '#D8D8D8',
}
}, []),
h('div', {}, [ h('div', {}, [
'View aCcount on etherscan', 'View aCcount on etherscan',

32
ui/app/components/qr-code.js
View File

@ -29,28 +29,28 @@ QrCodeView.prototype.render = function () {
const qrImage = qrCode(4, 'M') const qrImage = qrCode(4, 'M')
qrImage.addData(address) qrImage.addData(address)
qrImage.make() qrImage.make()
return h('.main-container.flex-column', { return h('.div.flex-column.flex-center', {
key: 'qr', // key: 'qr',
style: { style: {
justifyContent: 'center', // justifyContent: 'center',
paddingBottom: '45px', // paddingBottom: '45px',
paddingLeft: '45px', // paddingLeft: '45px',
paddingRight: '45px', // paddingRight: '45px',
alignItems: 'center', // alignItems: 'center',
}, },
}, [ }, [
Array.isArray(Qr.message) ? h('.message-container', this.renderMultiMessage()) : h('.qr-header', Qr.message), Array.isArray(Qr.message) ? h('.message-container', this.renderMultiMessage()) : h('.qr-header', Qr.message),
this.props.warning ? this.props.warning && h('span.error.flex-center', { this.props.warning ? this.props.warning && h('span.error.flex-center', {
style: { style: {
textAlign: 'center', // textAlign: 'center',
width: '229px', // width: '229px',
height: '82px', // height: '82px',
}, },
}, },
this.props.warning) : null, this.props.warning) : null,
h('#qr-container.flex-column', { h('.div', {
style: { style: {
marginTop: '25px', marginTop: '25px',
marginBottom: '15px', marginBottom: '15px',
@ -59,15 +59,15 @@ QrCodeView.prototype.render = function () {
__html: qrImage.createTableTag(4), __html: qrImage.createTableTag(4),
}, },
}), }),
h('.flex-row', [ h('.div', [
h('h3.ellip-address', { h('span.qr-ellip-address', {
style: { style: {
width: '247px', width: '247px',
}, },
}, Qr.data), }, Qr.data),
h(CopyButton, { // h(CopyButton, {
value: Qr.data, // value: Qr.data,
}), // }),
]), ]),
]) ])
} }

1
ui/app/css/itcss/components/modal.scss
View File

@ -181,4 +181,5 @@
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
position: relative; position: relative;
border: 1px solid #d8d8d8;
} }

10
ui/app/css/itcss/components/sections.scss
View File

@ -457,13 +457,13 @@ textarea.twelve-word-phrase {
color: $white; color: $white;
} }
.ellip-address { .qr-ellip-address {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
width: 5em; // width: 5em;
font-size: 14px; // font-size: 14px;
font-family: "Montserrat Light"; // font-family: "Montserrat Light";
margin-left: 5px; // margin-left: 5px;
} }
.qr-header { .qr-header {