Merge pull request #4299 from nextcloud/ref/remove-obsolete-html-tags

Ref/remove-obsolete-html-tags

Author: dartcafe

lib/Service/ShareService.php

@@ -640,13 +640,17 @@ public function add(
 			$preventInvitation = true;
 		}
 
-		$share = $this->createNewShare(
-			pollOrPollGroupId: $pollOrPollGroupId,
-			userGroup: $shareUser,
-			preventInvitation: $preventInvitation,
-			timeZone: '',
-			purpose: $purpose
-		);
+		try {
+			$share = $this->createNewShare(
+				pollOrPollGroupId: $pollOrPollGroupId,
+				userGroup: $shareUser,
+				preventInvitation: $preventInvitation,
+				timeZone: '',
+				purpose: $purpose
+			);
+		} catch (ShareAlreadyExistsException $e) {
+			$share = $e->getShare();
+		}
 
 		// TODO: extend event for pollGroups
 		if ($share->getPollId()) {

src/assets/scss/vars.scss

@@ -6,6 +6,8 @@
 :root,
 [data-theme-light] {
 	--cap-width: 49rem;
+	--shadow-height: 0.7rem;
+	--shadow-height-inverted: -0.7rem;
 	--color-polls-foreground-yes: #2d7b41;
 	--color-polls-foreground-no: #db0606;
 	--color-polls-foreground-maybe: #a37200;

src/components/Actions/index.ts

@@ -14,7 +14,7 @@ import NcButton from '@nextcloud/vue/components/NcButton'
 import EmailCheckIcon from 'vue-material-design-icons/EmailCheckOutline.vue' // view-comfy-outline
 
 import { PollsAPI } from '../../../Api'
-import { Logger } from '../../../helpers'
+import { Logger } from '../../../helpers/modules/logger'
 import { Confirmations } from '../../../Api/modules/polls'
 
 const route = useRoute()

src/components/Actions/modules/ActionSendConfirmed.vue

@@ -10,7 +10,8 @@ import { DateTime } from 'luxon'
 import NcUserBubble from '@nextcloud/vue/components/NcUserBubble'
 import NcRichText from '@nextcloud/vue/components/NcRichText'
 
-import { GuestBubble, SimpleLink } from '../../helpers'
+import { GuestBubble } from '../../helpers/modules/GuestBubble'
+import { SimpleLink } from '../../helpers/modules/SimpleLink'
 
 const props = defineProps({
 	activity: {

src/components/Activity/ActivityItem.vue

@@ -39,13 +39,13 @@ const { tag = 'span' } = defineProps<{ tag?: string }>()
 	}
 
 	&.error {
-		border-color: var(--color-error);
+		border-color: var(--color-border-error-);
 		background-color: var(--color-error);
 		color: var(--color-primary-element-text) !important;
 	}
 
 	&.success {
-		border-color: var(--color-success);
+		border-color: var(--color-border-success);
 		background-color: var(--color-success);
 		color: var(--color-primary-element-text) !important;
 	}

src/components/Base/index.ts

@@ -42,18 +42,18 @@ const { tag = 'span' } = defineProps<{ tag?: string }>()
 	}
 
 	&.error {
-		background-color: rgba(var(--color-error-rgb), 0.2);
-		border-color: var(--color-error);
+		background-color: var(--color-error);
+		border-color: var(--color-border-error);
 	}
 
 	&.success {
-		background-color: rgba(var(--color-success-rgb), 0.2);
-		border-color: var(--color-success);
+		background-color: var(--color-success);
+		border-color: var(--color-border-success);
 	}
 
 	&.warning {
-		background-color: rgba(var(--color-warning-rgb), 0.2) !important;
-		border-color: var(--color-warning);
+		background-color: var(--color-warning);
+		border-color: var(--color-element-warning);
 	}
 }
 </style>

src/components/Base/modules/BadgeDiv.vue

@@ -13,7 +13,7 @@ import AlertIcon from 'vue-material-design-icons/AlertCircleOutline.vue'
 import ChevronLeftIcon from 'vue-material-design-icons/ChevronLeft.vue'
 import ChevronRightIcon from 'vue-material-design-icons/ChevronRight.vue'
 import Spinner from '../../AppIcons/Spinner.vue'
-import { Logger } from '../../../helpers'
+import { Logger } from '../../../helpers/modules/logger'
 
 import { SignalingType } from '../../../Types'
 import NcButton from '@nextcloud/vue/components/NcButton'
@@ -285,11 +285,11 @@ const inputClass = computed(() => [
 		}
 
 		&.error {
-			border-color: var(--color-error);
+			border-color: var(--color-border-error);
 		}
 
 		&.success {
-			border-color: var(--color-success);
+			border-color: var(--color-border-success);
 		}
 	}
 

src/components/Base/modules/BadgeSmallDiv.vue

@@ -5,7 +5,7 @@
 
 <script setup lang="ts">
 import QRCode from 'qrcode'
-import { Logger } from '../../../helpers'
+import { Logger } from '../../../helpers/modules/logger'
 import { onMounted, ref } from 'vue'
 
 import type { AxiosError } from '@nextcloud/axios'