From 3b3f0ea9571a4c7ddb325c691886efeab3a8283c Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 26 Feb 2019 20:31:28 +0000 Subject: [PATCH 1/3] 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.') } From 1a89a4e87dec2e697660326f3c5a5ce950881c2b Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 26 Feb 2019 20:41:27 +0000 Subject: [PATCH 2/3] Move logos out of feather dir These clearly aren't from the Feather set. --- res/img/{feather-icons => }/matrix-org-bw-logo.svg | 0 res/img/{feather-icons => }/modular-bw-logo.svg | 0 src/components/views/auth/ServerTypeSelector.js | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename res/img/{feather-icons => }/matrix-org-bw-logo.svg (100%) rename res/img/{feather-icons => }/modular-bw-logo.svg (100%) diff --git a/res/img/feather-icons/matrix-org-bw-logo.svg b/res/img/matrix-org-bw-logo.svg similarity index 100% rename from res/img/feather-icons/matrix-org-bw-logo.svg rename to res/img/matrix-org-bw-logo.svg diff --git a/res/img/feather-icons/modular-bw-logo.svg b/res/img/modular-bw-logo.svg similarity index 100% rename from res/img/feather-icons/modular-bw-logo.svg rename to res/img/modular-bw-logo.svg diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js index a9311acd7b..8b5f83a4ff 100644 --- a/src/components/views/auth/ServerTypeSelector.js +++ b/src/components/views/auth/ServerTypeSelector.js @@ -30,7 +30,7 @@ export const TYPES = { FREE: { id: FREE, label: () => _t('Free'), - logo: () => , + logo: () => , description: () => _t('Join millions for free on the largest public server'), hsUrl: 'https://matrix.org', isUrl: 'https://vector.im', @@ -38,7 +38,7 @@ export const TYPES = { PREMIUM: { id: PREMIUM, label: () => _t('Premium'), - logo: () => , + logo: () => , description: () => _t('Premium hosting for organisations Learn more', {}, { a: sub => {sub} From 4b340450b916cdaf01276c16d9398c95804ea1c1 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 27 Feb 2019 10:42:05 +0000 Subject: [PATCH 3/3] Rename Feather icon directory to `feather-customised` These icons are based on Feather as the original source, but they have various tweaks applied, such as stroke width, color, etc. Hopefully the tweaked name makes this more obvious in the future. --- res/css/_common.scss | 4 ++-- res/css/structures/_RightPanel.scss | 6 +++--- res/css/structures/_RoomSubList.scss | 2 +- res/css/structures/_RoomView.scss | 2 +- res/css/structures/_TagPanelButtons.scss | 4 ++-- res/css/structures/_TopLeftMenuButton.scss | 2 +- res/css/views/context_menus/_TopLeftMenu.scss | 8 ++++---- res/css/views/dialogs/_RoomSettingsDialog.scss | 8 ++++---- res/css/views/dialogs/_UserSettingsDialog.scss | 16 ++++++++-------- res/css/views/elements/_Dropdown.scss | 2 +- res/css/views/elements/_Field.scss | 2 +- res/css/views/rooms/_AppsDrawer.scss | 16 ++++++++-------- res/css/views/rooms/_MemberList.scss | 2 +- res/css/views/rooms/_MessageComposer.scss | 8 ++++---- res/css/views/rooms/_RoomHeader.scss | 8 ++++---- res/css/views/rooms/_SearchBar.scss | 2 +- res/css/views/settings/_ProfileSettings.scss | 2 +- .../cancel.svg | 0 .../dropdown-arrow.svg | 0 .../face.svg | 0 .../files.svg | 0 .../flag.svg | 0 .../flair.svg | 0 .../globe.svg | 0 .../grid.svg | 0 .../help-circle.svg | 0 .../home.svg | 0 .../life-buoy.svg | 0 .../lock.svg | 0 .../notifications.svg | 0 .../paperclip.svg | 0 .../phone.svg | 0 .../search-input.svg | 0 .../search.svg | 0 .../settings.svg | 0 .../share.svg | 0 .../sign-in.svg | 0 .../sign-out.svg | 0 .../sliders.svg | 0 .../upload.svg | 0 .../user-add.svg | 0 .../user.svg | 0 .../users-sm.svg | 0 .../users.svg | 0 .../video.svg | 0 .../warning-triangle.svg | 0 .../widget/bin.svg | 0 .../widget/camera.svg | 0 .../widget/edit.svg | 0 .../widget/external-link.svg | 0 .../widget/maximise.svg | 0 .../widget/minimise.svg | 0 .../widget/refresh.svg | 0 .../widget/x-circle.svg | 0 src/components/views/auth/ServerTypeSelector.js | 2 +- src/components/views/elements/AppPermission.js | 2 +- .../views/elements/EditableItemList.js | 2 +- src/components/views/settings/EmailAddresses.js | 2 +- src/components/views/settings/PhoneNumbers.js | 2 +- 59 files changed, 52 insertions(+), 52 deletions(-) rename res/img/{feather-icons => feather-customised}/cancel.svg (100%) rename res/img/{feather-icons => feather-customised}/dropdown-arrow.svg (100%) rename res/img/{feather-icons => feather-customised}/face.svg (100%) rename res/img/{feather-icons => feather-customised}/files.svg (100%) rename res/img/{feather-icons => feather-customised}/flag.svg (100%) rename res/img/{feather-icons => feather-customised}/flair.svg (100%) rename res/img/{feather-icons => feather-customised}/globe.svg (100%) rename res/img/{feather-icons => feather-customised}/grid.svg (100%) rename res/img/{feather-icons => feather-customised}/help-circle.svg (100%) rename res/img/{feather-icons => feather-customised}/home.svg (100%) rename res/img/{feather-icons => feather-customised}/life-buoy.svg (100%) rename res/img/{feather-icons => feather-customised}/lock.svg (100%) rename res/img/{feather-icons => feather-customised}/notifications.svg (100%) rename res/img/{feather-icons => feather-customised}/paperclip.svg (100%) rename res/img/{feather-icons => feather-customised}/phone.svg (100%) rename res/img/{feather-icons => feather-customised}/search-input.svg (100%) rename res/img/{feather-icons => feather-customised}/search.svg (100%) rename res/img/{feather-icons => feather-customised}/settings.svg (100%) rename res/img/{feather-icons => feather-customised}/share.svg (100%) rename res/img/{feather-icons => feather-customised}/sign-in.svg (100%) rename res/img/{feather-icons => feather-customised}/sign-out.svg (100%) rename res/img/{feather-icons => feather-customised}/sliders.svg (100%) rename res/img/{feather-icons => feather-customised}/upload.svg (100%) rename res/img/{feather-icons => feather-customised}/user-add.svg (100%) rename res/img/{feather-icons => feather-customised}/user.svg (100%) rename res/img/{feather-icons => feather-customised}/users-sm.svg (100%) rename res/img/{feather-icons => feather-customised}/users.svg (100%) rename res/img/{feather-icons => feather-customised}/video.svg (100%) rename res/img/{feather-icons => feather-customised}/warning-triangle.svg (100%) rename res/img/{feather-icons => feather-customised}/widget/bin.svg (100%) rename res/img/{feather-icons => feather-customised}/widget/camera.svg (100%) rename res/img/{feather-icons => feather-customised}/widget/edit.svg (100%) rename res/img/{feather-icons => feather-customised}/widget/external-link.svg (100%) rename res/img/{feather-icons => feather-customised}/widget/maximise.svg (100%) rename res/img/{feather-icons => feather-customised}/widget/minimise.svg (100%) rename res/img/{feather-icons => feather-customised}/widget/refresh.svg (100%) rename res/img/{feather-icons => feather-customised}/widget/x-circle.svg (100%) diff --git a/res/css/_common.scss b/res/css/_common.scss index 4e327ab28d..9725340978 100644 --- a/res/css/_common.scss +++ b/res/css/_common.scss @@ -70,7 +70,7 @@ input[type=search].mx_textinput_icon { // FIXME THEME - Tint by CSS rather than referencing a duplicate asset input[type=text].mx_textinput_icon.mx_textinput_search, input[type=search].mx_textinput_icon.mx_textinput_search { - background-image: url('$(res)/img/feather-icons/search-input.svg'); + background-image: url('$(res)/img/feather-customised/search-input.svg'); } // dont search UI as not all browsers support it, @@ -309,7 +309,7 @@ textarea { } .mx_Dialog_cancelButton { - mask: url('$(res)/img/feather-icons/cancel.svg'); + mask: url('$(res)/img/feather-customised/cancel.svg'); mask-repeat: no-repeat; mask-position: center; width: 36px; diff --git a/res/css/structures/_RightPanel.scss b/res/css/structures/_RightPanel.scss index 474040a626..c63db5d274 100644 --- a/res/css/structures/_RightPanel.scss +++ b/res/css/structures/_RightPanel.scss @@ -65,15 +65,15 @@ limitations under the License. } .mx_RightPanel_membersButton::before { - mask-image: url('$(res)/img/feather-icons/user.svg'); + mask-image: url('$(res)/img/feather-customised/user.svg'); } .mx_RightPanel_filesButton::before { - mask-image: url('$(res)/img/feather-icons/files.svg'); + mask-image: url('$(res)/img/feather-customised/files.svg'); } .mx_RightPanel_notifsButton::before { - mask-image: url('$(res)/img/feather-icons/notifications.svg'); + mask-image: url('$(res)/img/feather-customised/notifications.svg'); } .mx_RightPanel_groupMembersButton::before { diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss index 235e636c35..2f1484d83f 100644 --- a/res/css/structures/_RoomSubList.scss +++ b/res/css/structures/_RoomSubList.scss @@ -109,7 +109,7 @@ limitations under the License. .mx_RoomSubList_chevron { pointer-events: none; - mask: url('$(res)/img/feather-icons/dropdown-arrow.svg'); + mask: url('$(res)/img/feather-customised/dropdown-arrow.svg'); mask-repeat: no-repeat; transition: transform 0.2s ease-in; width: 10px; diff --git a/res/css/structures/_RoomView.scss b/res/css/structures/_RoomView.scss index 8e3eb75608..f15552e484 100644 --- a/res/css/structures/_RoomView.scss +++ b/res/css/structures/_RoomView.scss @@ -124,7 +124,7 @@ limitations under the License. .mx_RoomView_messagePanelSearchSpinner:before { background-color: $greyed-fg-color; - mask: url('$(res)/img/feather-icons/search-input.svg'); + mask: url('$(res)/img/feather-customised/search-input.svg'); mask-repeat: no-repeat; mask-position: center; mask-size: 50px; diff --git a/res/css/structures/_TagPanelButtons.scss b/res/css/structures/_TagPanelButtons.scss index 323d77a405..b14bb10bf8 100644 --- a/res/css/structures/_TagPanelButtons.scss +++ b/res/css/structures/_TagPanelButtons.scss @@ -24,12 +24,12 @@ limitations under the License. } .mx_TagPanelButtons > .mx_GroupsButton:before { - mask: url('$(res)/img/feather-icons/users.svg'); + mask: url('$(res)/img/feather-customised/users.svg'); mask-position: center 11px; } .mx_TagPanelButtons > .mx_TagPanelButtons_report:before { - mask: url('$(res)/img/feather-icons/life-buoy.svg'); + mask: url('$(res)/img/feather-customised/life-buoy.svg'); mask-position: center 9px; } diff --git a/res/css/structures/_TopLeftMenuButton.scss b/res/css/structures/_TopLeftMenuButton.scss index e72f1f16da..94a391ae70 100644 --- a/res/css/structures/_TopLeftMenuButton.scss +++ b/res/css/structures/_TopLeftMenuButton.scss @@ -41,7 +41,7 @@ limitations under the License. .mx_TopLeftMenuButton_chevron { margin: 0 7px; - mask: url('$(res)/img/feather-icons/dropdown-arrow.svg'); + mask: url('$(res)/img/feather-customised/dropdown-arrow.svg'); mask-repeat: no-repeat; width: 10px; height: 6px; diff --git a/res/css/views/context_menus/_TopLeftMenu.scss b/res/css/views/context_menus/_TopLeftMenu.scss index 272a882051..c15d12eb6a 100644 --- a/res/css/views/context_menus/_TopLeftMenu.scss +++ b/res/css/views/context_menus/_TopLeftMenu.scss @@ -28,19 +28,19 @@ limitations under the License. padding: 0; li.mx_TopLeftMenu_icon_home::after { - mask-image: url('$(res)/img/feather-icons/home.svg'); + mask-image: url('$(res)/img/feather-customised/home.svg'); } li.mx_TopLeftMenu_icon_settings::after { - mask-image: url('$(res)/img/feather-icons/settings.svg'); + mask-image: url('$(res)/img/feather-customised/settings.svg'); } li.mx_TopLeftMenu_icon_signin::after { - mask-image: url('$(res)/img/feather-icons/sign-in.svg'); + mask-image: url('$(res)/img/feather-customised/sign-in.svg'); } li.mx_TopLeftMenu_icon_signout::after { - mask-image: url('$(res)/img/feather-icons/sign-out.svg'); + mask-image: url('$(res)/img/feather-customised/sign-out.svg'); } li::after { diff --git a/res/css/views/dialogs/_RoomSettingsDialog.scss b/res/css/views/dialogs/_RoomSettingsDialog.scss index e2a0238756..60b35528a1 100644 --- a/res/css/views/dialogs/_RoomSettingsDialog.scss +++ b/res/css/views/dialogs/_RoomSettingsDialog.scss @@ -18,19 +18,19 @@ limitations under the License. // ========================================================== .mx_RoomSettingsDialog_settingsIcon:before { - mask-image: url('$(res)/img/feather-icons/settings.svg'); + mask-image: url('$(res)/img/feather-customised/settings.svg'); } .mx_RoomSettingsDialog_securityIcon:before { - mask-image: url('$(res)/img/feather-icons/lock.svg'); + mask-image: url('$(res)/img/feather-customised/lock.svg'); } .mx_RoomSettingsDialog_rolesIcon:before { - mask-image: url('$(res)/img/feather-icons/users-sm.svg'); + mask-image: url('$(res)/img/feather-customised/users-sm.svg'); } .mx_RoomSettingsDialog_warningIcon:before { - mask-image: url('$(res)/img/feather-icons/warning-triangle.svg'); + mask-image: url('$(res)/img/feather-customised/warning-triangle.svg'); } .mx_RoomSettingsDialog .mx_Dialog_title { diff --git a/res/css/views/dialogs/_UserSettingsDialog.scss b/res/css/views/dialogs/_UserSettingsDialog.scss index 814a738b5f..9665ee06b4 100644 --- a/res/css/views/dialogs/_UserSettingsDialog.scss +++ b/res/css/views/dialogs/_UserSettingsDialog.scss @@ -18,33 +18,33 @@ limitations under the License. // ========================================================== .mx_UserSettingsDialog_settingsIcon:before { - mask-image: url('$(res)/img/feather-icons/settings.svg'); + mask-image: url('$(res)/img/feather-customised/settings.svg'); } .mx_UserSettingsDialog_voiceIcon:before { - mask-image: url('$(res)/img/feather-icons/phone.svg'); + mask-image: url('$(res)/img/feather-customised/phone.svg'); } .mx_UserSettingsDialog_bellIcon:before { - mask-image: url('$(res)/img/feather-icons/notifications.svg'); + mask-image: url('$(res)/img/feather-customised/notifications.svg'); } .mx_UserSettingsDialog_preferencesIcon:before { - mask-image: url('$(res)/img/feather-icons/sliders.svg'); + mask-image: url('$(res)/img/feather-customised/sliders.svg'); } .mx_UserSettingsDialog_securityIcon:before { - mask-image: url('$(res)/img/feather-icons/lock.svg'); + mask-image: url('$(res)/img/feather-customised/lock.svg'); } .mx_UserSettingsDialog_helpIcon:before { - mask-image: url('$(res)/img/feather-icons/help-circle.svg'); + mask-image: url('$(res)/img/feather-customised/help-circle.svg'); } .mx_UserSettingsDialog_labsIcon:before { - mask-image: url('$(res)/img/feather-icons/flag.svg'); + mask-image: url('$(res)/img/feather-customised/flag.svg'); } .mx_UserSettingsDialog_flairIcon:before { - mask-image: url('$(res)/img/feather-icons/flair.svg'); + mask-image: url('$(res)/img/feather-customised/flair.svg'); } diff --git a/res/css/views/elements/_Dropdown.scss b/res/css/views/elements/_Dropdown.scss index 27b9975570..ea35605e12 100644 --- a/res/css/views/elements/_Dropdown.scss +++ b/res/css/views/elements/_Dropdown.scss @@ -45,7 +45,7 @@ limitations under the License. width: 10px; height: 6px; padding-right: 9px; - mask: url('$(res)/img/feather-icons/dropdown-arrow.svg'); + mask: url('$(res)/img/feather-customised/dropdown-arrow.svg'); mask-repeat: no-repeat; background: $primary-fg-color; } diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss index 075bd28a11..e13ff3d6cc 100644 --- a/res/css/views/elements/_Field.scss +++ b/res/css/views/elements/_Field.scss @@ -48,7 +48,7 @@ limitations under the License. right: 10px; width: 10px; height: 6px; - mask: url('$(res)/img/feather-icons/dropdown-arrow.svg'); + mask: url('$(res)/img/feather-customised/dropdown-arrow.svg'); mask-repeat: no-repeat; background-color: $primary-fg-color; z-index: 1; diff --git a/res/css/views/rooms/_AppsDrawer.scss b/res/css/views/rooms/_AppsDrawer.scss index f42b5eaa6b..db38eebfca 100644 --- a/res/css/views/rooms/_AppsDrawer.scss +++ b/res/css/views/rooms/_AppsDrawer.scss @@ -144,39 +144,39 @@ $AppsDrawerBodyHeight: 273px; } .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_minimise { - mask-image: url('$(res)/img/feather-icons/widget/minimise.svg'); + mask-image: url('$(res)/img/feather-customised/widget/minimise.svg'); background-color: $accent-color; } .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_maximise { - mask-image: url('$(res)/img/feather-icons/widget/maximise.svg'); + mask-image: url('$(res)/img/feather-customised/widget/maximise.svg'); background-color: $accent-color; } .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_reload { - mask-image: url('$(res)/img/feather-icons/widget/refresh.svg'); + mask-image: url('$(res)/img/feather-customised/widget/refresh.svg'); mask-size: 100%; } .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_popout { - mask-image: url('$(res)/img/feather-icons/widget/external-link.svg'); + mask-image: url('$(res)/img/feather-customised/widget/external-link.svg'); } .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_snapshot { - mask-image: url('$(res)/img/feather-icons/widget/camera.svg'); + mask-image: url('$(res)/img/feather-customised/widget/camera.svg'); } .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_edit { - mask-image: url('$(res)/img/feather-icons/widget/edit.svg'); + mask-image: url('$(res)/img/feather-customised/widget/edit.svg'); } .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_delete { - mask-image: url('$(res)/img/feather-icons/widget/bin.svg'); + mask-image: url('$(res)/img/feather-customised/widget/bin.svg'); background-color: $warning-color; } .mx_AppTileMenuBar_iconButton.mx_AppTileMenuBar_iconButton_cancel { - mask-image: url('$(res)/img/feather-icons/widget/x-circle.svg'); + mask-image: url('$(res)/img/feather-customised/widget/x-circle.svg'); } /* delete ? */ diff --git a/res/css/views/rooms/_MemberList.scss b/res/css/views/rooms/_MemberList.scss index bbcc774665..9f2b5da930 100644 --- a/res/css/views/rooms/_MemberList.scss +++ b/res/css/views/rooms/_MemberList.scss @@ -83,7 +83,7 @@ limitations under the License. } .mx_MemberList_invite span { - background-image: url('$(res)/img/feather-icons/user-add.svg'); + background-image: url('$(res)/img/feather-customised/user-add.svg'); background-repeat: no-repeat; background-position: center left; padding-left: 25px; diff --git a/res/css/views/rooms/_MessageComposer.scss b/res/css/views/rooms/_MessageComposer.scss index 89115669d3..708c29bb3e 100644 --- a/res/css/views/rooms/_MessageComposer.scss +++ b/res/css/views/rooms/_MessageComposer.scss @@ -193,7 +193,7 @@ limitations under the License. } .mx_MessageComposer_upload { - mask-image: url('$(res)/img/feather-icons/paperclip.svg'); + mask-image: url('$(res)/img/feather-customised/paperclip.svg'); } .mx_MessageComposer_hangup { @@ -201,15 +201,15 @@ limitations under the License. } .mx_MessageComposer_voicecall { - mask-image: url('$(res)/img/feather-icons/phone.svg'); + mask-image: url('$(res)/img/feather-customised/phone.svg'); } .mx_MessageComposer_videocall { - mask-image: url('$(res)/img/feather-icons/video.svg'); + mask-image: url('$(res)/img/feather-customised/video.svg'); } .mx_MessageComposer_stickers { - mask-image: url('$(res)/img/feather-icons/face.svg'); + mask-image: url('$(res)/img/feather-customised/face.svg'); } .mx_MessageComposer_formatting { diff --git a/res/css/views/rooms/_RoomHeader.scss b/res/css/views/rooms/_RoomHeader.scss index 93f984e65b..e7589f0e90 100644 --- a/res/css/views/rooms/_RoomHeader.scss +++ b/res/css/views/rooms/_RoomHeader.scss @@ -203,7 +203,7 @@ limitations under the License. } .mx_RoomHeader_settingsButton { - mask-image: url('$(res)/img/feather-icons/settings.svg'); + mask-image: url('$(res)/img/feather-customised/settings.svg'); } .mx_RoomHeader_forgetButton { @@ -212,15 +212,15 @@ limitations under the License. } .mx_RoomHeader_searchButton { - mask-image: url('$(res)/img/feather-icons/search.svg'); + mask-image: url('$(res)/img/feather-customised/search.svg'); } .mx_RoomHeader_shareButton { - mask-image: url('$(res)/img/feather-icons/share.svg'); + mask-image: url('$(res)/img/feather-customised/share.svg'); } .mx_RoomHeader_manageIntegsButton { - mask-image: url('$(res)/img/feather-icons/grid.svg'); + mask-image: url('$(res)/img/feather-customised/grid.svg'); } .mx_RoomHeader_showPanel { diff --git a/res/css/views/rooms/_SearchBar.scss b/res/css/views/rooms/_SearchBar.scss index b89cb0ce13..894473a5fe 100644 --- a/res/css/views/rooms/_SearchBar.scss +++ b/res/css/views/rooms/_SearchBar.scss @@ -32,7 +32,7 @@ limitations under the License. width: 37px; height: 37px; background-color: $accent-color; - mask: url('$(res)/img/feather-icons/search-input.svg'); + mask: url('$(res)/img/feather-customised/search-input.svg'); mask-repeat: no-repeat; mask-position: center; } diff --git a/res/css/views/settings/_ProfileSettings.scss b/res/css/views/settings/_ProfileSettings.scss index 27dfae61a1..5d85f80bfe 100644 --- a/res/css/views/settings/_ProfileSettings.scss +++ b/res/css/views/settings/_ProfileSettings.scss @@ -104,7 +104,7 @@ limitations under the License. .mx_ProfileSettings_avatarOverlayImg:before { background-color: $settings-profile-overlay-placeholder-fg-color; - mask: url("$(res)/img/feather-icons/upload.svg"); + mask: url("$(res)/img/feather-customised/upload.svg"); mask-repeat: no-repeat; mask-size: 14px; mask-position: center; diff --git a/res/img/feather-icons/cancel.svg b/res/img/feather-customised/cancel.svg similarity index 100% rename from res/img/feather-icons/cancel.svg rename to res/img/feather-customised/cancel.svg diff --git a/res/img/feather-icons/dropdown-arrow.svg b/res/img/feather-customised/dropdown-arrow.svg similarity index 100% rename from res/img/feather-icons/dropdown-arrow.svg rename to res/img/feather-customised/dropdown-arrow.svg diff --git a/res/img/feather-icons/face.svg b/res/img/feather-customised/face.svg similarity index 100% rename from res/img/feather-icons/face.svg rename to res/img/feather-customised/face.svg diff --git a/res/img/feather-icons/files.svg b/res/img/feather-customised/files.svg similarity index 100% rename from res/img/feather-icons/files.svg rename to res/img/feather-customised/files.svg diff --git a/res/img/feather-icons/flag.svg b/res/img/feather-customised/flag.svg similarity index 100% rename from res/img/feather-icons/flag.svg rename to res/img/feather-customised/flag.svg diff --git a/res/img/feather-icons/flair.svg b/res/img/feather-customised/flair.svg similarity index 100% rename from res/img/feather-icons/flair.svg rename to res/img/feather-customised/flair.svg diff --git a/res/img/feather-icons/globe.svg b/res/img/feather-customised/globe.svg similarity index 100% rename from res/img/feather-icons/globe.svg rename to res/img/feather-customised/globe.svg diff --git a/res/img/feather-icons/grid.svg b/res/img/feather-customised/grid.svg similarity index 100% rename from res/img/feather-icons/grid.svg rename to res/img/feather-customised/grid.svg diff --git a/res/img/feather-icons/help-circle.svg b/res/img/feather-customised/help-circle.svg similarity index 100% rename from res/img/feather-icons/help-circle.svg rename to res/img/feather-customised/help-circle.svg diff --git a/res/img/feather-icons/home.svg b/res/img/feather-customised/home.svg similarity index 100% rename from res/img/feather-icons/home.svg rename to res/img/feather-customised/home.svg diff --git a/res/img/feather-icons/life-buoy.svg b/res/img/feather-customised/life-buoy.svg similarity index 100% rename from res/img/feather-icons/life-buoy.svg rename to res/img/feather-customised/life-buoy.svg diff --git a/res/img/feather-icons/lock.svg b/res/img/feather-customised/lock.svg similarity index 100% rename from res/img/feather-icons/lock.svg rename to res/img/feather-customised/lock.svg diff --git a/res/img/feather-icons/notifications.svg b/res/img/feather-customised/notifications.svg similarity index 100% rename from res/img/feather-icons/notifications.svg rename to res/img/feather-customised/notifications.svg diff --git a/res/img/feather-icons/paperclip.svg b/res/img/feather-customised/paperclip.svg similarity index 100% rename from res/img/feather-icons/paperclip.svg rename to res/img/feather-customised/paperclip.svg diff --git a/res/img/feather-icons/phone.svg b/res/img/feather-customised/phone.svg similarity index 100% rename from res/img/feather-icons/phone.svg rename to res/img/feather-customised/phone.svg diff --git a/res/img/feather-icons/search-input.svg b/res/img/feather-customised/search-input.svg similarity index 100% rename from res/img/feather-icons/search-input.svg rename to res/img/feather-customised/search-input.svg diff --git a/res/img/feather-icons/search.svg b/res/img/feather-customised/search.svg similarity index 100% rename from res/img/feather-icons/search.svg rename to res/img/feather-customised/search.svg diff --git a/res/img/feather-icons/settings.svg b/res/img/feather-customised/settings.svg similarity index 100% rename from res/img/feather-icons/settings.svg rename to res/img/feather-customised/settings.svg diff --git a/res/img/feather-icons/share.svg b/res/img/feather-customised/share.svg similarity index 100% rename from res/img/feather-icons/share.svg rename to res/img/feather-customised/share.svg diff --git a/res/img/feather-icons/sign-in.svg b/res/img/feather-customised/sign-in.svg similarity index 100% rename from res/img/feather-icons/sign-in.svg rename to res/img/feather-customised/sign-in.svg diff --git a/res/img/feather-icons/sign-out.svg b/res/img/feather-customised/sign-out.svg similarity index 100% rename from res/img/feather-icons/sign-out.svg rename to res/img/feather-customised/sign-out.svg diff --git a/res/img/feather-icons/sliders.svg b/res/img/feather-customised/sliders.svg similarity index 100% rename from res/img/feather-icons/sliders.svg rename to res/img/feather-customised/sliders.svg diff --git a/res/img/feather-icons/upload.svg b/res/img/feather-customised/upload.svg similarity index 100% rename from res/img/feather-icons/upload.svg rename to res/img/feather-customised/upload.svg diff --git a/res/img/feather-icons/user-add.svg b/res/img/feather-customised/user-add.svg similarity index 100% rename from res/img/feather-icons/user-add.svg rename to res/img/feather-customised/user-add.svg diff --git a/res/img/feather-icons/user.svg b/res/img/feather-customised/user.svg similarity index 100% rename from res/img/feather-icons/user.svg rename to res/img/feather-customised/user.svg diff --git a/res/img/feather-icons/users-sm.svg b/res/img/feather-customised/users-sm.svg similarity index 100% rename from res/img/feather-icons/users-sm.svg rename to res/img/feather-customised/users-sm.svg diff --git a/res/img/feather-icons/users.svg b/res/img/feather-customised/users.svg similarity index 100% rename from res/img/feather-icons/users.svg rename to res/img/feather-customised/users.svg diff --git a/res/img/feather-icons/video.svg b/res/img/feather-customised/video.svg similarity index 100% rename from res/img/feather-icons/video.svg rename to res/img/feather-customised/video.svg diff --git a/res/img/feather-icons/warning-triangle.svg b/res/img/feather-customised/warning-triangle.svg similarity index 100% rename from res/img/feather-icons/warning-triangle.svg rename to res/img/feather-customised/warning-triangle.svg diff --git a/res/img/feather-icons/widget/bin.svg b/res/img/feather-customised/widget/bin.svg similarity index 100% rename from res/img/feather-icons/widget/bin.svg rename to res/img/feather-customised/widget/bin.svg diff --git a/res/img/feather-icons/widget/camera.svg b/res/img/feather-customised/widget/camera.svg similarity index 100% rename from res/img/feather-icons/widget/camera.svg rename to res/img/feather-customised/widget/camera.svg diff --git a/res/img/feather-icons/widget/edit.svg b/res/img/feather-customised/widget/edit.svg similarity index 100% rename from res/img/feather-icons/widget/edit.svg rename to res/img/feather-customised/widget/edit.svg diff --git a/res/img/feather-icons/widget/external-link.svg b/res/img/feather-customised/widget/external-link.svg similarity index 100% rename from res/img/feather-icons/widget/external-link.svg rename to res/img/feather-customised/widget/external-link.svg diff --git a/res/img/feather-icons/widget/maximise.svg b/res/img/feather-customised/widget/maximise.svg similarity index 100% rename from res/img/feather-icons/widget/maximise.svg rename to res/img/feather-customised/widget/maximise.svg diff --git a/res/img/feather-icons/widget/minimise.svg b/res/img/feather-customised/widget/minimise.svg similarity index 100% rename from res/img/feather-icons/widget/minimise.svg rename to res/img/feather-customised/widget/minimise.svg diff --git a/res/img/feather-icons/widget/refresh.svg b/res/img/feather-customised/widget/refresh.svg similarity index 100% rename from res/img/feather-icons/widget/refresh.svg rename to res/img/feather-customised/widget/refresh.svg diff --git a/res/img/feather-icons/widget/x-circle.svg b/res/img/feather-customised/widget/x-circle.svg similarity index 100% rename from res/img/feather-icons/widget/x-circle.svg rename to res/img/feather-customised/widget/x-circle.svg diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js index 8b5f83a4ff..71d13da421 100644 --- a/src/components/views/auth/ServerTypeSelector.js +++ b/src/components/views/auth/ServerTypeSelector.js @@ -49,7 +49,7 @@ export const TYPES = { id: ADVANCED, label: () => _t('Advanced'), logo: () =>
- + {_t('Other')}
, description: () => _t('Find other public servers or use a custom server'), diff --git a/src/components/views/elements/AppPermission.js b/src/components/views/elements/AppPermission.js index f31b02dd14..7079e0a68c 100644 --- a/src/components/views/elements/AppPermission.js +++ b/src/components/views/elements/AppPermission.js @@ -47,7 +47,7 @@ export default class AppPermission extends React.Component { return (
- {_t('Warning!')} + {_t('Warning!')}
{ _t('Do you want to load widget from URL:') } { this.state.curlBase } diff --git a/src/components/views/elements/EditableItemList.js b/src/components/views/elements/EditableItemList.js index 28c6e10612..c6eeb1b93c 100644 --- a/src/components/views/elements/EditableItemList.js +++ b/src/components/views/elements/EditableItemList.js @@ -78,7 +78,7 @@ export class EditableItem extends React.Component { return (
- {_t("Remove")} {this.props.value}
diff --git a/src/components/views/settings/EmailAddresses.js b/src/components/views/settings/EmailAddresses.js index d8577f6a99..1ded71a5c7 100644 --- a/src/components/views/settings/EmailAddresses.js +++ b/src/components/views/settings/EmailAddresses.js @@ -102,7 +102,7 @@ export class ExistingEmailAddress extends React.Component { return (
- {_t("Remove")} {this.props.email.address}
diff --git a/src/components/views/settings/PhoneNumbers.js b/src/components/views/settings/PhoneNumbers.js index 18abb621e7..1b557573ea 100644 --- a/src/components/views/settings/PhoneNumbers.js +++ b/src/components/views/settings/PhoneNumbers.js @@ -97,7 +97,7 @@ export class ExistingPhoneNumber extends React.Component { return (
- {_t("Remove")} +{this.props.msisdn.address}