gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools

This commit is contained in:
Michael Telatynski 2017-08-10 21:29:58 +01:00
parent 2d4484e0f2 752934350f
commit 4bb8aecc25
No known key found for this signature in database
GPG Key ID: 3F879DA5AD802A5E
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/skins/vector/css/matrix-react-sdk/views/rooms/_MemberDeviceInfo.scss
View File

@ -18,6 +18,12 @@ limitations under the License.
padding: 10px 0px; padding: 10px 0px;
} }
.mx_MemberDeviceInfo.mx_DeviceVerifyButtons {
padding: 6px 0;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.mx_MemberDeviceInfo_textButton { .mx_MemberDeviceInfo_textButton {
color: $accent-fg-color; color: $accent-fg-color;
@ -26,12 +32,11 @@ limitations under the License.
text-align: center; text-align: center;
padding-left: 1em; padding-left: 1em;
padding-right: 1em; padding-right: 1em;
width: 95px;
border: 0px; border: 0px;
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
display: inline; margin: 2px;
flex: 1;
} }
.mx_MemberDeviceInfo_deviceId { .mx_MemberDeviceInfo_deviceId {
@ -44,11 +49,6 @@ limitations under the License.
border-bottom: 1px solid rgba(0,0,0,0.1); border-bottom: 1px solid rgba(0,0,0,0.1);
} }
.mx_MemberDeviceInfo_blacklist,
.mx_MemberDeviceInfo_unblacklist {
float: right;
}
/* "Unblacklist" is too long for a regular button: make it wider and /* "Unblacklist" is too long for a regular button: make it wider and
reduce the padding. */ reduce the padding. */
.mx_EncryptedEventDialog .mx_MemberDeviceInfo_blacklist, .mx_EncryptedEventDialog .mx_MemberDeviceInfo_blacklist,