Skip to content

Commit

Permalink
DBC22-1370: Fixes for camera sidepanels
Browse files Browse the repository at this point in the history
  • Loading branch information
minORC authored and ray-oxd committed Feb 21, 2024
1 parent 2701ed3 commit 727541f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 7 deletions.
9 changes: 5 additions & 4 deletions src/frontend/src/Components/Map.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
.side-panel {
transition: min-height 0.25s ease-in-out;
order: 2;
overflow-y: auto;

&.open {
min-width: 100%;
Expand All @@ -52,11 +53,13 @@
}

.side-panel {
background-color: white;
flex: 0;
min-width: 0px;
min-height: 0%;
transition: min-width 0.25s ease-in-out;
overflow: hidden;
overflow-y: auto;
overflow-x: hidden;
display: flex;
flex-direction: column;
position: relative;
Expand All @@ -65,6 +68,7 @@
@media (max-width: 767px) {
transition: min-height 0.25s ease-in-out;
order: 2;
overflow-y: hidden;
}

&.open {
Expand All @@ -80,7 +84,6 @@

.panel-content {
min-width: 100%;
overflow-y: hidden;
}
}
}
Expand All @@ -90,7 +93,6 @@
min-height: 100%;

.panel-content {
overflow-y: scroll;
}
}
}
Expand All @@ -110,7 +112,6 @@

.panel-content {
flex: 1;
overflow-y: scroll;
}
}

Expand Down
17 changes: 14 additions & 3 deletions src/frontend/src/Components/map/mapPopup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
.name {
font-size: 1.25rem;
color: #053662;
cursor: pointer;
}
}

Expand Down Expand Up @@ -113,6 +112,14 @@

// Cameras layer
&--camera {
.popup__content {
&__title {
.name:hover {
cursor:pointer;
text-decoration: underline;
}
}
}
.camera-orientations {
padding: 0 1rem;
}
Expand All @@ -124,11 +131,15 @@
background-color: #FBFFFC;
border-top: 4px solid #2E8540;

.name, .name a {
.name {
color: #2E8540;

a {
color: #2E8540;
text-decoration: none;
&:hover {
cursor:pointer;
text-decoration: underline;
}
}
}

Expand Down

0 comments on commit 727541f

Please sign in to comment.