From cb594f0e4306cd70985876633dd7ec8a09e848b1 Mon Sep 17 00:00:00 2001 From: WithoutPants <53250216+WithoutPants@users.noreply.github.com> Date: Fri, 6 Mar 2020 20:02:02 +1100 Subject: [PATCH] Fix various issues with v2.5 UI (#390) * Fix navbar collapse breakpoint * Fix list filter colors and height * Make styling similar to v2 * Fix scene card zoom and orientation * Keep p tag even without details * Fix custom css * Default settings tab to tasks * Fix flickering progress bar. Fix percentage. * Fix unsetting studio * Fix scene gallery select * Don't hide edit on small devices * Fix log dropdown style * Use monospace for custom css input --- ui/v2.5/src/components/List/ListFilter.tsx | 16 +- ui/v2.5/src/components/MainNavbar.tsx | 10 +- .../PerformerDetailsPanel.tsx | 1 + ui/v2.5/src/components/Scenes/SceneCard.tsx | 8 +- .../components/Scenes/SceneDetails/Scene.tsx | 1 - .../Scenes/SceneDetails/SceneEditPanel.tsx | 8 +- ui/v2.5/src/components/Settings/Settings.tsx | 6 +- .../Settings/SettingsConfigurationPanel.tsx | 24 +- .../Settings/SettingsInterfacePanel.tsx | 31 +- .../components/Settings/SettingsLogsPanel.tsx | 2 +- .../SettingsTasksPanel/SettingsTasksPanel.tsx | 6 +- ui/v2.5/src/components/Settings/styles.scss | 4 + .../src/components/Shared/DurationInput.tsx | 2 +- ui/v2.5/src/components/Shared/Select.tsx | 18 +- ui/v2.5/src/core/StashService.ts | 17 +- ui/v2.5/src/core/generated-graphql.tsx | 5192 +++++++++++++++++ ui/v2.5/src/index.scss | 111 +- ui/v2.5/src/index.tsx | 9 +- ui/v2.5/src/styles/_theme.scss | 5 +- ui/v2.5/src/utils/table.tsx | 2 + 20 files changed, 5381 insertions(+), 92 deletions(-) create mode 100644 ui/v2.5/src/core/generated-graphql.tsx diff --git a/ui/v2.5/src/components/List/ListFilter.tsx b/ui/v2.5/src/components/List/ListFilter.tsx index 709eedfee..e842b2993 100644 --- a/ui/v2.5/src/components/List/ListFilter.tsx +++ b/ui/v2.5/src/components/List/ListFilter.tsx @@ -107,7 +107,7 @@ export const ListFilter: React.FC = ( function renderSortByOptions() { return props.filter.sortByOptions.map(option => ( - + {option} )); @@ -186,7 +186,7 @@ export const ListFilter: React.FC = ( function renderSelectAll() { if (props.onSelectAll) { return ( - onSelectAll()}> + onSelectAll()}> Select All ); @@ -196,7 +196,7 @@ export const ListFilter: React.FC = ( function renderSelectNone() { if (props.onSelectNone) { return ( - onSelectNone()}> + onSelectNone()}> Select None ); @@ -209,7 +209,7 @@ export const ListFilter: React.FC = ( if (props.otherOperations) { props.otherOperations.forEach(o => { options.push( - + {o.text} ); @@ -222,7 +222,7 @@ export const ListFilter: React.FC = ( - {options} + {options} ); } @@ -259,13 +259,13 @@ export const ListFilter: React.FC = ( placeholder="Search..." defaultValue={props.filter.searchTerm} onChange={onChangeQuery} - className="filter-item col-5 col-sm-2" + className="filter-item col-5 col-sm-2 bg-secondary text-white border-secondary" /> {PAGE_SIZE_OPTIONS.map(s => (