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

src/components/views/context_menus/MessageContextMenu.js

@@ -248,7 +248,7 @@ module.exports = React.createClass({
                 {viewClearSourceButton}
                 {unhidePreviewButton}
                 {permalinkButton}
-                {UserSettingsStore.isFeatureEnabled('rich_text_editor') ? quoteButton : null}
+                {quoteButton}
                 {externalURLButton}
             </div>
         );

src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss

@@ -35,6 +35,7 @@ limitations under the License.
 }
 
 .mx_MyGroups_joinCreateButton object {
+    /* Otherwise the SVG object absorbs clicks and the button doesn't work */
     pointer-events: none;
 }
 

src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss

@@ -14,6 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_CreateGroupDialog_inputRow {
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+
 .mx_CreateGroupDialog_label {
     text-align: left;
     padding-bottom: 12px;