mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-29 04:48:50 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2737 from matrix-org/travis/continuation-icon

Browse source 
Use a mask for the continuation icon
This commit is contained in:
Travis Ralston 2019-03-01 18:40:50 -07:00 committed by GitHub
commit ead73ee7b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
res/css/views/messages/_CreateEvent.scss
View file

@ -24,9 +24,14 @@ limitations under the License.
.mx_CreateEvent_image { .mx_CreateEvent_image {
float: left; float: left;
padding-right: 20px; margin-right: 20px;
width: 72px; width: 72px;
height: 34px; height: 34px;
background-color: $primary-fg-color;
mask: url('$(res)/img/room-continuation.svg');
mask-repeat: no-repeat;
mask-position: center;
} }
.mx_CreateEvent_header { .mx_CreateEvent_header {

2
src/components/views/messages/RoomCreate.js
View file

@ -53,7 +53,7 @@ module.exports = React.createClass({
permalinkCreator.load(); permalinkCreator.load();
const predecessorPermalink = permalinkCreator.forEvent(predecessor['event_id']); const predecessorPermalink = permalinkCreator.forEvent(predecessor['event_id']);
return <div className="mx_CreateEvent"> return <div className="mx_CreateEvent">
<img className="mx_CreateEvent_image" src={require("../../../../res/img/room-continuation.svg")} /> <div className="mx_CreateEvent_image" />
<div className="mx_CreateEvent_header"> <div className="mx_CreateEvent_header">
{_t("This room is a continuation of another conversation.")} {_t("This room is a continuation of another conversation.")}
</div> </div>