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

This commit is contained in:
Weblate 2017-11-08 10:24:01 +00:00
commit b788e759da
1 changed files with 6 additions and 3 deletions

View File

@ -213,13 +213,12 @@ limitations under the License.
.mx_GroupView_membershipSection {
color: $greyed-fg-color;
margin-top: 10px;
}
.mx_GroupView_membershipSubSection {
justify-content: space-between;
display: flex;
margin-top: 2px;
margin-bottom: 2px;
}
.mx_GroupView_membershipSection_description {
@ -227,6 +226,10 @@ limitations under the License.
line-height: 34px;
}
.mx_GroupView_membershipSection_description .mx_BaseAvatar {
margin-right: 10px;
}
.mx_GroupView_membershipSection .mx_GroupView_textButton {
margin-right: 0px;
margin-top: 0px;
@ -300,7 +303,7 @@ limitations under the License.
}
.mx_GroupView_body .gm-scroll-view > *{
margin: 0px 50px 11px 68px;
margin: 11px 50px 0px 68px;
}
.mx_GroupView_groupDesc textarea {