Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/__tests__/jest-preprocessor.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ var babel_jest = require('babel-jest');

module.exports = {
process: function(src, path) {
src = babel_jest.process(src, path)
src = babel_jest.process(src, path);
// CoffeeScript files can be .coffee, .litcoffee, or .coffee.md
if (coffee.helpers.isCoffee(path)) {
return coffee.compile(src, {'bare': true});
}
return src;
}
}
};
2 changes: 1 addition & 1 deletion app/actions/AccountActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ class AccountActions {
return ApplicationApi.activenode_create_operation({
activenode_account
}).then(result => {
console.log( "activenode_create_operation result: ", result )
console.log( "activenode_create_operation result: ", result );

dispatch(result);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ img.mfp-img {
display: block;
line-height: 0;
box-sizing: border-box;
padding: 40px 0 40px;
padding: 40px 0;
margin: 0 auto;
}

Expand Down
10 changes: 5 additions & 5 deletions app/assets/stylesheets/_shame.scss
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ section > .button:last-child {
margin-bottom: .5rem;
}
.actions {
padding: 1rem 0 1rem 0;
padding: 1rem 0;
}
}

Expand All @@ -164,7 +164,7 @@ section > .button:last-child {
h3,
h1 {
margin: 0;
padding: 1rem 0 1rem 0;
padding: 1rem 0;
}
h3 {
font-size: 2rem;
Expand Down Expand Up @@ -234,10 +234,10 @@ div.memo-tip {

.invoice {
.item-name {
padding: 0.2rem 0 0.2rem 0;
padding: 0.2rem 0;
}
.item-description {
padding: 0.2rem 0 0.2rem 0;
padding: 0.2rem 0;
font-size: 90%;
}
}
Expand Down Expand Up @@ -275,7 +275,7 @@ label.inline {
max-width: 50rem;
display: inline-flex;
flex-direction: column;
padding: 1rem 2rem 1rem 2rem;
padding: 1rem 2rem;
background: hsl(0, 0%, 32%);
color: white;
border-radius: 0.05rem;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/_account-create.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ div.divider {
div.account-creation {
width: 300px;
margin-top: 0.1rem;
padding: 1rem 1rem 1rem 1rem;
padding: 1rem;

p {
max-width: 95vw;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/_account.scss
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
&.menu-subheader {
text-transform: uppercase;
font-size: 0.875rem;
padding: 1.5rem 0.5rem 0.25rem 0.5rem;
padding: 1.5rem 0.5rem 0.25rem;
text-align: center;
border-bottom: none !important;

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/_cards.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

.asset-card {
padding: 0 1rem 0 0 !important;
margin: 0 0 2rem 0;
margin: 0 0 2rem;
.card-divider {
margin-bottom: 1rem;
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/_exchange-old.scss
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ tbody.orderbook > tr.my-order > td {
}

.marketPicker__subHeader {
padding: 10px 5px 0px 5px;
padding: 10px 5px 0px;
font-size: 1rem;
}

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/_exchange.scss
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ tbody.orderbook > tr.my-order > td {
}

.marketPicker__subHeader {
padding: 10px 5px 0px 5px;
padding: 10px 5px 0px;
font-size: 1rem;
}

Expand Down
6 changes: 3 additions & 3 deletions app/assets/stylesheets/components/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ div.transfer-input {
display: block;
text-decoration: none;
color: #333;
padding: 10px 10px;
padding: 10px;
transition: all 0.3s ease-out;
}
i {
Expand All @@ -250,7 +250,7 @@ div.transfer-input {
top: 50%;
right: 10px;
margin-top: -3px;
border-width: 6px 6px 0 6px;
border-width: 6px 6px 0;
border-style: solid;
}
.dropdown-wrapper.inactive:after {
Expand Down Expand Up @@ -344,7 +344,7 @@ form.full-width {
button.red,
button.green,
button.blue {
padding: 10px 0px 10px 0px;
padding: 10px 0px;
width: 8rem;
color: rgb(242, 242, 242);
font-size: 0.875rem;
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/components/_header.scss
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ div.account-drop-down div.dropdown-wrapper {
> li {
list-style: none;
> div.table-cell {
padding: 15px 5px 14px 5px;
padding: 15px 5px 14px;
text-align: center;
vertical-align: middle;

Expand Down Expand Up @@ -174,7 +174,7 @@ div.account-drop-down div.menu-dropdown-wrapper {

> div.table-cell {
height: 64px;
padding: 23px 5px 24px 5px;
padding: 23px 5px 24px;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/components/_loading-indicator.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
.progress-indicator {
height: 50px;
vertical-align: middle;
margin: 46px 20px 20px 20px;
margin: 46px 20px 20px;
text-align: center;
color: #000;
display: none;
Expand All @@ -58,7 +58,7 @@
}

.with-progress .spinner {
margin: 20px auto 0 auto;
margin: 20px auto 0;
}

.spinner > div {
Expand Down
4 changes: 2 additions & 2 deletions app/assets/stylesheets/components/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
max-width: 700px;
border-radius: 8px;
overflow: auto !important;
padding: 1rem 2rem 1rem 2rem;
padding: 1rem 2rem;
transition-duration: 0.01s !important;

.modal__header {
Expand Down Expand Up @@ -154,7 +154,7 @@
border-radius: 0 5px 5px 0!important;
}
#search_inp_drd {
border-radius: 5px 5px 5px 5px!important;
border-radius: 5px!important;
}
div.input-wrapper div.floating-dropdown {
width: 30px;
Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/components/_pagination.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
> input {
display: inline;
width: 4rem;
margin: 0 0rem 0 0rem;
margin: 0 0rem;
border: none;
}
}
4 changes: 2 additions & 2 deletions app/assets/stylesheets/layout/_page_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ div.bordered-header {
border: 1px solid rgba(183, 183, 183, 0.29);

div:first-child & {
margin: 0 10px 0 10px;
margin: 0 10px;
}

div:last-child & {
margin: 0 10px 0 10px;
margin: 0 10px;
}
}

Expand Down
2 changes: 1 addition & 1 deletion app/assets/stylesheets/vendors/_foundation_overrides.scss
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ a {
}

.modal {
padding: 1rem 1rem 1rem 1rem;
padding: 1rem;
h3 {
margin-bottom: 1rem;
}
Expand Down
2 changes: 1 addition & 1 deletion app/components/Account/ConfigINI.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ class ConfigINI {
.replace(VAR_privateKey, this.privateKey);

return items;
}
};

get = () => FILE_CONTENT
.replace(VAR_accountName, this.accountName)
Expand Down
6 changes: 3 additions & 3 deletions app/components/CliWalletAPI.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class CliWalletAPI {
} catch(ex) {}

error();
}
};

importAccountInWallet(account, privKey, cb) {
let q = "{ " +
Expand Down Expand Up @@ -112,7 +112,7 @@ class CliWalletAPI {
this.ws.onmessage = null;
};
this.ws.send(q);
}
};

createActivenodeByAccount = (account, cb) => {
let q = "{ " +
Expand All @@ -130,7 +130,7 @@ class CliWalletAPI {
this.ws.onmessage = null;
};
this.ws.send(q);
}
};
}

export default CliWalletAPI;
4 changes: 2 additions & 2 deletions app/components/Icon/icon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
.icon-5x > svg, span.icon-5x {
width: 5.75rem;
height: 5.75rem;
margin: 24px 0 24px 0;
margin: 24px 0;
}

.icon-10x > svg, span.icon-10x {
width: 10rem;
height: 10rem;
margin: 24px 0 24px 0;
margin: 24px 0;
}

.icon.fill-black > svg > path {
Expand Down
2 changes: 1 addition & 1 deletion app/components/LocalcoinHost.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class LocalcoinHost {
}

return this._LOCALCOIN_HOST_URL;
}
};

send = (url, body, cb) =>
fetch(this.LOCALCOIN_HOST_URL() + url, {
Expand Down
2 changes: 1 addition & 1 deletion app/lib/feature_detect/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import isIncognito from "./incognito";
import browser from "./browser";

export { isIncognito, browser }
export { isIncognito, browser };
12 changes: 6 additions & 6 deletions app/stores/FastDisconnectPing.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default class FastDisconnectPing {
} catch(ex) {}

return 0;
}
};

setDisconnectStatus = () => {
if(!this.currentNodeIsOpen()) return;
Expand All @@ -32,7 +32,7 @@ export default class FastDisconnectPing {
}

this.blockchainStore.onUpdateRpcConnectionStatus("closed");
}
};

getCurrentNodeName = () => {
try {
Expand All @@ -46,7 +46,7 @@ export default class FastDisconnectPing {
} catch(ex) {}

return counterpart.translate("footer.connected");
}
};

setConnectStatus = () => {
if(this.currentNodeIsOpen()) return;
Expand All @@ -57,7 +57,7 @@ export default class FastDisconnectPing {
}

this.blockchainStore.onUpdateRpcConnectionStatus("open");
}
};


item = () => {
Expand All @@ -76,7 +76,7 @@ export default class FastDisconnectPing {
}

this.lastCntBlocks = currentCntBlocks;
}
};

currentNodeIsOpen = () => this.blockchainStore.rpc_connection_status === STATUS_OPEN;

Expand All @@ -86,5 +86,5 @@ export default class FastDisconnectPing {
window.fastDisconnectPingInterval = setInterval(() => {
this.item();
}, UPDATE_BLOCK_TIME);
}
};
}
Loading