From 3b3f0ea9571a4c7ddb325c691886efeab3a8283c Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 26 Feb 2019 20:31:28 +0000 Subject: [PATCH] Move E2E icons out of feather dir They appear to all be created by Nad, according to https://github.com/matrix-org/matrix-react-sdk/pull/2557. --- .../dialogs/keybackup/_KeyBackupFailedDialog.scss | 2 +- res/css/views/rooms/_E2EIcon.scss | 4 ++-- res/css/views/rooms/_EventTile.scss | 4 ++-- res/css/views/rooms/_MemberDeviceInfo.scss | 6 +++--- res/img/{feather-icons => }/e2e/blacklisted.svg | 0 res/img/{feather-icons => }/e2e/lock-verified.svg | 0 res/img/e2e/lock-warning-filled.svg | 1 + res/img/e2e/lock-warning.svg | 10 +++++++++- res/img/{feather-icons => }/e2e/verified.svg | 0 res/img/{feather-icons => }/e2e/warning.svg | 0 res/img/feather-icons/e2e/lock-warning.svg | 9 --------- src/components/structures/RoomStatusBar.js | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) rename res/img/{feather-icons => }/e2e/blacklisted.svg (100%) rename res/img/{feather-icons => }/e2e/lock-verified.svg (100%) create mode 100644 res/img/e2e/lock-warning-filled.svg rename res/img/{feather-icons => }/e2e/verified.svg (100%) rename res/img/{feather-icons => }/e2e/warning.svg (100%) delete mode 100644 res/img/feather-icons/e2e/lock-warning.svg diff --git a/res/css/views/dialogs/keybackup/_KeyBackupFailedDialog.scss b/res/css/views/dialogs/keybackup/_KeyBackupFailedDialog.scss index bd703badaa..f905516bd4 100644 --- a/res/css/views/dialogs/keybackup/_KeyBackupFailedDialog.scss +++ b/res/css/views/dialogs/keybackup/_KeyBackupFailedDialog.scss @@ -24,7 +24,7 @@ limitations under the License. padding-bottom: 10px; &:before { - mask: url("$(res)/img/e2e/lock-warning.svg"); + mask: url("$(res)/img/e2e/lock-warning-filled.svg"); mask-repeat: no-repeat; background-color: $primary-fg-color; content: ""; diff --git a/res/css/views/rooms/_E2EIcon.scss b/res/css/views/rooms/_E2EIcon.scss index cd577df87b..84a16611de 100644 --- a/res/css/views/rooms/_E2EIcon.scss +++ b/res/css/views/rooms/_E2EIcon.scss @@ -23,11 +23,11 @@ limitations under the License. } .mx_E2EIcon_verified { - mask-image: url('$(res)/img/feather-icons/e2e/lock-verified.svg'); + mask-image: url('$(res)/img/e2e/lock-verified.svg'); background-color: $accent-color; } .mx_E2EIcon_warning { - mask-image: url('$(res)/img/feather-icons/e2e/lock-warning.svg'); + mask-image: url('$(res)/img/e2e/lock-warning.svg'); background-color: $warning-color; } diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss index b06e2a5391..c24502e7e1 100644 --- a/res/css/views/rooms/_EventTile.scss +++ b/res/css/views/rooms/_EventTile.scss @@ -296,12 +296,12 @@ limitations under the License. } .mx_EventTile_e2eIcon_undecryptable, .mx_EventTile_e2eIcon_unverified { - mask-image: url('$(res)/img/feather-icons/e2e/warning.svg'); + mask-image: url('$(res)/img/e2e/warning.svg'); background-color: $warning-color; } .mx_EventTile_e2eIcon_unencrypted { - mask-image: url('$(res)/img/feather-icons/e2e/warning.svg'); + mask-image: url('$(res)/img/e2e/warning.svg'); background-color: $composer-e2e-icon-color; } diff --git a/res/css/views/rooms/_MemberDeviceInfo.scss b/res/css/views/rooms/_MemberDeviceInfo.scss index f780c50410..3be6a0f7b4 100644 --- a/res/css/views/rooms/_MemberDeviceInfo.scss +++ b/res/css/views/rooms/_MemberDeviceInfo.scss @@ -27,15 +27,15 @@ limitations under the License. mask-repeat: no-repeat; } .mx_MemberDeviceInfo_icon_blacklisted { - mask-image: url('$(res)/img/feather-icons/e2e/blacklisted.svg'); + mask-image: url('$(res)/img/e2e/blacklisted.svg'); background-color: $warning-color; } .mx_MemberDeviceInfo_icon_verified { - mask-image: url('$(res)/img/feather-icons/e2e/verified.svg'); + mask-image: url('$(res)/img/e2e/verified.svg'); background-color: $accent-color; } .mx_MemberDeviceInfo_icon_unverified { - mask-image: url('$(res)/img/feather-icons/e2e/warning.svg'); + mask-image: url('$(res)/img/e2e/warning.svg'); background-color: $warning-color; } diff --git a/res/img/feather-icons/e2e/blacklisted.svg b/res/img/e2e/blacklisted.svg similarity index 100% rename from res/img/feather-icons/e2e/blacklisted.svg rename to res/img/e2e/blacklisted.svg diff --git a/res/img/feather-icons/e2e/lock-verified.svg b/res/img/e2e/lock-verified.svg similarity index 100% rename from res/img/feather-icons/e2e/lock-verified.svg rename to res/img/e2e/lock-verified.svg diff --git a/res/img/e2e/lock-warning-filled.svg b/res/img/e2e/lock-warning-filled.svg new file mode 100644 index 0000000000..a984ed85a0 --- /dev/null +++ b/res/img/e2e/lock-warning-filled.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/res/img/e2e/lock-warning.svg b/res/img/e2e/lock-warning.svg index a984ed85a0..de2bded7f8 100644 --- a/res/img/e2e/lock-warning.svg +++ b/res/img/e2e/lock-warning.svg @@ -1 +1,9 @@ - \ No newline at end of file + + + + + + + + + diff --git a/res/img/feather-icons/e2e/verified.svg b/res/img/e2e/verified.svg similarity index 100% rename from res/img/feather-icons/e2e/verified.svg rename to res/img/e2e/verified.svg diff --git a/res/img/feather-icons/e2e/warning.svg b/res/img/e2e/warning.svg similarity index 100% rename from res/img/feather-icons/e2e/warning.svg rename to res/img/e2e/warning.svg diff --git a/res/img/feather-icons/e2e/lock-warning.svg b/res/img/feather-icons/e2e/lock-warning.svg deleted file mode 100644 index de2bded7f8..0000000000 --- a/res/img/feather-icons/e2e/lock-warning.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/components/structures/RoomStatusBar.js b/src/components/structures/RoomStatusBar.js index ab7f472931..1df0581b89 100644 --- a/src/components/structures/RoomStatusBar.js +++ b/src/components/structures/RoomStatusBar.js @@ -290,7 +290,7 @@ module.exports = React.createClass({ } return
- +
{ title } @@ -309,7 +309,7 @@ module.exports = React.createClass({ if (this._shouldShowConnectionError()) { return (
- /!\ + /!\
{ _t('Connectivity to the server has been lost.') }