From b3459be7077204c31dc910c4d5817a4a72cd95e0 Mon Sep 17 00:00:00 2001 From: wmwragg Date: Fri, 5 Aug 2016 15:49:03 +0100 Subject: [PATCH] Initial RoomTagContextMenu wired in --- src/components/views/context_menus/RoomTagContextMenu.js | 3 ++- .../vector/css/matrix-react-sdk/views/rooms/RoomTile.css | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/views/context_menus/RoomTagContextMenu.js b/src/components/views/context_menus/RoomTagContextMenu.js index 5405f92a35..1d5bd55479 100644 --- a/src/components/views/context_menus/RoomTagContextMenu.js +++ b/src/components/views/context_menus/RoomTagContextMenu.js @@ -46,6 +46,7 @@ module.exports = React.createClass({ // return { // areNotifsMuted: areNotifsMuted, // }; + return null; }, // _save: function( isMuted ) { @@ -104,7 +105,7 @@ module.exports = React.createClass({ var lowPriorityClasses = classNames({ 'mx_RoomTagContextMenu_field': true, - 'mx_RoomTagContextMenu_fieldSet': !this.state.areNotifsMuted, + 'mx_RoomTagContextMenu_fieldSet': true, }); var leaveClasses = classNames({ diff --git a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css index eca63c782b..b86f39a2de 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css +++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/RoomTile.css @@ -116,13 +116,13 @@ limitations under the License. } .mx_RoomTile .mx_RoomTile_badge.mx_RoomTile_badgeButton, -.mx_RoomTile.mx_RoomTile_menu .mx_RoomTile_badge { +.mx_RoomTile.mx_RoomTile_notificationStateMenu .mx_RoomTile_badge { letter-spacing: 0.1em; opacity: 1; } .mx_RoomTile.mx_RoomTile_noBadges .mx_RoomTile_badge.mx_RoomTile_badgeButton, -.mx_RoomTile.mx_RoomTile_menu.mx_RoomTile_noBadges .mx_RoomTile_badge { +.mx_RoomTile.mx_RoomTile_notificationStateMenu.mx_RoomTile_noBadges .mx_RoomTile_badge { background-color: rgb(214, 214, 214); }