fix: resolve merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>

src/components/board/Board.vue

@@ -163,8 +163,8 @@ export default {
 
 <style lang="scss" scoped>
 
-	@import '../../css/animations.scss';
-	@import '../../css/variables.scss';
+	@import '../../css/animations';
+	@import '../../css/variables';
 
 	form {
 		text-align: center;

src/components/board/Stack.vue

@@ -276,7 +276,7 @@ export default {
 	@import './../../css/variables';
 
 	.stack {
-		width: $stack-width + $stack-spacing*3;
+		width: $stack-width + $stack-spacing * 3;
 		margin-left: math.div($stack-spacing, 2);
 		margin-right: math.div($stack-spacing, 2);
 	}

src/components/card/CardSidebar.vue

@@ -216,12 +216,12 @@ export default {
 	.modal__card .app-sidebar {
 		$modal-padding: 14px;
 		border: 0;
-		min-width: calc(100% - #{$modal-padding*2});
+		min-width: calc(100% - #{$modal-padding * 2});
 		position: relative;
 		top: 0;
 		left: 0;
 		right: 0;
-		max-width: calc(100% - #{$modal-padding*2});
+		max-width: calc(100% - #{$modal-padding * 2});
 		padding: 0 14px;
 		max-height: 100%;
 		overflow: initial;

src/components/card/Description.vue

@@ -263,6 +263,7 @@ export default {
 	overflow-x: auto;
 
 	&::v-deep {
+		/* stylelint-disable-next-line no-invalid-position-at-import-rule */
 		@import './../../css/markdown';
 	}
 

src/components/cards/CardItem.vue

@@ -232,6 +232,7 @@ export default {
 			}
 		}
 
+		/* stylelint-disable-next-line no-invalid-position-at-import-rule */
 		@import './../../css/labels';
 
 		.card-controls {

src/components/search/GlobalSearchResults.vue

@@ -173,7 +173,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../css/variables.scss';
+@import '../../css/variables';
 
 .global-search {
 	width: 100%;

src/components/search/Placeholder.vue

@@ -54,7 +54,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../../css/variables.scss';
+@import '../../css/variables';
 $clickable-area: 44px;
 
 .card--placeholder {