mirror of
https://github.com/SchildiChat/element-web.git
synced 2024-10-01 01:26:12 -04:00
Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview
This commit is contained in:
commit
7a1494fc46
@ -248,7 +248,7 @@ module.exports = React.createClass({
|
||||
{viewClearSourceButton}
|
||||
{unhidePreviewButton}
|
||||
{permalinkButton}
|
||||
{UserSettingsStore.isFeatureEnabled('rich_text_editor') ? quoteButton : null}
|
||||
{quoteButton}
|
||||
{externalURLButton}
|
||||
</div>
|
||||
);
|
||||
|
@ -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;
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user