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

Improve list table readability #4497

Merged
merged 3 commits into from
Feb 5, 2024
Merged

Improve list table readability #4497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7defea6
imporve table readability
cj12312021 Jan 25, 2024
323b644
fixes mandatiry columns bug and consistency issues
cj12312021 Jan 25, 2024
3f13190
more table improvements
cj12312021 Jan 28, 2024
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
4 changes: 2 additions & 2 deletions ui/v2.5/src/components/Galleries/GalleryListTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const GalleryListTable: React.FC<IGalleryListTableProps> = (
};

const TagCell = (gallery: GQL.SlimGalleryDataFragment) => (
<ul className="comma-list">
<ul className="comma-list overflowable">
{gallery.tags.map((tag) => (
<li key={tag.id}>
<Link to={NavUtils.makeTagGalleriesUrl(tag)}>
Expand All @@ -97,7 +97,7 @@ export const GalleryListTable: React.FC<IGalleryListTableProps> = (
);

const PerformersCell = (gallery: GQL.SlimGalleryDataFragment) => (
<ul className="comma-list">
<ul className="comma-list overflowable">
{gallery.performers.map((performer) => (
<li key={performer.id}>
<Link to={NavUtils.makePerformerGalleriesUrl(performer)}>
Expand Down
2 changes: 1 addition & 1 deletion ui/v2.5/src/components/List/ListTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const ColumnSelector: React.FC<{
return allColumns.map((col) => {
return {
...col,
disabled: col.mandatory,
isDisabled: col.mandatory,
};
});
}, [allColumns]);
Expand Down
30 changes: 24 additions & 6 deletions ui/v2.5/src/components/List/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,21 +391,30 @@ input[type="range"].zoom-slider {
top: 0;
z-index: 100;
}

td:first-child {
padding: 0;
}

label {
margin: 0;
padding: 0.5rem;
}
}

.column-select {
margin: 0;
padding: 7px;
}

.select-col {
width: 20px;
}

.comma-list {
list-style: none;
margin: 0;
overflow: hidden;
padding: 4px 2px;
text-overflow: ellipsis;
white-space: nowrap;
width: 190px;

li {
display: inline;
Expand All @@ -420,7 +429,14 @@ input[type="range"].zoom-slider {
}
}

.comma-list:hover {
.comma-list.overflowable {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 190px;
}

.comma-list.overflowable:hover {
background: #28343c;
border: 1px solid #414c53;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.28);
Expand All @@ -438,11 +454,13 @@ input[type="range"].zoom-slider {
z-index: 100;
}

.comma-list li .ellips-data:hover {
.comma-list.overflowable li .ellips-data:hover {
max-width: fit-content;
}

td {
color: hsla(0, 0%, 100%, 0.6);
font-weight: 500;
position: relative;
text-align: left;
white-space: nowrap;
Expand Down
20 changes: 10 additions & 10 deletions ui/v2.5/src/components/Scenes/SceneListTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
};

const TagCell = (scene: GQL.SlimSceneDataFragment) => (
<ul className="comma-list">
<ul className="comma-list overflowable">
{scene.tags.map((tag) => (
<li key={tag.id}>
<Link to={NavUtils.makeTagScenesUrl(tag)}>
Expand All @@ -99,7 +99,7 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
);

const PerformersCell = (scene: GQL.SlimSceneDataFragment) => (
<ul className="comma-list">
<ul className="comma-list overflowable">
{scene.performers.map((performer) => (
<li key={performer.id}>
<Link to={NavUtils.makePerformerScenesUrl(performer)}>
Expand All @@ -124,7 +124,7 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
};

const MovieCell = (scene: GQL.SlimSceneDataFragment) => (
<ul className="comma-list">
<ul className="comma-list overflowable">
{scene.movies.map((sceneMovie) => (
<li key={sceneMovie.movie.id}>
<Link to={NavUtils.makeMovieScenesUrl(sceneMovie.movie)}>
Expand All @@ -136,7 +136,7 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
);

const GalleriesCell = (scene: GQL.SlimSceneDataFragment) => (
<ul className="comma-list">
<ul className="comma-list overflowable">
{scene.galleries.map((gallery) => (
<li key={gallery.id}>
<Link to={`/galleries/${gallery.id}`}>
Expand Down Expand Up @@ -271,10 +271,10 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
render: DurationCell,
},
{
value: "tags",
label: intl.formatMessage({ id: "tags" }),
value: "studio",
label: intl.formatMessage({ id: "studio" }),
defaultShow: true,
render: TagCell,
render: StudioCell,
},
{
value: "performers",
Expand All @@ -283,10 +283,10 @@ export const SceneListTable: React.FC<ISceneListTableProps> = (
render: PerformersCell,
},
{
value: "studio",
label: intl.formatMessage({ id: "studio" }),
value: "tags",
label: intl.formatMessage({ id: "tags" }),
defaultShow: true,
render: StudioCell,
render: TagCell,
},
{
value: "movies",
Expand Down
15 changes: 0 additions & 15 deletions ui/v2.5/src/components/Scenes/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,21 +689,6 @@ input[type="range"].blue-slider {
}
}

.scene-table {
td:first-child {
padding: 0;
}

label {
margin: 0;
padding: 0.5rem;
}
}

.select-col {
width: 20px;
}

.scrape-dialog .rating-number.disabled {
padding-left: 0.5em;
}
Expand Down
4 changes: 2 additions & 2 deletions ui/v2.5/src/components/Shared/Select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -984,7 +984,7 @@ export const ListSelect = <T extends {}>(props: IListSelect<T>) => {
};

type DisableOption = Option & {
disabled?: boolean;
isDisabled?: boolean;
};

interface ICheckBoxSelectProps {
Expand All @@ -1002,7 +1002,7 @@ export const CheckBoxSelect: React.FC<ICheckBoxSelectProps> = ({
<reactSelectComponents.Option {...props}>
<input
type="checkbox"
disabled={props.data.disabled}
disabled={props.isDisabled}
checked={props.isSelected}
onChange={() => null}
className="mr-1"
Expand Down
Loading