Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix scene edit panel layout #1737

Merged
merged 4 commits into from
Sep 19, 2021
Merged

Fix scene edit panel layout #1737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
851fdc5
Fix scene edit panel layout
liquid-flow Sep 17, 2021
37e69cc
Merge remote-tracking branch 'upstream/develop' into prs/1737
WithoutPants Sep 19, 2021
2bfd87d
Merge remote-tracking branch 'upstream/develop' into prs/1737
WithoutPants Sep 19, 2021
e292fd0
Move changelog entry to top
WithoutPants Sep 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ui/v2.5/src/components/Changelog/versions/v0100.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
* Added sv-SE language option. ([#1691](https://github.com/stashapp/stash/pull/1691))

### 🐛 Bug fixes
* Fix Scene Edit Panel form layout for mobile and desktop. ([#1737](https://github.com/stashapp/stash/pull/1737))
* Fix Gallery create plugin hook not being invoked when creating Gallery from folder. ([#1731](https://github.com/stashapp/stash/pull/1731))
* Fix tag aliases not being matched when autotagging from the tasks page. ([#1713](https://github.com/stashapp/stash/pull/1713))
* Disabled float-on-scroll player on mobile devices. ([#1721](https://github.com/stashapp/stash/pull/1721))
* Fix Create Marker form on small devices. ([#1718](https://github.com/stashapp/stash/pull/1718))
* Fix Create Marker form on small devices. ([#1718](https://github.com/stashapp/stash/pull/1718))
16 changes: 12 additions & 4 deletions ui/v2.5/src/components/Scenes/SceneDetails/SceneEditPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,7 @@ export const SceneEditPanel: React.FC<IProps> = ({
</div>
</div>
<div className="form-container row px-3">
<div className="col-12 col-lg-6 col-xl-12">
<div className="col-12 col-lg-7 col-xl-12">
{renderTextField("title", intl.formatMessage({ id: "title" }))}
<Form.Group controlId="url" as={Row}>
<Col xs={3} className="pr-0 url-label">
Expand Down Expand Up @@ -685,8 +685,12 @@ export const SceneEditPanel: React.FC<IProps> = ({
<Form.Group controlId="galleries" as={Row}>
{FormUtils.renderLabel({
title: intl.formatMessage({ id: "galleries" }),
labelProps: {
column: true,
sm: 3,
},
})}
<Col xs={9}>
<Col sm={9}>
<GallerySelect
galleries={galleries}
onSelect={(items) => onSetGalleries(items)}
Expand All @@ -697,8 +701,12 @@ export const SceneEditPanel: React.FC<IProps> = ({
<Form.Group controlId="studio" as={Row}>
{FormUtils.renderLabel({
title: intl.formatMessage({ id: "studios" }),
labelProps: {
column: true,
sm: 3,
},
})}
<Col xs={9}>
<Col sm={9}>
<StudioSelect
onSelect={(items) =>
formik.setFieldValue(
Expand Down Expand Up @@ -815,7 +823,7 @@ export const SceneEditPanel: React.FC<IProps> = ({
</ul>
</Form.Group>
</div>
<div className="col-12 col-lg-6 col-xl-12">
<div className="col-12 col-lg-5 col-xl-12">
<Form.Group controlId="details">
<Form.Label>
<FormattedMessage id="details" />
Expand Down