switch SVGs from imgs to objects, fixing CSS to make onClicks work

This commit is contained in:
Matthew Hodgson 2016-01-03 22:30:14 +00:00
parent a78a693903
commit 3abdcbf806
5 changed files with 25 additions and 5 deletions

View file

@ -127,12 +127,12 @@ module.exports = React.createClass({
buttonGroup = buttonGroup =
<div className="mx_RightPanel_headerButtonGroup"> <div className="mx_RightPanel_headerButtonGroup">
<div className="mx_RightPanel_headerButton" onClick={ this.onMemberListButtonClick }> <div className="mx_RightPanel_headerButton" onClick={ this.onMemberListButtonClick }>
<img src="img/members.svg" width="17" height="22" title="Members" alt="Members"/> <object type="image/svg+xml" data="img/members.svg" width="17" height="22" title="Members"/>
{ membersBadge } { membersBadge }
{ membersHighlight } { membersHighlight }
</div> </div>
<div className="mx_RightPanel_headerButton mx_RightPanel_filebutton"> <div className="mx_RightPanel_headerButton mx_RightPanel_filebutton">
<img src="img/files.svg" width="17" height="22" title="Files" alt="Files"/> <object type="image/svg+xml" data="img/files.svg" width="17" height="22" title="Files"/>
{ filesHighlight } { filesHighlight }
</div> </div>
</div>; </div>;

View file

@ -199,6 +199,10 @@ limitations under the License.
cursor: pointer; cursor: pointer;
} }
.mx_RoomView_voipButton object {
pointer-events: none;
}
.mx_RoomView_unreadMessagesBar { .mx_RoomView_unreadMessagesBar {
color: #ff0064; color: #ff0064;
cursor: pointer; cursor: pointer;

View file

@ -82,6 +82,13 @@ limitations under the License.
cursor: pointer; cursor: pointer;
} }
.mx_MessageComposer_upload object,
.mx_MessageComposer_hangup object,
.mx_MessageComposer_voicecall object,
.mx_MessageComposer_videocall object {
pointer-events: none;
}
.mx_MessageComposer_videocall { .mx_MessageComposer_videocall {
padding-right: 10px; padding-right: 10px;
padding-top: 4px; padding-top: 4px;
@ -92,6 +99,6 @@ limitations under the License.
padding-top: 4px; padding-top: 4px;
} }
.mx_MessageComposer_upload img { .mx_MessageComposer_upload object {
margin-top: 5px; margin-top: 5px;
} }

View file

@ -138,6 +138,10 @@ limitations under the License.
left: 4px; left: 4px;
} }
.mx_RoomHeader_settingsButton object {
pointer-events: none;
}
.mx_RoomHeader_leftRow:hover .mx_RoomHeader_name { .mx_RoomHeader_leftRow:hover .mx_RoomHeader_name {
color: #76cfa6; color: #76cfa6;
} }
@ -203,10 +207,11 @@ limitations under the License.
vertical-align: top; vertical-align: top;
padding-left: 8px; padding-left: 8px;
padding-right: 8px; padding-right: 8px;
cursor: pointer;
} }
.mx_RoomHeader_button img { .mx_RoomHeader_button object {
cursor: pointer; pointer-events: none;
} }
.mx_RoomHeader_voipButton { .mx_RoomHeader_voipButton {

View file

@ -55,6 +55,10 @@ limitations under the License.
position: relative; position: relative;
} }
.mx_RightPanel_headerButton object {
pointer-events: none;
}
.mx_RightPanel_headerButton_highlight { .mx_RightPanel_headerButton_highlight {
position: absolute; position: absolute;
bottom: -2px; bottom: -2px;