Skip to content

Commit

Permalink
Merge pull request #2505 from nextcloud/bugfix/noid/fix_nc_vue_2.6_re…
Browse files Browse the repository at this point in the history
…gressions

Fix issues introduced with nc/vue 2.6
  • Loading branch information
georgehrke authored Aug 25, 2020
2 parents 81df418 + dbe480f commit 84b2d4b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
15 changes: 8 additions & 7 deletions css/app-sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
*/

.app-sidebar,
.event-popover .popover-inner {

.event-popover .popover__inner {
.app-sidebar-header__figure {
height: unset !important;
}
Expand Down Expand Up @@ -614,7 +613,7 @@
}

.timezone-popover-wrapper {
.tooltip-inner.popover-inner {
.popover__inner {
padding: 20px;
}

Expand All @@ -628,7 +627,9 @@
}

.event-popover {
.popover-inner {
padding: 5px 8px;

.popover__inner {
text-align: left;
max-width: 450px;
width: 450px;
Expand All @@ -646,7 +647,7 @@
border-top-right-radius: var(--border-radius);
}

.popover-inner {
.popover__inner {
max-width: unset !important;
}

Expand Down Expand Up @@ -694,8 +695,8 @@
}
}

.event-popover.tooltip[x-placement^='bottom'] {
.popover-arrow {
.event-popover[x-placement^='bottom'] {
.popover__arrow {
border-bottom-color: var(--color-background-dark);
}
}
Expand Down
1 change: 0 additions & 1 deletion src/views/EditSidebar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

<template>
<AppSidebar
v-show="isVisible"
:title="title"
:title-editable="!isReadOnly && !isLoading"
:title-placeholder="$t('calendar', 'Event title')"
Expand Down

0 comments on commit 84b2d4b

Please sign in to comment.