Skip to content

Commit

Permalink
Minor UI fixes (#4509)
Browse files Browse the repository at this point in the history
* Fix a zero value disabling the SettingModal
* Fix performer disambiguation styling
* Fix performer tagger error message
  • Loading branch information
DingDongSoLong4 authored Jan 29, 2024
1 parent 1588d1c commit d82c526
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
4 changes: 4 additions & 0 deletions ui/v2.5/src/components/Performers/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,10 @@
}

.performer-select {
.performer-disambiguation {
white-space: pre;
}

.alias {
font-weight: bold;
white-space: pre;
Expand Down
5 changes: 4 additions & 1 deletion ui/v2.5/src/components/Settings/Inputs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,10 @@ export const SettingModal = <T extends {}>(props: ISettingModal<T>) => {
type="submit"
variant="primary"
onClick={() => close(currentValue)}
disabled={!currentValue || (validate && !validate(currentValue))}
disabled={
currentValue === undefined ||
(validate && !validate(currentValue))
}
>
<FormattedMessage id="actions.confirm" />
</Button>
Expand Down
2 changes: 1 addition & 1 deletion ui/v2.5/src/components/Shared/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,6 @@ div.react-datepicker {
}

.react-select-image-option {
align-items: center;
align-items: baseline;
display: flex;
}
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ const PerformerTaggerList: React.FC<IPerformerTaggerListProps> = ({
[performerID]: {
message: intl.formatMessage(
{ id: "performer_tagger.failed_to_save_performer" },
{ studio: modalPerformer?.name }
{ performer: modalPerformer?.name }
),
details:
message === "UNIQUE constraint failed: performers.name"
Expand Down

0 comments on commit d82c526

Please sign in to comment.