Merge branch 'develop' into bs/fixed_issue_2633

CHANGELOG.md

@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
--
+- Updated HTTPS install README section (cleanup and described more robust deploy)
 
 ### Deprecated
 
@@ -31,7 +31,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed filters select overflow (<https://github.com/openvinotoolkit/cvat/pull/2614>)
 - 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>)
+- The list of files attached to the task is not displayed (<https://github.com/openvinotoolkit/cvat/pul
+- A couple of css-related issues (top bar disappear, wrong arrow position on collapse elements) (<https://github.com/openvinotoolkit/cvat/pull/2736>)
 - Issue with point region doesn't work in Firefox (<https://github.com/openvinotoolkit/cvat/pull/2727>)
 
 ### Security

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": {
@@ -54,7 +54,7 @@
     "@types/react-color": "^3.0.4",
     "@types/react-dom": "^16.9.10",
     "@types/react-redux": "^7.1.15",
-    "@types/react-router": "^5.1.9",
+    "@types/react-router": "^5.1.10",
     "@types/react-router-dom": "^5.1.7",
     "@types/react-share": "^3.0.3",
     "@types/redux-logger": "^3.0.8",

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
 

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;
             }
         }

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,