OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1070 from matrix-org/t3chguy/dark_theme/e2e_icons 

adds mx_filterFlipColor so that the dark theme will invert this image
pull/21833/head
Matthew Hodgson 2017-06-10 01:06:31 +01:00 committed by GitHub
parent 7de60892cb 34caf5586f
commit 3b7ce49eab
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/views/rooms/RoomSettings.js
View File

@ -576,26 +576,24 @@ module.exports = React.createClass({
{ _t('Never send encrypted messages to unverified devices in this room from this device') }. { _t('Never send encrypted messages to unverified devices in this room from this device') }.
</label>; </label>;
if (!isEncrypted && if (!isEncrypted && roomState.mayClientSendStateEvent("m.room.encryption", cli)) {
roomState.mayClientSendStateEvent("m.room.encryption", cli)) {
return ( return (
<div> <div>
<label> <label>
<input type="checkbox" ref="encrypt" onClick={ this.onEnableEncryptionClick }/> <input type="checkbox" ref="encrypt" onClick={ this.onEnableEncryptionClick }/>
<img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" /> <img className="mx_RoomSettings_e2eIcon mx_filterFlipColor" src="img/e2e-unencrypted.svg" width="12" height="12" />
{ _t('Enable encryption') } { _t('(warning: cannot be disabled again!)') } { _t('Enable encryption') } { _t('(warning: cannot be disabled again!)') }
</label> </label>
{ settings } { settings }
</div> </div>
); );
} } else {
else {
return ( return (
<div> <div>
<label> <label>
{ isEncrypted { isEncrypted
? <img className="mx_RoomSettings_e2eIcon" src="img/e2e-verified.svg" width="10" height="12" /> ? <img className="mx_RoomSettings_e2eIcon mx_filterFlipColor" src="img/e2e-verified.svg" width="10" height="12" />
: <img className="mx_RoomSettings_e2eIcon" src="img/e2e-unencrypted.svg" width="12" height="12" /> : <img className="mx_RoomSettings_e2eIcon mx_filterFlipColor" src="img/e2e-unencrypted.svg" width="12" height="12" />
} }
{ isEncrypted ? _t("Encryption is enabled in this room") : _t("Encryption is not enabled in this room") }. { isEncrypted ? _t("Encryption is enabled in this room") : _t("Encryption is not enabled in this room") }.
</label> </label>