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

Merge pull request #2662 from vector-im/rav/s_block_blacklist 

CSS updates for s/block/blacklist for e2e
This commit is contained in:
David Baker 2016-11-29 19:09:08 +00:00 committed by GitHub
parent 496f507684 f202197545
commit 0e18a12472
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,14 +44,23 @@ 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_block, .mx_MemberDeviceInfo_blacklist,
.mx_MemberDeviceInfo_unblock { .mx_MemberDeviceInfo_unblacklist {
float: right; float: right;
} }
/* "Unblacklist" is too long for a regular button: make it wider and
reduce the padding. */
.mx_EncryptedEventDialog .mx_MemberDeviceInfo_blacklist,
.mx_EncryptedEventDialog .mx_MemberDeviceInfo_unblacklist {
width: 8em;
padding-left: 1em;
padding-right: 1em;
}
.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_blacklisted {
float: right; float: right;
padding-left: 1em; padding-left: 1em;
} }
@ -64,6 +73,6 @@ limitations under the License.
color: #e8bf37; color: #e8bf37;
} }
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked { .mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blacklisted {
color: #ba6363; color: #ba6363;
} }