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

namespace CSS better and fix bug

Browse source
This commit is contained in:
Eric Newport 2018-04-30 12:22:16 -04:00
parent 55566b35a2
commit e037cf0063
2 changed files with 5 additions and 4 deletions
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; cursor: pointer;
} }
.mx_EventTile_e2eIcon.hidden { .mx_EventTile_e2eIcon_hidden {
display: none; display: none;
} }
/* always override hidden attribute for blocked and warning */ /* always override hidden attribute for blocked and warning */
.mx_EventTile_e2eIcon.hidden[src="img/e2e-blocked.svg"], .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-warning.svg"] {
display: block; 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'); const ContextualMenu = require('../../structures/ContextualMenu');
import dis from '../../../dispatcher'; import dis from '../../../dispatcher';
import {makeEventPermalink} from "../../../matrix-to"; import {makeEventPermalink} from "../../../matrix-to";
import SettingsStore from "../../../settings/SettingsStore";
const ObjectUtils = require('../../../ObjectUtils'); const ObjectUtils = require('../../../ObjectUtils');
@ -745,7 +746,7 @@ function E2ePadlock(props) {
if (SettingsStore.getValue("alwaysShowEncryptionIcons")) { if (SettingsStore.getValue("alwaysShowEncryptionIcons")) {
return <img className="mx_EventTile_e2eIcon" {...props} />; return <img className="mx_EventTile_e2eIcon" {...props} />;
} else { } else {
return <img className="mx_EventTile_e2eIcon hidden" {...props} />; return <img className="mx_EventTile_e2eIcon mx_EventTile_e2eIcon_hidden" {...props} />;
} }
} }