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

Fix scene markers (#769)

Browse Source
This commit is contained in:
InfiniteTF
2020-08-30 06:51:40 +02:00
committed by GitHub
parent ae24fc2d3c
commit cb753f28f6
3 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ui/v2.5/src/components/Scenes/SceneDetails/PrimaryTags.tsx
View File

@@ -56,7 +56,7 @@ export const PrimaryTags: React.FC<IPrimaryTags> = ({
}); });
return ( return (
<Card className="primary-card col-12 col-sm-3 col-xl-6" key={id}> <Card className="primary-card col-12 col-sm-6 col-xl-6" key={id}>
<h3>{primaries[id].name}</h3> <h3>{primaries[id].name}</h3>
<Card.Body className="primary-card-body">{markers}</Card.Body> <Card.Body className="primary-card-body">{markers}</Card.Body>
</Card> </Card>

20
ui/v2.5/src/components/Scenes/SceneDetails/SceneMarkersPanel.tsx
View File

@@ -54,7 +54,7 @@ export const SceneMarkersPanel: React.FC<ISceneMarkersPanelProps> = (
); );
return ( return (
<> <div className="scene-markers-panel">
<Button onClick={() => onOpenEditor()}>Create Marker</Button> <Button onClick={() => onOpenEditor()}>Create Marker</Button>
<div className="container"> <div className="container">
<PrimaryTags <PrimaryTags
@@ -63,15 +63,13 @@ export const SceneMarkersPanel: React.FC<ISceneMarkersPanelProps> = (
onEdit={onOpenEditor} onEdit={onOpenEditor}
/> />
</div> </div>
<div className="row"> <WallPanel
<WallPanel sceneMarkers={props.scene.scene_markers}
sceneMarkers={props.scene.scene_markers} clickHandler={(marker) => {
clickHandler={(marker) => { window.scrollTo(0, 0);
window.scrollTo(0, 0); onClickMarker(marker as GQL.SceneMarkerDataFragment);
onClickMarker(marker as GQL.SceneMarkerDataFragment); }}
}} />
/> </div>
</div>
</>
); );
}; };

31
ui/v2.5/src/components/Scenes/styles.scss
View File

@@ -58,15 +58,6 @@
} }
} }
.marker-container {
display: "flex";
flex-wrap: "nowrap";
margin-bottom: "20px";
overflow-x: "scroll";
overflow-y: "hidden";
white-space: "nowrap";
}
.studio-logo { .studio-logo {
margin-top: 1rem; margin-top: 1rem;
max-height: 8rem; max-height: 8rem;
@@ -304,3 +295,25 @@ textarea.scene-description {
margin-right: 0; margin-right: 0;
} }
} }
.scene-markers-panel {
.wall-item {
height: inherit;
min-height: 14rem;
width: calc(100% - 2rem);
&-missing {
font-size: 1.5rem;
}
&::before {
display: none;
}
&:hover {
.wall-item-container {
transform: scale(1);
}
}
}
}