Merge pull request #2706 from jryans/move-non-feather-icons

Move non-feather icons out of feather dir

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;

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 {

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;

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;

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;
 }
 

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;

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 {

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 {

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');
 }

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: "";

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;
 }

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;

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 ? */

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;
 }

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;
 }
 

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;
 }
 

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;

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 {

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 {

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;
     }

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;

res/img/e2e/lock-warning-filled.svg

@@ -0,0 +1 @@
+<svg height="42" width="37" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><mask id="a" fill="#fff"><path d="m23.521 14.596h-1.777a.454.454 0 0 1 -.456-.45v-4.14a8.974 8.974 0 0 0 -8.57-9 8.884 8.884 0 0 0 -9.253 8.82v4.365a.454.454 0 0 1 -.456.45h-1.78a1.218 1.218 0 0 0 -1.229 1.215v15.93a1.218 1.218 0 0 0 1.229 1.214h22.247a1.218 1.218 0 0 0 1.231-1.215v-15.974a1.153 1.153 0 0 0 -1.186-1.215zm-17.276-4.77a6.114 6.114 0 0 1 6.473-6.075 6.251 6.251 0 0 1 5.88 6.255v4.185a.454.454 0 0 1 -.456.45h-11.486a.454.454 0 0 1 -.456-.45v-4.365zm20.255 11.174c6.344.019 11.481 5.156 11.5 11.5 0 6.351-5.149 11.5-11.5 11.5s-11.5-5.149-11.5-11.5 5.149-11.5 11.5-11.5z" fill="#fff" fill-rule="evenodd"/></mask><g fill="#000" fill-rule="evenodd"><path d="m-.909 32.909h19.773c2.392-6.604 4.34-10.526 5.844-11.766s1.808-8.258.912-21.052h-26.529z" mask="url(#a)" transform="translate(0 -1)"/><path d="m26.5 21c-5.799 0-10.5 4.701-10.5 10.5s4.701 10.5 10.5 10.5 10.5-4.701 10.5-10.5c-.017-5.792-4.708-10.483-10.5-10.5zm1.444 16.012h-2.888v-2.493h3.019v2.494zm.131-9.712-.787 5.775h-1.575l-.788-5.775v-1.312h3.15z" fill-rule="nonzero"/></g></svg>

res/img/e2e/lock-warning.svg

@@ -1 +1,9 @@
-<svg height="42" width="37" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><mask id="a" fill="#fff"><path d="m23.521 14.596h-1.777a.454.454 0 0 1 -.456-.45v-4.14a8.974 8.974 0 0 0 -8.57-9 8.884 8.884 0 0 0 -9.253 8.82v4.365a.454.454 0 0 1 -.456.45h-1.78a1.218 1.218 0 0 0 -1.229 1.215v15.93a1.218 1.218 0 0 0 1.229 1.214h22.247a1.218 1.218 0 0 0 1.231-1.215v-15.974a1.153 1.153 0 0 0 -1.186-1.215zm-17.276-4.77a6.114 6.114 0 0 1 6.473-6.075 6.251 6.251 0 0 1 5.88 6.255v4.185a.454.454 0 0 1 -.456.45h-11.486a.454.454 0 0 1 -.456-.45v-4.365zm20.255 11.174c6.344.019 11.481 5.156 11.5 11.5 0 6.351-5.149 11.5-11.5 11.5s-11.5-5.149-11.5-11.5 5.149-11.5 11.5-11.5z" fill="#fff" fill-rule="evenodd"/></mask><g fill="#000" fill-rule="evenodd"><path d="m-.909 32.909h19.773c2.392-6.604 4.34-10.526 5.844-11.766s1.808-8.258.912-21.052h-26.529z" mask="url(#a)" transform="translate(0 -1)"/><path d="m26.5 21c-5.799 0-10.5 4.701-10.5 10.5s4.701 10.5 10.5 10.5 10.5-4.701 10.5-10.5c-.017-5.792-4.708-10.483-10.5-10.5zm1.444 16.012h-2.888v-2.493h3.019v2.494zm.131-9.712-.787 5.775h-1.575l-.788-5.775v-1.312h3.15z" fill-rule="nonzero"/></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="23" height="25" viewBox="0 0 23 25">
+    <defs>
+        <path id="a" d="M15 23a6 6 0 1 0 0-12 6 6 0 0 0 0 12zm0-10.5a1.5 1.5 0 0 1 1.5 1.5v3a1.5 1.5 0 0 1-3 0v-3a1.5 1.5 0 0 1 1.5-1.5zm0 9a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
+    </defs>
+    <g fill="none" fill-rule="evenodd" stroke="#F56679" stroke-linecap="round" stroke-linejoin="round" transform="translate(1 1)">
+        <path stroke-width="1" d="M7.23 20.01l-5.233-.007a2 2 0 0 1-1.997-2V10a2 2 0 0 1 2-2h14c1.259 0 2 .939 2 1M4 8V5a5 5 0 1 1 10 0v3"/>
+        <use fill="#F56679" xlink:href="#a"/>
+    </g>
+</svg>

res/img/feather-icons/e2e/lock-warning.svg

@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="23" height="25" viewBox="0 0 23 25">
-    <defs>
-        <path id="a" d="M15 23a6 6 0 1 0 0-12 6 6 0 0 0 0 12zm0-10.5a1.5 1.5 0 0 1 1.5 1.5v3a1.5 1.5 0 0 1-3 0v-3a1.5 1.5 0 0 1 1.5-1.5zm0 9a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd" stroke="#F56679" stroke-linecap="round" stroke-linejoin="round" transform="translate(1 1)">
-        <path stroke-width="1" d="M7.23 20.01l-5.233-.007a2 2 0 0 1-1.997-2V10a2 2 0 0 1 2-2h14c1.259 0 2 .939 2 1M4 8V5a5 5 0 1 1 10 0v3"/>
-        <use fill="#F56679" xlink:href="#a"/>
-    </g>
-</svg>