diff --git a/CHANGELOG.md b/CHANGELOG.md index 32894ae0da..6717a43f1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - [#2497](https://github.com/poanetwork/blockscout/pull/2497) - Add generic Ordered Cache behaviour and implementation ### Fixes +- [#2640](https://github.com/poanetwork/blockscout/pull/2640) - SVG network icons - [#2626](https://github.com/poanetwork/blockscout/pull/2626) - Fixing 2 Mobile UI Issues - [#2623](https://github.com/poanetwork/blockscout/pull/2623) - fix a blinking test - [#2616](https://github.com/poanetwork/blockscout/pull/2616) - deduplicate coin history records by delta diff --git a/apps/block_scout_web/assets/css/_images-preload.scss b/apps/block_scout_web/assets/css/_images-preload.scss index a084daa7a9..95f4633a56 100644 --- a/apps/block_scout_web/assets/css/_images-preload.scss +++ b/apps/block_scout_web/assets/css/_images-preload.scss @@ -1,16 +1,16 @@ body:after { position:absolute; width:0; height:0; overflow:hidden; z-index:-1; content: - url(/images/network-selector-icons/callisto-mainnet.png) - url(/images/network-selector-icons/ethereum-mainnet.png) - url(/images/network-selector-icons/ethereum-classic.png) - url(/images/network-selector-icons/goerli-testnet.png) - url(/images/network-selector-icons/kovan-testnet.png) - url(/images/network-selector-icons/poa-core.png) - url(/images/network-selector-icons/poa-sokol.png) - url(/images/network-selector-icons/rinkeby-testnet.png) - url(/images/network-selector-icons/rsk-mainnet.png) - url(/images/network-selector-icons/ropsten-testnet.png) - url(/images/network-selector-icons/xdai-chain.png) - url(/images/network-selector-icons/lukso-l14-testnet.png) + url(/images/network-selector-icons/callisto-mainnet.svg) + url(/images/network-selector-icons/ethereum-mainnet.svg) + url(/images/network-selector-icons/ethereum-classic.svg) + url(/images/network-selector-icons/goerli-testnet.svg) + url(/images/network-selector-icons/kovan-testnet.svg) + url(/images/network-selector-icons/poa-core.svg) + url(/images/network-selector-icons/poa-sokol.svg) + url(/images/network-selector-icons/rinkeby-testnet.svg) + url(/images/network-selector-icons/rsk-mainnet.svg) + url(/images/network-selector-icons/ropsten-testnet.svg) + url(/images/network-selector-icons/xdai-chain.svg) + url(/images/network-selector-icons/lukso-l14-testnet.svg) }; \ No newline at end of file diff --git a/apps/block_scout_web/assets/css/components/_network-selector.scss b/apps/block_scout_web/assets/css/components/_network-selector.scss index e4a4991fa7..9df2d22164 100644 --- a/apps/block_scout_web/assets/css/components/_network-selector.scss +++ b/apps/block_scout_web/assets/css/components/_network-selector.scss @@ -245,40 +245,40 @@ $network-selector-item-icon-dimensions: 30px !default; width: $network-selector-item-icon-dimensions; &-callisto-mainnet { - background-image: url(/images/network-selector-icons/callisto-mainnet.png) + background-image: url(/images/network-selector-icons/callisto-mainnet.svg) } &-ethereum-mainnet { - background-image: url(/images/network-selector-icons/ethereum-mainnet.png) + background-image: url(/images/network-selector-icons/ethereum-mainnet.svg) } &-ethereum-classic { - background-image: url(/images/network-selector-icons/ethereum-classic.png) + background-image: url(/images/network-selector-icons/ethereum-classic.svg) } &-goerli-testnet { - background-image: url(/images/network-selector-icons/goerli-testnet.png) + background-image: url(/images/network-selector-icons/goerli-testnet.svg) } &-kovan-testnet { - background-image: url(/images/network-selector-icons/kovan-testnet.png) + background-image: url(/images/network-selector-icons/kovan-testnet.svg) } &-poa-core { - background-image: url(/images/network-selector-icons/poa-core.png) + background-image: url(/images/network-selector-icons/poa-core.svg) } &-poa-sokol { - background-image: url(/images/network-selector-icons/poa-sokol.png) + background-image: url(/images/network-selector-icons/poa-sokol.svg) } &-rinkeby-testnet { - background-image: url(/images/network-selector-icons/rinkeby-testnet.png) + background-image: url(/images/network-selector-icons/rinkeby-testnet.svg) } &-rsk-mainnet { - background-image: url(/images/network-selector-icons/rsk-mainnet.png) + background-image: url(/images/network-selector-icons/rsk-mainnet.svg) } &-ropsten-testnet { - background-image: url(/images/network-selector-icons/ropsten-testnet.png) + background-image: url(/images/network-selector-icons/ropsten-testnet.svg) } &-xdai-chain { - background-image: url(/images/network-selector-icons/xdai-chain.png) + background-image: url(/images/network-selector-icons/xdai-chain.svg) } &-lukso-l14-testnet { - background-image: url(/images/network-selector-icons/lukso-l14-testnet.png) + background-image: url(/images/network-selector-icons/lukso-l14-testnet.svg) } } diff --git a/apps/block_scout_web/assets/package-lock.json b/apps/block_scout_web/assets/package-lock.json index 1545e3b759..d00f148391 100644 --- a/apps/block_scout_web/assets/package-lock.json +++ b/apps/block_scout_web/assets/package-lock.json @@ -4555,7 +4555,6 @@ "version": "2.2.4", "resolved": false, "integrity": "sha512-hzXIWWet/BzWhYs2b+u7dRHlruXhwdgvlTMDKC6Cb1U7ps6Ac6yQlR39xsbjWJE377YTCtKwIXIpJ5oP+j5y8g==", - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -4773,8 +4772,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": false, - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "optional": true + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" }, "safer-buffer": { "version": "2.1.2", @@ -4877,8 +4875,7 @@ "yallist": { "version": "3.0.2", "resolved": false, - "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=", - "optional": true + "integrity": "sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=" } } }, @@ -5989,7 +5986,7 @@ }, "callsites": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", "dev": true }, @@ -6191,7 +6188,7 @@ }, "jest-get-type": { "version": "22.4.3", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", + "resolved": "http://registry.npmjs.org/jest-get-type/-/jest-get-type-22.4.3.tgz", "integrity": "sha512-/jsz0Y+V29w1chdXVygEKSz2nBoHoYqNShPe+QgxSNjAuP1i8+k4LbQNrfoliKej0P45sivkSCh7yiD6ubHS3w==", "dev": true }, diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/aerum-mainnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/aerum-mainnet.png deleted file mode 100644 index cdef9a2edb..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/aerum-mainnet.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/callisto-mainnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/callisto-mainnet.png deleted file mode 100644 index 2e9f2b2730..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/callisto-mainnet.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/callisto-mainnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/callisto-mainnet.svg new file mode 100644 index 0000000000..6a11260fa9 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/callisto-mainnet.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/callisto.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/callisto.svg deleted file mode 100644 index 7adabb6538..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/callisto.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/core.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/core.svg deleted file mode 100644 index 63c66a6baa..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/core.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/dai.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/dai.svg deleted file mode 100644 index c4f800733e..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/dai.svg +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-classic.png b/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-classic.png deleted file mode 100755 index 5ca5d8fe7b..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-classic.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-classic.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-classic.svg new file mode 100644 index 0000000000..111605081a --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-classic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.png deleted file mode 100755 index 3752a92544..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.svg new file mode 100644 index 0000000000..cb0276593b --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/ethereum-mainnet.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.png deleted file mode 100644 index 7a3ac4ae48..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.svg new file mode 100644 index 0000000000..01b44f13a8 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/goerli-testnet.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.png deleted file mode 100755 index 4fabf2fd71..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.svg new file mode 100644 index 0000000000..d04f204e62 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/kovan-testnet.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.png deleted file mode 100755 index 714c80f775..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.svg new file mode 100644 index 0000000000..bc849bbf9d --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/lukso-l14-testnet.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/poa-core.png b/apps/block_scout_web/assets/static/images/network-selector-icons/poa-core.png deleted file mode 100644 index 68bb5976f1..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/poa-core.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/poa-core.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/poa-core.svg new file mode 100644 index 0000000000..f62c0ff8f6 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/poa-core.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/poa-sokol.png b/apps/block_scout_web/assets/static/images/network-selector-icons/poa-sokol.png deleted file mode 100644 index da38f9834b..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/poa-sokol.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/poa-sokol.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/poa-sokol.svg new file mode 100644 index 0000000000..98a2fd0cfe --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/poa-sokol.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.png deleted file mode 100644 index 0e3993eb36..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.svg new file mode 100644 index 0000000000..7a1c7de013 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby-testnet.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby.svg deleted file mode 100644 index 1991096926..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/rinkeby.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.png deleted file mode 100644 index bc5afa1a2e..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.svg new file mode 100644 index 0000000000..96ccf5f9b4 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten-testnet.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten.svg deleted file mode 100644 index 87c98f79d2..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/ropsten.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.png b/apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.png deleted file mode 100755 index c7c0e067c8..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.svg new file mode 100644 index 0000000000..61965fb810 --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/rsk-mainnet.svg @@ -0,0 +1,4 @@ + + + + diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/sokol.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/sokol.svg deleted file mode 100644 index b2ced66189..0000000000 --- a/apps/block_scout_web/assets/static/images/network-selector-icons/sokol.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.png b/apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.png deleted file mode 100644 index 5fb54a4175..0000000000 Binary files a/apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.png and /dev/null differ diff --git a/apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.svg b/apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.svg new file mode 100644 index 0000000000..e6f660410a --- /dev/null +++ b/apps/block_scout_web/assets/static/images/network-selector-icons/xdai-chain.svg @@ -0,0 +1,4 @@ + + + +