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

namespace CSS better and fix bug

pull/21833/head
Eric Newport 2018-04-30 12:22:16 -04:00
parent 55566b35a2
commit e037cf0063
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/css/views/rooms/_EventTile.scss
View File

@ -298,13 +298,13 @@ limitations under the License.
cursor: pointer;
}
.mx_EventTile_e2eIcon.hidden {
.mx_EventTile_e2eIcon_hidden {
display: none;
}
/* always override hidden attribute for blocked and warning */
.mx_EventTile_e2eIcon.hidden[src="img/e2e-blocked.svg"],
.mx_EventTile_e2eIcon.hidden[src="img/e2e-warning.svg"] {
.mx_EventTile_e2eIcon_hidden[src="img/e2e-blocked.svg"],
.mx_EventTile_e2eIcon_hidden[src="img/e2e-warning.svg"] {
display: block;
}

3
src/components/views/rooms/EventTile.js
View File

@ -31,6 +31,7 @@ import withMatrixClient from '../../../wrappers/withMatrixClient';
const ContextualMenu = require('../../structures/ContextualMenu');
import dis from '../../../dispatcher';
import {makeEventPermalink} from "../../../matrix-to";
import SettingsStore from "../../../settings/SettingsStore";
const ObjectUtils = require('../../../ObjectUtils');
@ -745,7 +746,7 @@ function E2ePadlock(props) {
if (SettingsStore.getValue("alwaysShowEncryptionIcons")) {
return <img className="mx_EventTile_e2eIcon" {...props} />;
} else {
return <img className="mx_EventTile_e2eIcon hidden" {...props} />;
return <img className="mx_EventTile_e2eIcon mx_EventTile_e2eIcon_hidden" {...props} />;
}
}