Skip to content

Commit cc3acdc

Browse files
authored
Merge branch 'develop' into project-og-title-fix
2 parents c21ad56 + f7cdeca commit cc3acdc

File tree

4 files changed

+13
-1
lines changed

4 files changed

+13
-1
lines changed

client/modules/App/components/Overlay.jsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import PropTypes from 'prop-types';
22
import React, { useCallback, useRef } from 'react';
3+
import MediaQuery from 'react-responsive';
34
import { useSelector } from 'react-redux';
45
import { useHistory } from 'react-router-dom';
56
import { useTranslation } from 'react-i18next';
@@ -54,7 +55,7 @@ const Overlay = ({
5455
<header className="overlay__header">
5556
<h2 className="overlay__title">{title}</h2>
5657
<div className="overlay__actions">
57-
{actions}
58+
<MediaQuery minWidth={770}>{actions}</MediaQuery>
5859
<button
5960
className="overlay__close-button"
6061
onClick={close}
@@ -64,6 +65,11 @@ const Overlay = ({
6465
</button>
6566
</div>
6667
</header>
68+
<MediaQuery maxWidth={769}>
69+
{actions && (
70+
<div className="overlay__actions-mobile">{actions}</div>
71+
)}
72+
</MediaQuery>
6773
{children}
6874
</section>
6975
</div>

client/modules/IDE/components/SketchList.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ class SketchListRowBase extends React.Component {
178178
onBlur={this.handleRenameBlur}
179179
onClick={(e) => e.stopPropagation()}
180180
ref={this.renameInput}
181+
maxLength={128}
181182
/>
182183
)}
183184
</React.Fragment>

client/styles/components/_overlay.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
display: flex;
5252
}
5353

54+
.overlay__actions-mobile {
55+
padding-left: #{24/ $base-font-size}rem;
56+
}
57+
5458
.overlay__title {
5559
font-size: #{math.div(21, $base-font-size)}rem;
5660
}

client/styles/components/_sketch-list.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@
164164

165165
.sketches-table th {
166166
font-weight: normal;
167+
overflow-wrap: break-word;
167168
}
168169

169170
.sketches-table__name {

0 commit comments

Comments
 (0)