From 5cb53ddd8d72e6dfc60c038e8a940c94e79c397c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 18 Dec 2017 12:53:40 +0100 Subject: [PATCH] UI package bump (#7318) * Bump js-ui * Fix css for status plugins --- js/package-lock.json | 22 ++++++++++--------- js/package.json | 2 +- js/src/Status/SignerPending/signerPending.css | 1 - js/src/Status/status.css | 1 - 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/js/package-lock.json b/js/package-lock.json index 2415873dc..860ff20be 100644 --- a/js/package-lock.json +++ b/js/package-lock.json @@ -1198,9 +1198,9 @@ } }, "@parity/ui": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-3.0.16.tgz", - "integrity": "sha512-yGQ8k2/oNxu0GyJ6eQS1AUk1O1XR//oXfaHPEBa0VuJIB7gY9lPrkG7CSNpazOrTCfhdCHgpjGe3WR5lbv0HiQ==", + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-3.0.17.tgz", + "integrity": "sha512-X3F8CmgL6qWaCKQg5AD69n8kidoZyhQpkYdbK6rBeUqNErkKKAOH/SJXsl2TdCsjlghsErl7wYRFWGEt2S86Xg==", "requires": { "@parity/api": "2.1.14", "@parity/etherscan": "2.1.3", @@ -10178,9 +10178,6 @@ "verror": "1.10.0" } }, - "jsqr": { - "version": "git+https://github.com/cozmo/jsQR.git#397a6eb8f90752cf640cb4bb67ba6f86e3bb5d1f" - }, "jsx-ast-utils": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz", @@ -14143,6 +14140,11 @@ "jsqr": "git+https://github.com/cozmo/jsQR.git#397a6eb8f90752cf640cb4bb67ba6f86e3bb5d1f", "prop-types": "15.5.10", "webrtc-adapter": "5.0.6" + }, + "dependencies": { + "jsqr": { + "version": "git+https://github.com/cozmo/jsQR.git#397a6eb8f90752cf640cb4bb67ba6f86e3bb5d1f" + } } }, "react-redux": { @@ -15736,9 +15738,9 @@ } }, "rtcpeerconnection-shim": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.2.tgz", - "integrity": "sha512-8gk72X25Z31XEkk5DZd6y4aziHgj0mZMB7xMv4mUrS6moTmZOrcKE8+rvEVRModMkaaUyspEVwBn8JGuG8Z1ww==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.4.tgz", + "integrity": "sha512-DQ65pr+e9GYC52dVj9Pqoh2cOC3gl4956XXbPWgGvPOqX3sA3nmv3qvf9OMyYq5MwHAQeLnYkGnJaBIRiBBIQw==", "requires": { "sdp": "2.5.0" } @@ -19008,7 +19010,7 @@ "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-5.0.6.tgz", "integrity": "sha512-dh2hPQFOPP0tLEYlFxtGI5vuQmRqkOdYni5wMKUHIx5I2dw0TJ1HdG7P+UechRWt6TvwPWhtbjVNQcQf1KXJmQ==", "requires": { - "rtcpeerconnection-shim": "1.2.2", + "rtcpeerconnection-shim": "1.2.4", "sdp": "2.5.0" } }, diff --git a/js/package.json b/js/package.json index 700f442a7..a7c3edf77 100644 --- a/js/package.json +++ b/js/package.json @@ -146,7 +146,7 @@ "@parity/plugin-signer-hardware": "paritytech/plugin-signer-hardware", "@parity/plugin-signer-qr": "paritytech/plugin-signer-qr", "@parity/shared": "2.2.14", - "@parity/ui": "^3.0.16", + "@parity/ui": "^3.0.17", "keythereum": "1.0.2", "lodash.flatten": "4.4.0", "lodash.omitby": "4.6.0", diff --git a/js/src/Status/SignerPending/signerPending.css b/js/src/Status/SignerPending/signerPending.css index 3fcc9ae7d..f132ce28f 100644 --- a/js/src/Status/SignerPending/signerPending.css +++ b/js/src/Status/SignerPending/signerPending.css @@ -16,7 +16,6 @@ */ .signerPending { - margin-top: 4px !important; position: relative; cursor: pointer; } diff --git a/js/src/Status/status.css b/js/src/Status/status.css index 27922da03..1046ab525 100644 --- a/js/src/Status/status.css +++ b/js/src/Status/status.css @@ -72,7 +72,6 @@ $statusHeight: 2.75em; .health { > span { - margin: -0.5rem 0 0.2rem 0 !important; width: auto; } }