Skip to content

Commit

Permalink
Merge pull request #1144 from geoadmin/develop
Browse files Browse the repository at this point in the history
New Release v1.49.1 - #patch
  • Loading branch information
pakb authored Nov 27, 2024
2 parents 5ef21e4 + 86b123b commit 9fde2c2
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/modules/menu/components/LayerDescriptionPopup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ onMounted(async () => {
:title="title"
movable
allow-print
resizeable
initial-position="top-left"
@close="emit('close', layerId)"
>
Expand Down
21 changes: 19 additions & 2 deletions src/utils/components/SimpleWindow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ const props = defineProps({
type: Boolean,
default: false,
},
resizeable: {
type: Boolean,
default: false,
},
allowPrint: {
type: Boolean,
default: false,
Expand Down Expand Up @@ -83,7 +87,11 @@ onMounted(() => {
class="simple-window card"
:class="[
initialPositionClass,
{ 'dev-disclaimer-present': hasDevSiteWarning, wide: wide },
{
'dev-disclaimer-present': hasDevSiteWarning,
wide: wide,
resizable: resizeable && showBody,
},
]"
>
<div
Expand Down Expand Up @@ -126,9 +134,18 @@ onMounted(() => {
right: 4rem;
width: max-content;
max-width: 400px;
max-height: calc(100vh - $top-margin);
max-height: max-content;
@include respond-above(phone) {
&.resizable {
min-width: min-content;
width: min-content;
height: min(500px, calc(100vh - $top-margin));
max-width: max-content;
resize: both;
overflow: auto;
}
&.wide {
max-width: calc(100vw - $menu-tray-width - 2rem);
min-width: 50vw;
Expand Down

0 comments on commit 9fde2c2

Please sign in to comment.