From 77a52b02cba204c4e428b0baf8145b3d4ce4b77f Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Tue, 4 Jul 2017 16:26:19 +0100 Subject: [PATCH 1/3] Take RTE out of labs Goes with https://github.com/matrix-org/matrix-react-sdk/pull/1176 --- src/components/views/context_menus/MessageContextMenu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/context_menus/MessageContextMenu.js b/src/components/views/context_menus/MessageContextMenu.js index bc82778aae..105ba1f515 100644 --- a/src/components/views/context_menus/MessageContextMenu.js +++ b/src/components/views/context_menus/MessageContextMenu.js @@ -247,7 +247,7 @@ module.exports = React.createClass({ {viewClearSourceButton} {unhidePreviewButton} {permalinkButton} - {UserSettingsStore.isFeatureEnabled('rich_text_editor') ? quoteButton : null} + {quoteButton} {externalURLButton} ); From b4602fd2b106005229bf3a764cbc0ce7ee2ad9a6 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 7 Jul 2017 10:49:19 +0100 Subject: [PATCH 2/3] Comment --- src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss b/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss index 9b7871e778..8de7b20fdf 100644 --- a/src/skins/vector/css/matrix-react-sdk/structures/_MyGroups.scss +++ b/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; } From 5f5a802b44e8da36c4ec1f156a50417fb3936f69 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 7 Jul 2017 18:34:57 +0100 Subject: [PATCH 3/3] Add CSS from react-sdk PR feedback --- .../matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss b/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss index f946a07ab3..ebe89027a6 100644 --- a/src/skins/vector/css/matrix-react-sdk/views/dialogs/_CreateGroupDialog.scss +++ b/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;