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

main
Julian Lam 7 years ago
commit 74c02dce25

@ -1548,4 +1548,3 @@
border-right: 0;
text-align: left;
}
/*# sourceMappingURL=bootstrap-rtl-flipped.css.map */

@ -51,6 +51,7 @@
background-color: inherit;
min-height: 100%;
padding-top: 80px;
padding-bottom: 40px;
}
body, #panel, .slideout-menu {

@ -1,6 +1,6 @@
{
"name": "nodebb-theme-persona",
"version": "6.0.0",
"version": "6.0.1",
"nbbpm": {
"compatibility": "^1.4.4"
},

@ -114,7 +114,7 @@
<textarea class="form-control" component="groups/members/bulk-invite" placeholder="[[groups:bulk-invite-instructions]]"></textarea>
</div>
<div class="form-group">
<div class="form-group clearfix">
<button class="btn btn-default btn-sm pull-right" component="groups/members/bulk-invite-button">[[groups:bulk-invite]]</button>
</div>

Loading…
Cancel
Save