mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Merge branch 'develop' into matthew/preview_urls

Browse source
This commit is contained in:
Matthew Hodgson 2016-04-03 02:07:03 +01:00
commit a5258978d6
4 changed files with 53 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/skins/vector/css/common.css
View file

@ -214,3 +214,8 @@ input[type=text]:focus, textarea:focus {
color: #454545;
background-color: #fff;
}
.emojione {
height: 1em;
vertical-align: middle;
}

8
src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
View file

@ -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;
}