Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-18 21:04:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

UI fixes (#1525)

Browse Source 
* Fix scene page styling
* Hide plugins with no tasks on task page
* Update query on URL change
This commit is contained in:
WithoutPants
2021-06-23 11:57:03 +10:00
committed by GitHub
parent debf21e6b2
commit 4e26633abb
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ui/v2.5/src/components/ScenePlayer/styles.scss
View File

@@ -52,6 +52,12 @@ $scrubberHeight: 120px;
padding-right: 15px; padding-right: 15px;
} }
@media (max-width: 1199px) {
.scene-tabs {
padding-right: 15px;
}
}
$sceneTabWidth: 450px; $sceneTabWidth: 450px;
@media (min-width: 1200px) { @media (min-width: 1200px) {

4
ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkerForm.tsx
View File

@@ -145,7 +145,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
<div className="col-6 col-xl-12"> <div className="col-6 col-xl-12">
<Field name="primaryTagId">{renderPrimaryTagField}</Field> <Field name="primaryTagId">{renderPrimaryTagField}</Field>
</div> </div>
<Form.Label htmlFor="seconds" className="col-1 col-xl-12"> <Form.Label htmlFor="seconds" className="col-1 col-xl-12 mt-2">
Time Time
</Form.Label> </Form.Label>
<Field name="seconds">{renderSecondsField}</Field> <Field name="seconds">{renderSecondsField}</Field>
@@ -160,7 +160,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
</Form.Group> </Form.Group>
</div> </div>
<div className="buttons-container row"> <div className="buttons-container row">
<div className="col"> <div className="col d-flex">
<Button variant="primary" type="submit"> <Button variant="primary" type="submit">
Submit Submit
</Button> </Button>

6
ui/v2.5/src/components/Settings/SettingsTasksPanel/SettingsTasksPanel.tsx
View File

@@ -271,11 +271,15 @@ export const SettingsTasksPanel: React.FC = () => {
return; return;
} }
const taskPlugins = plugins.data.plugins.filter(
(p) => p.tasks && p.tasks.length > 0
);
return ( return (
<> <>
<hr /> <hr />
<h5>{intl.formatMessage({ id: "config.tasks.plugin_tasks" })}</h5> <h5>{intl.formatMessage({ id: "config.tasks.plugin_tasks" })}</h5>
{plugins.data.plugins.map((o) => { {taskPlugins.map((o) => {
return ( return (
<div key={`${o.id}`} className="mb-3"> <div key={`${o.id}`} className="mb-3">
<h6>{o.name}</h6> <h6>{o.name}</h6>

14
ui/v2.5/src/hooks/ListHook.tsx
View File

@@ -620,11 +620,21 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
if (!forageInitialised) setForageInitialised(true); if (!forageInitialised) setForageInitialised(true);
if (!options.persistState) return;
const newFilter = filter.clone(); const newFilter = filter.clone();
let update = false; let update = false;
// Compare constructed filter with current filter.
// If different it's the result of navigation, and we update the filter.
if (
location.search &&
location.search !== `?${filter.makeQueryParameters()}`
) {
newFilter.configureFromQueryParameters(
queryString.parse(location.search)
);
update = true;
}
// if default query is set and no search params are set, then // if default query is set and no search params are set, then
// load the default query // load the default query
// #1512 - use default query only if persistState is ALL // #1512 - use default query only if persistState is ALL