mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-28 20:38:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
David Baker 2017-07-10 14:35:51 +01:00
commit 7a1494fc46
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/views/context_menus/MessageContextMenu.js
View file

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

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

@ -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;
}

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

@ -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;