imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Move non-feather icons out of feather dir
This commit is contained in:
J. Ryan Stinnett 2019-02-27 13:08:23 +00:00 • committed by GitHub
commit 209ac2c587
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
73 changed files with 74 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
res/css/_common.scss
View file

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

6
res/css/structures/_RightPanel.scss
View file

@ -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 {

2
res/css/structures/_RoomSubList.scss
View file

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

2
res/css/structures/_RoomView.scss
View file

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

4
res/css/structures/_TagPanelButtons.scss
View file

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

2
res/css/structures/_TopLeftMenuButton.scss
View file

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

8
res/css/views/context_menus/_TopLeftMenu.scss
View file

@ -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 {

8
res/css/views/dialogs/_RoomSettingsDialog.scss
View file

@ -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 {

16
res/css/views/dialogs/_UserSettingsDialog.scss
View file

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

2
res/css/views/dialogs/keybackup/_KeyBackupFailedDialog.scss
View file

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

2
res/css/views/elements/_Dropdown.scss
View file

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

2
res/css/views/elements/_Field.scss
View file

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

16
res/css/views/rooms/_AppsDrawer.scss
View file

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

4
res/css/views/rooms/_E2EIcon.scss
View file

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

4
res/css/views/rooms/_EventTile.scss
View file

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

6
res/css/views/rooms/_MemberDeviceInfo.scss
View file

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

2
res/css/views/rooms/_MemberList.scss
View file

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

8
res/css/views/rooms/_MessageComposer.scss
View file

@ -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 {

8
res/css/views/rooms/_RoomHeader.scss
View file

@ -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 {

2
res/css/views/rooms/_SearchBar.scss
View file

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

2
res/css/views/settings/_ProfileSettings.scss
View file

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