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.

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

Fixed paddings on tasks/projects/models pages #6778

Merged
merged 5 commits into from
Sep 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 (<https://github.com/opencv/cvat/pull/6758>)
- Issues can be created many times when initial submit (<https://github.com/opencv/cvat/pull/6758>)
- Paddings on tasks/projects/models pages (<https://github.com/opencv/cvat/pull/6778>)

### Security
- TDB
Expand Down
4 changes: 4 additions & 0 deletions cvat-ui/src/components/jobs-page/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@
}
}

:nth-child(4n) {
border-right: 0;
}

.cvat-jobs-page-job-item-card-preview-wrapper {
height: 100%;
width: 100%;
Expand Down
13 changes: 11 additions & 2 deletions cvat-ui/src/components/models-page/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//
// SPDX-License-Identifier: MIT

@import '../../base.scss';
@import '../../base';

.cvat-models-page {
padding-top: $grid-unit-size * 2;
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion cvat-ui/src/components/models-page/top-bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 ...'
/>
<div>
Expand Down
8 changes: 6 additions & 2 deletions cvat-ui/src/components/projects-page/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -182,6 +183,10 @@
display: flex;
flex-direction: column;
}

&:nth-child(4n) {
border-right: 0;
}
}
}

Expand All @@ -193,7 +198,6 @@
.cvat-projects-list {
display: flex;
flex-wrap: wrap;
gap: $grid-unit-size;
}

.cvat-export-project-loading {
Expand Down
1 change: 1 addition & 0 deletions cvat-ui/src/components/tasks-page/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@

.cvat-tasks-page-search-bar {
width: $grid-unit-size * 32;
padding-left: $grid-unit-size;
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion cvat-ui/src/components/tasks-page/top-bar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
);
Expand Down Expand Up @@ -51,7 +53,7 @@ export default function TopBarComponent(props: VisibleTopBarProps): JSX.Element

return (
<Row className='cvat-tasks-page-top-bar' justify='center' align='middle'>
<Col md={22} lg={18} xl={16} xxl={14}>
<Col {...dimensions}>
<div className='cvat-tasks-page-filters-wrapper'>
<Input.Search
enterButton
Expand Down
Loading