gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into dbkr/electron_dist_tweaks

This commit is contained in:
David Baker 2016-11-30 18:13:14 +00:00
parent a1347e7bf1 0e18a12472
commit 4988f0603f
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -128,7 +128,7 @@
"build": {
"appId": "im.riot.app",
"category": "Network",
"electronVersion": "1.4.2",
"electronVersion": "1.4.8",
"//asar=false": "https://github.com/electron-userland/electron-builder/issues/675",
"asar": false,
"dereference": true,

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);
}
.mx_MemberDeviceInfo_block,
.mx_MemberDeviceInfo_unblock {
.mx_MemberDeviceInfo_blacklist,
.mx_MemberDeviceInfo_unblacklist {
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_unverified,
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked {
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blacklisted {
float: right;
padding-left: 1em;
}
@ -64,6 +73,6 @@ limitations under the License.
color: #e8bf37;
}
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blocked {
.mx_MemberDeviceInfo div.mx_MemberDeviceInfo_blacklisted {
color: #ba6363;
}