diff --git a/assets/css/global.scss b/assets/css/global.scss index 60e1a8b9..5a1e5be9 100644 --- a/assets/css/global.scss +++ b/assets/css/global.scss @@ -248,7 +248,7 @@ legend { } .sidebar__wrapper { - height: calc(100vh - 68px); + height: calc(100vh - var(--header-navbar-height) - var(--ads-label-height)); .card-body .card { border-radius: unset; @@ -566,4 +566,7 @@ label { --popper-theme-border-radius: 6px; --popper-theme-padding: 10px; --popper-theme-box-shadow: 0 6px 30px -6px rgba(0, 0, 0, 0.25); -} \ No newline at end of file + --ads-height: 258px; + --ads-label-height: 42px; + --header-navbar-height: 76px; +} diff --git a/components/ExternalDa.vue b/components/ExternalDa.vue index 94ae2db4..6876a4b9 100644 --- a/components/ExternalDa.vue +++ b/components/ExternalDa.vue @@ -10,8 +10,8 @@ :ref="adUnitPath" :key="'adUnit-' + adUnitPath" :style="{ - width: dimensions[0] + 'px', - height: dimensions[1] + 'px', + 'max-width': dimensions[0] + 'px', + 'max-height': dimensions[1] + 'px', }" /> diff --git a/pages/chats/[[id]].vue b/pages/chats/[[id]].vue index d3354cc5..c492cbc6 100644 --- a/pages/chats/[[id]].vue +++ b/pages/chats/[[id]].vue @@ -187,12 +187,16 @@ - + @@ -322,6 +326,7 @@ export default { distance: 1000, selectedChatId: null, showClosed: false, + adsVisible: false, } }, computed: { @@ -566,4 +571,11 @@ export default { .closedCount { border-radius: 50%; } + +.sidebar-with-ads .sidebar__wrapper { + height: calc( + 100vh - var(--ads-height) - var(--ads-label-height) - + var(--header-navbar-height) + ); +}