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

This commit is contained in:
Weblate 2017-09-21 16:49:59 +00:00
commit 7e87964e82
1 changed files with 16 additions and 10 deletions

View File

@ -74,10 +74,6 @@ limitations under the License.
display: flex; display: flex;
} }
.mx_GroupView_membership_buttonContainer {
margin-top: 10px;
}
.mx_GroupView_textButton { .mx_GroupView_textButton {
display: inline-block; display: inline-block;
} }
@ -134,14 +130,24 @@ limitations under the License.
top: 5px; top: 5px;
} }
.mx_GroupView_invitedSection { .mx_GroupView_membershipSection {
width: 70%;
padding: 20px;
border: 1px solid $group-alert-color;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
margin-bottom: 20px; margin-bottom: 11px;
text-align: center; justify-content: space-between;
display: flex;
color: $greyed-fg-color;
}
.mx_GroupView_membershipSection_description {
/* To match textButton */
line-height: 34px;
}
.mx_GroupView_membershipSection .mx_GroupView_textButton {
margin-right: 0px;
margin-top: 0px;
margin-left: 8px;
} }
.mx_GroupView_featuredThings { .mx_GroupView_featuredThings {