Skip to content

Commit

Permalink
Fixed paddings on tasks/projects/models pages (#6778)
Browse files Browse the repository at this point in the history
<!-- Raise an issue to propose your change
(https://github.com/opencv/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution
guide](https://opencv.github.io/cvat/docs/contributing/). -->

<!-- Provide a general summary of your changes in the Title above -->

### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
This PR fixes some small issues on different pages
- Task page

![image](https://github.com/opencv/cvat/assets/50956430/1b9da08e-514f-4ee9-bebb-adb48f26217b)
- Projects page

![image](https://github.com/opencv/cvat/assets/50956430/973f3d17-d5c6-4e89-bbf6-9c16ea2780ae)


### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->

### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have added a description of my changes into the
[CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md)
file
-~~[ ] I have updated the documentation accordingly~~
- ~~[ ] I have added tests to cover my changes~~
- ~~[ ] I have linked related issues (see [GitHub docs](

https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))~~
- ~~[ ] I have increased versions of npm packages if it is necessary

([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))~~

### License

- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.
  • Loading branch information
klakhov authored Sep 2, 2023
1 parent cc5a7b4 commit 62eb867
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 6 deletions.
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

0 comments on commit 62eb867

Please sign in to comment.