diff --git a/css/component1.css b/css/component1.css index f4e133a..880c2e4 100755 --- a/css/component1.css +++ b/css/component1.css @@ -4,7 +4,8 @@ position: absolute; display: block; margin: 0 auto; - right: 0; + right: 10px; + top: 10px; } .morph-button > button { @@ -18,7 +19,8 @@ font-weight: 700; line-height: 80px; overflow: hidden; - right: 0; + right: 10px; + top: 10px; } .morph-button.open > button { diff --git a/css/content1.css b/css/content1.css index 7f20a01..348a1c9 100755 --- a/css/content1.css +++ b/css/content1.css @@ -123,6 +123,16 @@ font-size: 1.5em; } +.content-style-overlay li { + margin: 0 auto; + padding: 10px 0; + max-width: 625px; + text-align: justify; + font-weight: 300; + font-size: 1.5em; +} + + .content-style-overlay .icon-close { border: 2px solid #f9e1c9; border-radius: 50%; diff --git a/index.html b/index.html index 522f55c..b77ab52 100755 --- a/index.html +++ b/index.html @@ -49,17 +49,25 @@
diff --git a/js/fullscreenForm.js b/js/fullscreenForm.js index c2525a5..5d00335 100644 --- a/js/fullscreenForm.js +++ b/js/fullscreenForm.js @@ -194,14 +194,12 @@ parsed_data = { 'type': 'noise', 'flodata': nospacestring }; } else if (incorporation && !transfer) { var initTokens = extractInitTokens(cleanstring); - var address = extractAddress(nospacestring); - if (initTokens != 0 && address != 0) { + if (initTokens != 0) { parsed_data = { 'type': 'tokenIncorporation', - 'flodata': cleanstring, + 'flodata': nospacestring, 'tokenIdentification': hashList[0].slice(0, hashList[0].length - 1), - 'tokenAmount': initTokens, - 'address': address.slice(0, address.length - 1) + 'tokenAmount': initTokens }; } else { parsed_data = { 'type': 'noise', 'flodata': nospacestring }; @@ -211,15 +209,13 @@ // todo Rule 31 - Extract number of tokens to be sent and the address to which to be sent, both data is mandatory else if (!incorporation && transfer) { var amount = extractAmount(cleanstring, hashList[0].slice(0, hashList[0].length - 1)); - var address = extractAddress(nospacestring); - if (amount != 0 && address != 0) { + if (amount != 0) { parsed_data = { 'type': 'transfer', 'transferType': 'token', - 'flodata': cleanstring, + 'flodata': nospacestring, 'tokenIdentification': hashList[0].slice(0, hashList[0].length - 1), - 'tokenAmount': amount, - 'address': address.slice(0, address.length - 1) + 'tokenAmount': amount }; } else { parsed_data = { 'type': 'noise', 'flodata': nospacestring }; @@ -496,9 +492,9 @@ ol.setAttribute("class", "fs-fields"); if (result['type'] == 'transfer') { - var fieldnames = [ { 'Type': 'Transfer' }, { 'Token name': result['tokenIdentification'] }, { 'Transfer amount': result['tokenAmount'] }, { 'Receiver\'s FLO Address': result['address'] }, {'Original FLO data': result['flodata'] }] + var fieldnames = [ { 'Type': 'Transfer' }, { 'Token name': result['tokenIdentification'] }, { 'Transfer amount': result['tokenAmount'] }, {'Original FLO data': result['flodata'] }] } else if (result['type'] == 'tokenIncorporation') { - var fieldnames = [{ 'Type': 'Incorporation' }, { 'Token name': result['tokenIdentification'] }, { 'Transfer amount': result['tokenAmount'] }, {'Original FLO data': result['flodata'] }] + var fieldnames = [{ 'Type': 'Incorporation' }, { 'Token name': result['tokenIdentification'] }, { 'Incorporation amount': result['tokenAmount'] }, {'Original FLO data': result['flodata'] }] } else { var fieldnames = [{ 'Type': 'Noise' }, {'Original FLO data': result['flodata'] }] }