Commit 2bb3f708 authored by ninabreznik's avatar ninabreznik Committed by yann300

Fix pending styling, refactor button titles and fix color for payable

parent d7e8ad09
...@@ -216,8 +216,8 @@ ...@@ -216,8 +216,8 @@
} }
#runTabView .contractProperty.payable .call { #runTabView .contractProperty.payable .call {
background-color: hsla(0, 82%, 82%, .5); /* lightRed in style-guide.js */ background-color: hsla(0, 82%, 82%, 1); /* red in style-guide.js */
border-color: hsla(0, 82%, 82%, .5); /* lightRed in style-guide.js */ border-color: hsla(0, 82%, 82%, 1); /* red in style-guide.js */
width: 25%; width: 25%;
} }
......
...@@ -69,7 +69,8 @@ var css = csjs` ...@@ -69,7 +69,8 @@ var css = csjs`
margin-top: 2%; margin-top: 2%;
border: none; border: none;
} }
.pendingTxsContainer extends ${styles.displayBox} { .pendingTxsContainer {
${styles.displayBox}
display: flex; display: flex;
flex-direction: column; flex-direction: column;
background-color: ${styles.colors.transparent}; background-color: ${styles.colors.transparent};
...@@ -128,7 +129,8 @@ var css = csjs` ...@@ -128,7 +129,8 @@ var css = csjs`
color: ${styles.colors.lightGrey}; color: ${styles.colors.lightGrey};
font-style: italic; font-style: italic;
} }
.pendingTxsText extends ${styles.displayBox} { .pendingTxsText {
${styles.displayBox}
text-align: center; text-align: center;
color: ${styles.colors.lightGrey}; color: ${styles.colors.lightGrey};
font-style: italic; font-style: italic;
......
...@@ -334,7 +334,8 @@ UniversalDApp.prototype.getCallButton = function (args) { ...@@ -334,7 +334,8 @@ UniversalDApp.prototype.getCallButton = function (args) {
if (lookupOnly) { if (lookupOnly) {
$contractProperty.addClass('constant') $contractProperty.addClass('constant')
button.attr('title', (title + " - call)")) button.attr('title', (title + ' - call'))
call()
} }
if (args.funABI.inputs && args.funABI.inputs.length > 0) { if (args.funABI.inputs && args.funABI.inputs.length > 0) {
...@@ -343,11 +344,11 @@ UniversalDApp.prototype.getCallButton = function (args) { ...@@ -343,11 +344,11 @@ UniversalDApp.prototype.getCallButton = function (args) {
if (args.funABI.payable === true) { if (args.funABI.payable === true) {
$contractProperty.addClass('payable') $contractProperty.addClass('payable')
button.attr('title', (title + " - transact (payable)")) button.attr('title', (title + ' - transact (payable)'))
} }
if (args.funABI.payable === false) { if (!lookupOnly && args.funABI.payable === false) {
button.attr('title', (title + " - transact (not payable)")) button.attr('title', (title + ' - transact (not payable)'))
} }
return $contractProperty return $contractProperty
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment