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

Merge pull request #2085 from vector-im/rav/e2e_devices 

e2e device CSS
pull/2092/head
Richard van der Hoff 2016-09-05 00:43:52 +01:00 committed by GitHub
parent 0494dff545 ee3fdbee5b
commit 5e9a95fdfe
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/skins/vector/css/matrix-react-sdk/views/rooms/MemberDeviceInfo.css
View File

@ -15,14 +15,9 @@ limitations under the License.
*/ */
.mx_MemberDeviceInfo { .mx_MemberDeviceInfo {
font-size: 12px; padding: 10px 0px;
display: table-row;
height: 17px;
} }
.mx_MemberDeviceInfo div {
display: table-cell;
}
.mx_MemberDeviceInfo_textButton { .mx_MemberDeviceInfo_textButton {
color: #fff; color: #fff;
@ -33,25 +28,25 @@ limitations under the License.
padding-right: 1em; padding-right: 1em;
cursor: pointer; cursor: pointer;
display: inline;
} }
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified, .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified,
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified, .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified,
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked { .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked {
color: #fff;
width: 17px; width: 17px;
border-radius: 17px; border-radius: 17px;
text-align: center; text-align: center;
} }
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified { .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_verified {
background-color: #76cfa6; color: #76cfa6;
} }
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified { .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_unverified {
background-color: #eca46f; color: #b2b2b2;
} }
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked { .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked {
background-color: #e55e5e; color: #e55e5e;
} }

5
src/skins/vector/css/matrix-react-sdk/views/rooms/MemberInfo.css
View File

@ -73,8 +73,3 @@ limitations under the License.
margin-left: 8px; margin-left: 8px;
line-height: 23px; line-height: 23px;
} }
.mx_MemberInfo_devices {
display: table;
border-spacing: 5px;
}