diff --git a/CHANGELOG.md b/CHANGELOG.md index 017f50c6b31c..76745df0696d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 () ### Changed + - Updated HTTPS install README section (cleanup and described more robust deploy) ### Deprecated @@ -31,6 +32,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed tasks in project autoannotation () - Cuboids are missed in annotations statistics () - The list of files attached to the task is not displayed () +- A couple of css-related issues (top bar disappear, wrong arrow position on collapse elements) () ### Security diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json index 91278998c010..31ff2a23a272 100644 --- a/cvat-ui/package-lock.json +++ b/cvat-ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "cvat-ui", - "version": "1.13.7", + "version": "1.13.8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/cvat-ui/package.json b/cvat-ui/package.json index a04fa23bd85f..2945ab9b3a5e 100644 --- a/cvat-ui/package.json +++ b/cvat-ui/package.json @@ -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": { diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item-details.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item-details.tsx index 9615d4bfee4f..5fe31a23050b 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item-details.tsx +++ b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/object-item-details.tsx @@ -1,4 +1,4 @@ -// Copyright (C) 2020 Intel Corporation +// Copyright (C) 2021 Intel Corporation // // SPDX-License-Identifier: MIT diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/styles.scss b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/styles.scss index b2c6f710c0be..c000b9046e7d 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/styles.scss +++ b/cvat-ui/src/components/annotation-page/standard-workspace/objects-side-bar/styles.scss @@ -21,6 +21,7 @@ height: 25px; .ant-collapse-arrow { + padding: 0; top: $grid-unit-size; } } @@ -32,6 +33,7 @@ > .ant-collapse-content-box { padding: 10px; + padding-bottom: 0; } } } @@ -215,6 +217,7 @@ .cvat-objects-sidebar-state-item-collapse { border: 0; background: inherit; + width: 100%; > .ant-collapse-item { background: inherit; @@ -226,6 +229,7 @@ padding-bottom: 2px; .ant-collapse-arrow { + padding: 0; top: $grid-unit-size; } } diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss b/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss index 498a0dac058f..0d24fd90a8bc 100644 --- a/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss +++ b/cvat-ui/src/components/annotation-page/standard-workspace/styles.scss @@ -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 { @@ -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,