Skip to content

Commit

Permalink
Fixed a couple of css-related issues (#2736)
Browse files Browse the repository at this point in the history
* Fixed some css

* Aborted extra changes

* Updated version & changelog

* Fixed test
  • Loading branch information
Boris Sekachev authored Jan 28, 2021
1 parent cb31c0a commit 0380460
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- CVAT-3D: support lidar data on the server side (<https://github.com/openvinotoolkit/cvat/pull/2534>)

### Changed

- Updated HTTPS install README section (cleanup and described more robust deploy)

### Deprecated
Expand All @@ -31,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed tasks in project autoannotation (<https://github.com/openvinotoolkit/cvat/pull/2725>)
- Cuboids are missed in annotations statistics (<https://github.com/openvinotoolkit/cvat/pull/2704>)
- The list of files attached to the task is not displayed (<https://github.com/openvinotoolkit/cvat/pull/2706>)
- A couple of css-related issues (top bar disappear, wrong arrow position on collapse elements) (<https://github.com/openvinotoolkit/cvat/pull/2736>)

### Security

Expand Down
2 changes: 1 addition & 1 deletion cvat-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cvat-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cvat-ui",
"version": "1.13.7",
"version": "1.13.8",
"description": "CVAT single-page application",
"main": "src/index.tsx",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2020 Intel Corporation
// Copyright (C) 2021 Intel Corporation
//
// SPDX-License-Identifier: MIT

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
height: 25px;

.ant-collapse-arrow {
padding: 0;
top: $grid-unit-size;
}
}
Expand All @@ -32,6 +33,7 @@

> .ant-collapse-content-box {
padding: 10px;
padding-bottom: 0;
}
}
}
Expand Down Expand Up @@ -215,6 +217,7 @@
.cvat-objects-sidebar-state-item-collapse {
border: 0;
background: inherit;
width: 100%;

> .ant-collapse-item {
background: inherit;
Expand All @@ -226,6 +229,7 @@
padding-bottom: 2px;

.ant-collapse-arrow {
padding: 0;
top: $grid-unit-size;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@

.cvat-objects-sidebar {
height: 100%;
overflow-y: auto;
overflow-x: hidden;

&.ant-layout-sider-collapsed {
overflow: initial;
}
}

.cvat-rotate-canvas-controls-right > svg {
Expand All @@ -30,6 +36,8 @@
.cvat-canvas-controls-sidebar {
background-color: $background-color-2;
border-right: 1px solid $border-color-1;
overflow-y: auto;
overflow-x: hidden;
}

.cvat-cursor-control,
Expand Down

0 comments on commit 0380460

Please sign in to comment.