From 0279a41feb87354ae1c1e17f598e5f15e28b8595 Mon Sep 17 00:00:00 2001 From: klakhov Date: Fri, 1 Sep 2023 10:50:11 +0300 Subject: [PATCH 1/5] fixed tasks list top bar --- cvat-ui/src/components/tasks-page/top-bar.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cvat-ui/src/components/tasks-page/top-bar.tsx b/cvat-ui/src/components/tasks-page/top-bar.tsx index ff5147c1c3d..c87f6b3653f 100644 --- a/cvat-ui/src/components/tasks-page/top-bar.tsx +++ b/cvat-ui/src/components/tasks-page/top-bar.tsx @@ -22,6 +22,8 @@ import { localStorageRecentKeyword, localStorageRecentCapacity, predefinedFilterValues, config, } from './tasks-filter-configuration'; +import dimensions from '../projects-page/dimensions'; + const FilteringComponent = ResourceFilterHOC( config, localStorageRecentKeyword, localStorageRecentCapacity, predefinedFilterValues, ); @@ -51,7 +53,7 @@ export default function TopBarComponent(props: VisibleTopBarProps): JSX.Element return ( - +
Date: Fri, 1 Sep 2023 10:50:28 +0300 Subject: [PATCH 2/5] fixed projects/jobs/models cards paddings --- cvat-ui/src/components/jobs-page/styles.scss | 4 ++++ cvat-ui/src/components/models-page/styles.scss | 13 +++++++++++-- cvat-ui/src/components/models-page/top-bar.tsx | 2 +- cvat-ui/src/components/projects-page/styles.scss | 10 ++++++++-- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/cvat-ui/src/components/jobs-page/styles.scss b/cvat-ui/src/components/jobs-page/styles.scss index 1c6c2a1b26b..cc561fcaa0a 100644 --- a/cvat-ui/src/components/jobs-page/styles.scss +++ b/cvat-ui/src/components/jobs-page/styles.scss @@ -61,6 +61,10 @@ } } + :nth-child(4n) { + border-right: 0; + } + .cvat-jobs-page-job-item-card-preview-wrapper { height: 100%; width: 100%; diff --git a/cvat-ui/src/components/models-page/styles.scss b/cvat-ui/src/components/models-page/styles.scss index 30ea82d723d..3ed33ff4b4e 100644 --- a/cvat-ui/src/components/models-page/styles.scss +++ b/cvat-ui/src/components/models-page/styles.scss @@ -3,7 +3,7 @@ // // SPDX-License-Identifier: MIT -@import '../../base.scss'; +@import '../../base'; .cvat-models-page { padding-top: $grid-unit-size * 2; @@ -70,6 +70,11 @@ .cvat-models-page-top-bar { margin: $grid-unit-size * 3 0; + .cvat-models-page-search-bar { + width: $grid-unit-size * 32; + padding-left: $grid-unit-size * 0.5; + } + > div { display: flex; } @@ -114,13 +119,17 @@ .cvat-models-item-card { width: 25%; - border-width: 4px; + border-width: $grid-unit-size * 0.5; height: $grid-unit-size * 28; overflow: hidden; .ant-card-meta-title { margin-bottom: 0 !important; } + + &:nth-child(4n) { + border-right: 0; + } } .cvat-model-item-loading-preview, diff --git a/cvat-ui/src/components/models-page/top-bar.tsx b/cvat-ui/src/components/models-page/top-bar.tsx index cf2f08b07de..45cd44320d3 100644 --- a/cvat-ui/src/components/models-page/top-bar.tsx +++ b/cvat-ui/src/components/models-page/top-bar.tsx @@ -43,7 +43,7 @@ export default function TopBarComponent(props: VisibleTopBarProps): JSX.Element onApplySearch(phrase); }} defaultValue={query.search || ''} - className='cvat-webhooks-page-search-bar' + className='cvat-models-page-search-bar' placeholder='Search ...' />
diff --git a/cvat-ui/src/components/projects-page/styles.scss b/cvat-ui/src/components/projects-page/styles.scss index 1121e33e071..f4c4d7413fe 100644 --- a/cvat-ui/src/components/projects-page/styles.scss +++ b/cvat-ui/src/components/projects-page/styles.scss @@ -123,7 +123,8 @@ padding-bottom: $grid-unit-size; .ant-ribbon-wrapper { - width: calc(25% - $grid-unit-size); + width: 25%; + border: $grid-unit-size * 0.5 solid #f0f0f0; .cvat-projects-project-item-card { .cvat-projects-project-item-card-preview-wrapper { @@ -182,6 +183,10 @@ display: flex; flex-direction: column; } + + &:nth-child(4n) { + border-right: 0; + } } } @@ -193,7 +198,8 @@ .cvat-projects-list { display: flex; flex-wrap: wrap; - gap: $grid-unit-size; + + // gap: $grid-unit-size; } .cvat-export-project-loading { From 0342102d8ebc988c4564ed5430be86980c9e3015 Mon Sep 17 00:00:00 2001 From: klakhov Date: Fri, 1 Sep 2023 11:03:26 +0300 Subject: [PATCH 3/5] removed comment --- cvat-ui/src/components/projects-page/styles.scss | 2 -- 1 file changed, 2 deletions(-) diff --git a/cvat-ui/src/components/projects-page/styles.scss b/cvat-ui/src/components/projects-page/styles.scss index f4c4d7413fe..fc7ecacd92f 100644 --- a/cvat-ui/src/components/projects-page/styles.scss +++ b/cvat-ui/src/components/projects-page/styles.scss @@ -198,8 +198,6 @@ .cvat-projects-list { display: flex; flex-wrap: wrap; - - // gap: $grid-unit-size; } .cvat-export-project-loading { From daf62abb914878d2a0eb3c7104a87510844f0f2d Mon Sep 17 00:00:00 2001 From: klakhov Date: Fri, 1 Sep 2023 11:03:38 +0300 Subject: [PATCH 4/5] added padding on tasks page --- cvat-ui/src/components/tasks-page/styles.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/cvat-ui/src/components/tasks-page/styles.scss b/cvat-ui/src/components/tasks-page/styles.scss index 4784742417f..75b92f96784 100644 --- a/cvat-ui/src/components/tasks-page/styles.scss +++ b/cvat-ui/src/components/tasks-page/styles.scss @@ -34,6 +34,7 @@ .cvat-tasks-page-search-bar { width: $grid-unit-size * 32; + padding-left: $grid-unit-size; } } } From 6e9567ab77675125aadccfca4398a6fc2042ee0e Mon Sep 17 00:00:00 2001 From: klakhov Date: Fri, 1 Sep 2023 12:34:36 +0300 Subject: [PATCH 5/5] updated changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca760515b25..2acbc678de4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed - Zooming canvas when scrooling comments list in an issue () - Issues can be created many times when initial submit () +- Paddings on tasks/projects/models pages () ### Security - TDB