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

This commit is contained in:
Weblate 2017-10-24 16:48:15 +00:00
commit 3bff844a62

View file

@ -94,30 +94,26 @@ limitations under the License.
} }
.mx_RightPanel_footer .mx_RightPanel_invite { .mx_RightPanel_footer .mx_RightPanel_invite {
line-height: 35px;
font-size: 14px; font-size: 14px;
color: $primary-fg-color; color: $primary-fg-color;
padding-top: 13px; padding-top: 13px;
padding-left: 5px; padding-left: 5px;
cursor: pointer; cursor: pointer;
display: flex;
align-items: center;
} }
.collapsed .mx_RightPanel_footer .mx_RightPanel_invite { .collapsed .mx_RightPanel_footer .mx_RightPanel_invite {
display: none; display: none;
} }
.mx_RightPanel_invite .mx_RightPanel_icon {
display: inline-block;
}
.mx_RightPanel_invite .mx_RightPanel_icon object { .mx_RightPanel_invite .mx_RightPanel_icon object {
pointer-events: none; pointer-events: none;
} }
.mx_RightPanel_invite .mx_RightPanel_message { .mx_RightPanel_invite .mx_RightPanel_message {
display: inline-block; padding-left: 10px;
vertical-align: top; line-height: 18px;
padding-left: 10px
} }
.mx_MatrixChat_useCompactLayout { .mx_MatrixChat_useCompactLayout {