logos fix
After Width: | Height: | Size: 20 KiB |
After Width: | Height: | Size: 23 KiB |
After Width: | Height: | Size: 20 KiB |
After Width: | Height: | Size: 21 KiB |
Before Width: | Height: | Size: 4.6 KiB |
Before Width: | Height: | Size: 3.7 KiB |
Before Width: | Height: | Size: 5.0 KiB |
Before Width: | Height: | Size: 10 KiB |
|
@ -891,13 +891,13 @@ function ballotViewObject(ballotID, ballotPropsObj, isVotingEnabled) {
|
|||
}
|
||||
function getWeb3(callback) {
|
||||
if (typeof window.web3 === 'undefined') {
|
||||
// no web3, use fallback
|
||||
// no web3, use fallback
|
||||
console.error("Please use a web3 browser");
|
||||
var msgNotEthereum = "You aren't connected to Ethereum. Please, switch on Parity or MetaMask client and refresh the page. Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.";
|
||||
swal("Warning", msgNotEthereum, "warning");
|
||||
callback(myWeb3, false);
|
||||
} else {
|
||||
// window.web3 == web3 most of the time. Don't override the provided,
|
||||
// window.web3 == web3 most of the time. Don't override the provided,
|
||||
// web3, just wrap it in your Web3.
|
||||
var myWeb3 = new Web3(window.web3.currentProvider);
|
||||
|
||||
|
@ -914,7 +914,9 @@ function getWeb3(callback) {
|
|||
function checkNetworkVersion(web3, cb) {
|
||||
var msgNotOracles = "You aren't connected to Oracles network. Please, switch on Parity or MetaMask client and choose Oracles network. Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.";
|
||||
web3.version.getNetwork(function(err, netId) {
|
||||
console.log(netId);
|
||||
if (err)
|
||||
console.log(err);
|
||||
console.log("netId: " + netId);
|
||||
switch (netId) {
|
||||
case "1": {
|
||||
console.log('This is mainnet');
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
function getWeb3(callback) {
|
||||
if (typeof window.web3 === 'undefined') {
|
||||
// no web3, use fallback
|
||||
// no web3, use fallback
|
||||
console.error("Please use a web3 browser");
|
||||
var msgNotEthereum = "You aren't connected to Ethereum. Please, switch on Parity or MetaMask client and refresh the page. Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.";
|
||||
swal("Warning", msgNotEthereum, "warning");
|
||||
callback(myWeb3, false);
|
||||
} else {
|
||||
// window.web3 == web3 most of the time. Don't override the provided,
|
||||
// window.web3 == web3 most of the time. Don't override the provided,
|
||||
// web3, just wrap it in your Web3.
|
||||
var myWeb3 = new Web3(window.web3.currentProvider);
|
||||
|
||||
|
@ -23,7 +23,9 @@ function getWeb3(callback) {
|
|||
function checkNetworkVersion(web3, cb) {
|
||||
var msgNotOracles = "You aren't connected to Oracles network. Please, switch on Parity or MetaMask client and choose Oracles network. Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.";
|
||||
web3.version.getNetwork(function(err, netId) {
|
||||
console.log(netId);
|
||||
if (err)
|
||||
console.log(err);
|
||||
console.log("netId: " + netId);
|
||||
switch (netId) {
|
||||
case "1": {
|
||||
console.log('This is mainnet');
|
||||
|
|
|
@ -17,14 +17,14 @@
|
|||
}
|
||||
|
||||
&-logo {
|
||||
@include image-2x('../images/logos@2x.png', 149px, 59px);
|
||||
@include image-2x('../images/GOVERNANCE_footer@2x.png', 100px, 24px);
|
||||
position: relative;
|
||||
z-index: 2;
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
width: 100px;
|
||||
height: 24px;
|
||||
background-image: url(../images/logos.png);
|
||||
background-image: url(../images/GOVERNANCE_footer.png);
|
||||
background-position: 0 0;
|
||||
}
|
||||
|
||||
|
|
|
@ -20,12 +20,12 @@
|
|||
}
|
||||
|
||||
&-logo {
|
||||
@include image-2x('../images/logos@2x.png', 149px, 59px);
|
||||
@include image-2x('../images/GOVERNANCE@2x.png', 149px, 35px);
|
||||
float: left;
|
||||
width: 149px;
|
||||
height: 35px;
|
||||
background-image: url(../images/logos.png);
|
||||
background-position: 0 -24px;
|
||||
background-image: url(../images/GOVERNANCE.png);
|
||||
background-position: 0 0;
|
||||
}
|
||||
|
||||
&-new-ballot {
|
||||
|
|