mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 04:44:37 +03:00
UI fixes (#1525)
* Fix scene page styling * Hide plugins with no tasks on task page * Update query on URL change
This commit is contained in:
@@ -52,6 +52,12 @@ $scrubberHeight: 120px;
|
||||
padding-right: 15px;
|
||||
}
|
||||
|
||||
@media (max-width: 1199px) {
|
||||
.scene-tabs {
|
||||
padding-right: 15px;
|
||||
}
|
||||
}
|
||||
|
||||
$sceneTabWidth: 450px;
|
||||
|
||||
@media (min-width: 1200px) {
|
||||
|
||||
@@ -145,7 +145,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
|
||||
<div className="col-6 col-xl-12">
|
||||
<Field name="primaryTagId">{renderPrimaryTagField}</Field>
|
||||
</div>
|
||||
<Form.Label htmlFor="seconds" className="col-1 col-xl-12">
|
||||
<Form.Label htmlFor="seconds" className="col-1 col-xl-12 mt-2">
|
||||
Time
|
||||
</Form.Label>
|
||||
<Field name="seconds">{renderSecondsField}</Field>
|
||||
@@ -160,7 +160,7 @@ export const SceneMarkerForm: React.FC<ISceneMarkerForm> = ({
|
||||
</Form.Group>
|
||||
</div>
|
||||
<div className="buttons-container row">
|
||||
<div className="col">
|
||||
<div className="col d-flex">
|
||||
<Button variant="primary" type="submit">
|
||||
Submit
|
||||
</Button>
|
||||
|
||||
@@ -271,11 +271,15 @@ export const SettingsTasksPanel: React.FC = () => {
|
||||
return;
|
||||
}
|
||||
|
||||
const taskPlugins = plugins.data.plugins.filter(
|
||||
(p) => p.tasks && p.tasks.length > 0
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
<hr />
|
||||
<h5>{intl.formatMessage({ id: "config.tasks.plugin_tasks" })}</h5>
|
||||
{plugins.data.plugins.map((o) => {
|
||||
{taskPlugins.map((o) => {
|
||||
return (
|
||||
<div key={`${o.id}`} className="mb-3">
|
||||
<h6>{o.name}</h6>
|
||||
|
||||
@@ -620,11 +620,21 @@ const useList = <QueryResult extends IQueryResult, QueryData extends IDataItem>(
|
||||
|
||||
if (!forageInitialised) setForageInitialised(true);
|
||||
|
||||
if (!options.persistState) return;
|
||||
|
||||
const newFilter = filter.clone();
|
||||
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
|
||||
// load the default query
|
||||
// #1512 - use default query only if persistState is ALL
|
||||
|
||||
Reference in New Issue
Block a user