Merge branch 'develop' into matthew/preview_urls

2016-04-03 02:07:03 +01:00 · 2016-04-03 02:07:03 +01:00 · a5258978d6
commit a5258978d6
parent 8c0a23dd8b d434ea55a8
4 changed files with 53 additions and 11 deletions
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
@ -32,6 +32,14 @@ limitations under the License.
    clear: both;
 }

+.mx_MemberInfo_avatar .mx_BaseAvatar {
+    cursor: not-allowed;
+}
+
+.mx_MemberInfo_avatar .mx_BaseAvatar.mx_BaseAvatar_image {
+    cursor: pointer;
+}
+
 .mx_MemberInfo_profile {
    margin-bottom: 16px;
 }