Merge pull request #889 from nextcloud/feat/884

nextcloud · Mar 1, 2024 · 9abba7d · 9abba7d
2 parents 298e485 + c255b4d
commit 9abba7d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/modules/main/sections/ElementDescription.vue b/src/modules/main/sections/ElementDescription.vue
@@ -8,8 +8,13 @@
 				<TextIcon :size="15" />
 				{{ t('tables', 'Filtered view') }}&nbsp;&nbsp;
 			</div>
-			<NcSmallButton v-if="isViewSettingSet" @click="resetLocalAdjustments">
-				🔙 {{ t('tables', 'Reset local adjustments') }}
+			<NcSmallButton
+				v-if="isViewSettingSet"
+				@click="resetLocalAdjustments">
+				<template #icon>
+					<FilterRemove :size="15" />
+				</template>
+				{{ t('tables', 'Reset local adjustments') }}
 			</NcSmallButton>
 		</div>
 		<div v-if="!isTable && activeElement.isShared" class="user-bubble">
@@ -25,6 +30,7 @@
 
 import { NcUserBubble } from '@nextcloud/vue'
 import TextIcon from 'vue-material-design-icons/Text.vue'
+import FilterRemove from 'vue-material-design-icons/FilterRemove.vue'
 import NcSmallButton from '../../../shared/components/ncSmallButton/NcSmallButton.vue'
 
 export default {
@@ -33,6 +39,7 @@ export default {
 	components: {
 		NcUserBubble,
 		TextIcon,
+		FilterRemove,
 		NcSmallButton,
 	},
 

diff --git a/src/shared/components/ncSmallButton/NcSmallButton.vue b/src/shared/components/ncSmallButton/NcSmallButton.vue
@@ -1,6 +1,9 @@
 <template>
 	<NcButton :aria-label="ariaLabel" class="button-small" @click="submit">
-		<slot />
+		<div class="button-small__label">
+			<slot name="icon" />
+			<slot />
+		</div>
 	</NcButton>
 </template>
 <script>
@@ -35,4 +38,10 @@ export default {
 		margin: 0 0 0 4px !important;
 	}
 
+	.button-small__label {
+		display: flex;
+		flex-flow: row nowrap;
+		align-items: center;
+	}
+
 </style>