Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable5.0] fix(embed): calendar header overlapping and adjust to compact design #6319

Merged
merged 1 commit into from
Sep 4, 2024
Merged

[stable5.0] fix(embed): calendar header overlapping and adjust to compact design #6319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion css/app-navigation.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
}

.button:only-child {
border-radius: var(--border-radius-pill);
border-radius: var(--border-radius-element);
}

.button:hover,
Expand Down
25 changes: 15 additions & 10 deletions css/public.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@
}

.content.app-calendar.app-calendar-public-embedded {
flex-direction: column;

#embed-header {
position: fixed;
top: 0;
left: 0;
height: 50px;
width: 100%;
padding: calc(var(--default-grid-baseline) * 2);
box-sizing: border-box;
background-color: var(--color-main-background);
border-bottom: 1px solid var(--color-border);
overflow: visible;
z-index: 2000;
display: flex;
align-items: center;
justify-content: space-between;

.embed-header__date-section,
Expand All @@ -39,16 +40,20 @@
min-width: 150px;
}
}

.datepicker-button-section,
.today-button-section,
.view-button-section {
button {
// Header has only one row so the built-in spacing is not needed
margin: 0;
}
}
}

.app-content {
margin-top: 44px;
//position: absolute !important;
//top: 44px;
//left: 0;
//right: 0;
//bottom: 0;
//min-height: unset !important;
// Expand to full height (need to overwrite this because a flex column layout is used here)
flex-basis: auto;
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/components/AppNavigation/EmbedTopNavigation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
- SPDX-License-Identifier: AGPL-3.0-or-later
-->
<template>
<header :id="isWidget? 'widget-header' :'embed-header'" role="banner">
<div :class="isWidget?'widget-header__date-section' :'embed-header__date-section'">
<header :id="isWidget ? 'widget-header' : 'embed-header'" role="banner">
<div :class="isWidget ? 'widget-header__date-section' : 'embed-header__date-section'">
<AppNavigationHeaderDatePicker :is-widget="isWidget" />
<AppNavigationHeaderTodayButton v-if="!isWidget" />
</div>
<div :class="isWidget?'widget-header__views-section' :'embed-header__views-section'">
<div :class="isWidget ? 'widget-header__views-section' : 'embed-header__views-section'">
<AppNavigationHeaderViewButtons :is-widget="isWidget" />
</div>
<!-- TODO have one button per calendar -->
<div v-if="!isWidget" class="widget-header__share-section">
<div v-if="!isWidget" class="embed-header__share-section">
<Actions>
<template #icon>
<Download :size="20" decorative />
Expand Down
Loading