Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 3523b7fe authored by Georg Ehrke's avatar Georg Ehrke Committed by GitHub
Browse files

Merge pull request #1619 from nextcloud/bugfix/1592/display_more_popover_readonly 

Move Show More button to upper right corner of popover
parents 0760d4e2 7ad9725b

css/app-sidebar.scss

+6 −3
Original line number Diff line number Diff line
@@ -611,15 +611,18 @@ 
			}

		}



		.event-popover__close-action {

		.event-popover__top-right-actions {

			position: absolute !important;

			width: 44px !important;

			height: 44px !important;

			top: 0 !important;

			right: 0 !important;

			z-index: 100 !important;

			opacity: .7 !important;

			border-radius: 22px !important;



			.action-item.action-item--single {

				width: 44px !important;

				height: 44px !important;

			}

		}



		.popover-loading-indicator {

src/views/EditSimple.vue

+16 −9
Original line number Diff line number Diff line
@@ -31,15 +31,22 @@ 
		<PopoverLoadingIndicator

			v-if="isLoading" />



		<Actions

			v-if="!isLoading"

			class="event-popover__close-action">

		<div class="event-popover__top-right-actions">

			<Actions v-if="!isLoading && isReadOnly">

				<ActionButton

					icon="icon-fullscreen"

					@click="showMore">

					{{ $t('calendar', 'Show more details') }}

				</ActionButton>

			</Actions>

			<Actions v-if="!isLoading">

				<ActionButton

					icon="icon-close"

					@click="cancel">

					{{ $t('calendar', 'Close') }}

				</ActionButton>

			</Actions>

		</div>



		<IllustrationHeader

			v-if="!isLoading"