Merge pull request #554 from ninabreznik/padding_contract_tab

Padding on contract tab
pull/1/head
yann300 8 years ago committed by GitHub
commit 10cf8fd395
  1. 2
      src/app/style-guide.js
  2. 14
      src/universal-dapp.js

@ -93,7 +93,7 @@ function styleGuide () {
.title-box { .title-box {
margin-bottom : 0.4em; margin-bottom : 0.4em;
padding : 1em; padding : .3em;
background-color : transparent; background-color : transparent;
font-weight : bold; font-weight : bold;
display : flex; display : flex;

@ -54,9 +54,10 @@ var css = csjs`
var cssInstance = csjs` var cssInstance = csjs`
.title { .title {
display: flex; display: flex;
justify-content: center; justify-content: space-around;
align-items: center;
margin-bottom: 1em; margin-bottom: 1em;
padding: 1em; padding: .3em;
font-size: .95em; font-size: .95em;
cursor: pointer; cursor: pointer;
background-color: ${styles.colors.violet}; background-color: ${styles.colors.violet};
@ -89,12 +90,11 @@ var cssInstance = csjs`
border: 1px dotted ${styles.colors.grey}; border: 1px dotted ${styles.colors.grey};
border-radius: 5px; border-radius: 5px;
text-align: center; text-align: center;
padding: 1em .3em; padding: .3em .3em;
min-width: 30%; min-width: 30%;
} }
.copy:hover{ .copy:hover{
background-color: ${styles.colors.lightGrey}; opacity: .7;
opacity: .8;
} }
` `
@ -349,9 +349,11 @@ UniversalDApp.prototype.getInstanceInterface = function (contract, address, $tar
var context = self.executionContext.isVM() ? 'memory' : 'blockchain' var context = self.executionContext.isVM() ? 'memory' : 'blockchain'
address = (address.slice(0, 2) === '0x' ? '' : '0x') + address.toString('hex') address = (address.slice(0, 2) === '0x' ? '' : '0x') + address.toString('hex')
var len = address.length
var shortAddress = address.slice(0, 5) + '...' + address.slice(len - 5, len)
var title = yo` var title = yo`
<div class="${cssInstance.title}"> <div class="${cssInstance.title}">
<div class="${cssInstance.titleText}" onclick=${toggleClass}> ${contract.name} at ${address} (${context}) </div> <div class="${cssInstance.titleText}" onclick=${toggleClass}> ${contract.name} at ${shortAddress} (${context}) </div>
<div class="${cssInstance.copy}" onclick=${copyToClipboard}> <i class="fa fa-clipboard" aria-hidden="true"></i> Copy address </div> <div class="${cssInstance.copy}" onclick=${copyToClipboard}> <i class="fa fa-clipboard" aria-hidden="true"></i> Copy address </div>
</div> </div>
` `

Loading…
Cancel
Save