Merge pull request #2212 from nextcloud/backport/2209/stable4

nextcloud-libraries · Sep 7, 2021 · a94f7f8 · a94f7f8
2 parents a004de6 + 3363572
commit a94f7f8
Show file tree

Hide file tree

Showing 97 changed files with 12 additions and 2 deletions.
diff --git a/...tarred_false-compact_true-header_image-secondary_button-editable_false-base.png b/...tarred_false-compact_true-header_image-secondary_button-editable_false-base.png
diff --git a/...starred_false-compact_true-header_image-secondary_button-editable_true-base.png b/...starred_false-compact_true-header_image-secondary_button-editable_true-base.png
diff --git a/...-starred_false-compact_true-header_image-secondary_none-editable_false-base.png b/...-starred_false-compact_true-header_image-secondary_none-editable_false-base.png
diff --git a/...l-starred_false-compact_true-header_image-secondary_none-editable_true-base.png b/...l-starred_false-compact_true-header_image-secondary_none-editable_true-base.png
diff --git a/...starred_false-compact_true-header_none-secondary_button-editable_false-base.png b/...starred_false-compact_true-header_none-secondary_button-editable_false-base.png
diff --git a/...-starred_false-compact_true-header_none-secondary_button-editable_true-base.png b/...-starred_false-compact_true-header_none-secondary_button-editable_true-base.png
diff --git a/...l-starred_false-compact_true-header_none-secondary_none-editable_false-base.png b/...l-starred_false-compact_true-header_none-secondary_none-editable_false-base.png
diff --git a/...ll-starred_false-compact_true-header_none-secondary_none-editable_true-base.png b/...ll-starred_false-compact_true-header_none-secondary_none-editable_true-base.png
diff --git a/...starred_null-compact_true-header_image-secondary_button-editable_false-base.png b/...starred_null-compact_true-header_image-secondary_button-editable_false-base.png
diff --git a/...-starred_null-compact_true-header_image-secondary_button-editable_true-base.png b/...-starred_null-compact_true-header_image-secondary_button-editable_true-base.png
diff --git a/...l-starred_null-compact_true-header_image-secondary_none-editable_false-base.png b/...l-starred_null-compact_true-header_image-secondary_none-editable_false-base.png
diff --git a/...ll-starred_null-compact_true-header_image-secondary_none-editable_true-base.png b/...ll-starred_null-compact_true-header_image-secondary_none-editable_true-base.png
diff --git a/...-starred_null-compact_true-header_none-secondary_button-editable_false-base.png b/...-starred_null-compact_true-header_none-secondary_button-editable_false-base.png
diff --git a/...l-starred_null-compact_true-header_none-secondary_button-editable_true-base.png b/...l-starred_null-compact_true-header_none-secondary_button-editable_true-base.png
diff --git a/...ll-starred_null-compact_true-header_none-secondary_none-editable_false-base.png b/...ll-starred_null-compact_true-header_none-secondary_none-editable_false-base.png
diff --git a/...ull-starred_null-compact_true-header_none-secondary_none-editable_true-base.png b/...ull-starred_null-compact_true-header_none-secondary_none-editable_true-base.png
diff --git a/...starred_true-compact_true-header_image-secondary_button-editable_false-base.png b/...starred_true-compact_true-header_image-secondary_button-editable_false-base.png
diff --git a/...-starred_true-compact_true-header_image-secondary_button-editable_true-base.png b/...-starred_true-compact_true-header_image-secondary_button-editable_true-base.png
diff --git a/...l-starred_true-compact_true-header_image-secondary_none-editable_false-base.png b/...l-starred_true-compact_true-header_image-secondary_none-editable_false-base.png
diff --git a/...ll-starred_true-compact_true-header_image-secondary_none-editable_true-base.png b/...ll-starred_true-compact_true-header_image-secondary_none-editable_true-base.png
diff --git a/...-starred_true-compact_true-header_none-secondary_button-editable_false-base.png b/...-starred_true-compact_true-header_none-secondary_button-editable_false-base.png
diff --git a/...l-starred_true-compact_true-header_none-secondary_button-editable_true-base.png b/...l-starred_true-compact_true-header_none-secondary_button-editable_true-base.png
diff --git a/...ll-starred_true-compact_true-header_none-secondary_none-editable_false-base.png b/...ll-starred_true-compact_true-header_none-secondary_none-editable_false-base.png
diff --git a/...ull-starred_true-compact_true-header_none-secondary_none-editable_true-base.png b/...ull-starred_true-compact_true-header_none-secondary_none-editable_true-base.png
diff --git a/...tarred_false-compact_true-header_image-secondary_button-editable_false-base.png b/...tarred_false-compact_true-header_image-secondary_button-editable_false-base.png
diff --git a/...starred_false-compact_true-header_image-secondary_button-editable_true-base.png b/...starred_false-compact_true-header_image-secondary_button-editable_true-base.png
diff --git a/...-starred_false-compact_true-header_image-secondary_none-editable_false-base.png b/...-starred_false-compact_true-header_image-secondary_none-editable_false-base.png
diff --git a/...e-starred_false-compact_true-header_image-secondary_none-editable_true-base.png b/...e-starred_false-compact_true-header_image-secondary_none-editable_true-base.png
diff --git a/...starred_false-compact_true-header_none-secondary_button-editable_false-base.png b/...starred_false-compact_true-header_none-secondary_button-editable_false-base.png
diff --git a/...-starred_false-compact_true-header_none-secondary_button-editable_true-base.png b/...-starred_false-compact_true-header_none-secondary_button-editable_true-base.png
diff --git a/...e-starred_false-compact_true-header_none-secondary_none-editable_false-base.png b/...e-starred_false-compact_true-header_none-secondary_none-editable_false-base.png
diff --git a/...ue-starred_false-compact_true-header_none-secondary_none-editable_true-base.png b/...ue-starred_false-compact_true-header_none-secondary_none-editable_true-base.png
diff --git a/...starred_null-compact_true-header_image-secondary_button-editable_false-base.png b/...starred_null-compact_true-header_image-secondary_button-editable_false-base.png
diff --git a/...-starred_null-compact_true-header_image-secondary_button-editable_true-base.png b/...-starred_null-compact_true-header_image-secondary_button-editable_true-base.png
diff --git a/...e-starred_null-compact_true-header_image-secondary_none-editable_false-base.png b/...e-starred_null-compact_true-header_image-secondary_none-editable_false-base.png
diff --git a/...ue-starred_null-compact_true-header_image-secondary_none-editable_true-base.png b/...ue-starred_null-compact_true-header_image-secondary_none-editable_true-base.png
diff --git a/...-starred_null-compact_true-header_none-secondary_button-editable_false-base.png b/...-starred_null-compact_true-header_none-secondary_button-editable_false-base.png
diff --git a/...e-starred_null-compact_true-header_none-secondary_button-editable_true-base.png b/...e-starred_null-compact_true-header_none-secondary_button-editable_true-base.png
diff --git a/...ue-starred_null-compact_true-header_none-secondary_none-editable_false-base.png b/...ue-starred_null-compact_true-header_none-secondary_none-editable_false-base.png
diff --git a/...rue-starred_null-compact_true-header_none-secondary_none-editable_true-base.png b/...rue-starred_null-compact_true-header_none-secondary_none-editable_true-base.png
diff --git a/...starred_true-compact_true-header_image-secondary_button-editable_false-base.png b/...starred_true-compact_true-header_image-secondary_button-editable_false-base.png
diff --git a/...-starred_true-compact_true-header_image-secondary_button-editable_true-base.png b/...-starred_true-compact_true-header_image-secondary_button-editable_true-base.png
diff --git a/...e-starred_true-compact_true-header_image-secondary_none-editable_false-base.png b/...e-starred_true-compact_true-header_image-secondary_none-editable_false-base.png
diff --git a/...ue-starred_true-compact_true-header_image-secondary_none-editable_true-base.png b/...ue-starred_true-compact_true-header_image-secondary_none-editable_true-base.png
diff --git a/...-starred_true-compact_true-header_none-secondary_button-editable_false-base.png b/...-starred_true-compact_true-header_none-secondary_button-editable_false-base.png
diff --git a/...e-starred_true-compact_true-header_none-secondary_button-editable_true-base.png b/...e-starred_true-compact_true-header_none-secondary_button-editable_true-base.png
diff --git a/...ue-starred_true-compact_true-header_none-secondary_none-editable_false-base.png b/...ue-starred_true-compact_true-header_none-secondary_none-editable_false-base.png
diff --git a/...rue-starred_true-compact_true-header_none-secondary_none-editable_true-base.png b/...rue-starred_true-compact_true-header_none-secondary_none-editable_true-base.png
diff --git a/...arred_false-compact_false-header_image-secondary_button-editable_false-base.png b/...arred_false-compact_false-header_image-secondary_button-editable_false-base.png
diff --git a/...tarred_false-compact_false-header_image-secondary_button-editable_true-base.png b/...tarred_false-compact_false-header_image-secondary_button-editable_true-base.png
diff --git a/...starred_false-compact_false-header_image-secondary_none-editable_false-base.png b/...starred_false-compact_false-header_image-secondary_none-editable_false-base.png
diff --git a/...-starred_false-compact_false-header_image-secondary_none-editable_true-base.png b/...-starred_false-compact_false-header_image-secondary_none-editable_true-base.png
diff --git a/...tarred_false-compact_false-header_none-secondary_button-editable_false-base.png b/...tarred_false-compact_false-header_none-secondary_button-editable_false-base.png
diff --git a/...starred_false-compact_false-header_none-secondary_button-editable_true-base.png b/...starred_false-compact_false-header_none-secondary_button-editable_true-base.png
diff --git a/...-starred_false-compact_false-header_none-secondary_none-editable_false-base.png b/...-starred_false-compact_false-header_none-secondary_none-editable_false-base.png
diff --git a/...l-starred_false-compact_false-header_none-secondary_none-editable_true-base.png b/...l-starred_false-compact_false-header_none-secondary_none-editable_true-base.png
diff --git a/...tarred_null-compact_false-header_image-secondary_button-editable_false-base.png b/...tarred_null-compact_false-header_image-secondary_button-editable_false-base.png
diff --git a/...starred_null-compact_false-header_image-secondary_button-editable_true-base.png b/...starred_null-compact_false-header_image-secondary_button-editable_true-base.png
diff --git a/...-starred_null-compact_false-header_image-secondary_none-editable_false-base.png b/...-starred_null-compact_false-header_image-secondary_none-editable_false-base.png
diff --git a/...l-starred_null-compact_false-header_image-secondary_none-editable_true-base.png b/...l-starred_null-compact_false-header_image-secondary_none-editable_true-base.png
diff --git a/...starred_null-compact_false-header_none-secondary_button-editable_false-base.png b/...starred_null-compact_false-header_none-secondary_button-editable_false-base.png
diff --git a/...-starred_null-compact_false-header_none-secondary_button-editable_true-base.png b/...-starred_null-compact_false-header_none-secondary_button-editable_true-base.png
diff --git a/...l-starred_null-compact_false-header_none-secondary_none-editable_false-base.png b/...l-starred_null-compact_false-header_none-secondary_none-editable_false-base.png
diff --git a/...ll-starred_null-compact_false-header_none-secondary_none-editable_true-base.png b/...ll-starred_null-compact_false-header_none-secondary_none-editable_true-base.png
diff --git a/...tarred_true-compact_false-header_image-secondary_button-editable_false-base.png b/...tarred_true-compact_false-header_image-secondary_button-editable_false-base.png
diff --git a/...starred_true-compact_false-header_image-secondary_button-editable_true-base.png b/...starred_true-compact_false-header_image-secondary_button-editable_true-base.png
diff --git a/...-starred_true-compact_false-header_image-secondary_none-editable_false-base.png b/...-starred_true-compact_false-header_image-secondary_none-editable_false-base.png
diff --git a/...l-starred_true-compact_false-header_image-secondary_none-editable_true-base.png b/...l-starred_true-compact_false-header_image-secondary_none-editable_true-base.png
diff --git a/...starred_true-compact_false-header_none-secondary_button-editable_false-base.png b/...starred_true-compact_false-header_none-secondary_button-editable_false-base.png
diff --git a/...-starred_true-compact_false-header_none-secondary_button-editable_true-base.png b/...-starred_true-compact_false-header_none-secondary_button-editable_true-base.png
diff --git a/...l-starred_true-compact_false-header_none-secondary_none-editable_false-base.png b/...l-starred_true-compact_false-header_none-secondary_none-editable_false-base.png
diff --git a/...ll-starred_true-compact_false-header_none-secondary_none-editable_true-base.png b/...ll-starred_true-compact_false-header_none-secondary_none-editable_true-base.png
diff --git a/...arred_false-compact_false-header_image-secondary_button-editable_false-base.png b/...arred_false-compact_false-header_image-secondary_button-editable_false-base.png
diff --git a/...tarred_false-compact_false-header_image-secondary_button-editable_true-base.png b/...tarred_false-compact_false-header_image-secondary_button-editable_true-base.png
diff --git a/...starred_false-compact_false-header_image-secondary_none-editable_false-base.png b/...starred_false-compact_false-header_image-secondary_none-editable_false-base.png
diff --git a/...-starred_false-compact_false-header_image-secondary_none-editable_true-base.png b/...-starred_false-compact_false-header_image-secondary_none-editable_true-base.png
diff --git a/...tarred_false-compact_false-header_none-secondary_button-editable_false-base.png b/...tarred_false-compact_false-header_none-secondary_button-editable_false-base.png
diff --git a/...starred_false-compact_false-header_none-secondary_button-editable_true-base.png b/...starred_false-compact_false-header_none-secondary_button-editable_true-base.png
diff --git a/...-starred_false-compact_false-header_none-secondary_none-editable_false-base.png b/...-starred_false-compact_false-header_none-secondary_none-editable_false-base.png
diff --git a/...e-starred_false-compact_false-header_none-secondary_none-editable_true-base.png b/...e-starred_false-compact_false-header_none-secondary_none-editable_true-base.png
diff --git a/...tarred_null-compact_false-header_image-secondary_button-editable_false-base.png b/...tarred_null-compact_false-header_image-secondary_button-editable_false-base.png
diff --git a/...starred_null-compact_false-header_image-secondary_button-editable_true-base.png b/...starred_null-compact_false-header_image-secondary_button-editable_true-base.png
diff --git a/...-starred_null-compact_false-header_image-secondary_none-editable_false-base.png b/...-starred_null-compact_false-header_image-secondary_none-editable_false-base.png
diff --git a/...e-starred_null-compact_false-header_image-secondary_none-editable_true-base.png b/...e-starred_null-compact_false-header_image-secondary_none-editable_true-base.png
diff --git a/...starred_null-compact_false-header_none-secondary_button-editable_false-base.png b/...starred_null-compact_false-header_none-secondary_button-editable_false-base.png
diff --git a/...-starred_null-compact_false-header_none-secondary_button-editable_true-base.png b/...-starred_null-compact_false-header_none-secondary_button-editable_true-base.png
diff --git a/...e-starred_null-compact_false-header_none-secondary_none-editable_false-base.png b/...e-starred_null-compact_false-header_none-secondary_none-editable_false-base.png
diff --git a/...ue-starred_null-compact_false-header_none-secondary_none-editable_true-base.png b/...ue-starred_null-compact_false-header_none-secondary_none-editable_true-base.png
diff --git a/...tarred_true-compact_false-header_image-secondary_button-editable_false-base.png b/...tarred_true-compact_false-header_image-secondary_button-editable_false-base.png
diff --git a/...starred_true-compact_false-header_image-secondary_button-editable_true-base.png b/...starred_true-compact_false-header_image-secondary_button-editable_true-base.png
diff --git a/...-starred_true-compact_false-header_image-secondary_none-editable_false-base.png b/...-starred_true-compact_false-header_image-secondary_none-editable_false-base.png
diff --git a/...e-starred_true-compact_false-header_image-secondary_none-editable_true-base.png b/...e-starred_true-compact_false-header_image-secondary_none-editable_true-base.png
diff --git a/...starred_true-compact_false-header_none-secondary_button-editable_false-base.png b/...starred_true-compact_false-header_none-secondary_button-editable_false-base.png
diff --git a/...-starred_true-compact_false-header_none-secondary_button-editable_true-base.png b/...-starred_true-compact_false-header_none-secondary_button-editable_true-base.png
diff --git a/...e-starred_true-compact_false-header_none-secondary_none-editable_false-base.png b/...e-starred_true-compact_false-header_none-secondary_none-editable_false-base.png
diff --git a/...ue-starred_true-compact_false-header_none-secondary_none-editable_true-base.png b/...ue-starred_true-compact_false-header_none-secondary_none-editable_true-base.png
diff --git a/src/components/AppSidebar/AppSidebar.vue b/src/components/AppSidebar/AppSidebar.vue
@@ -151,8 +151,10 @@ include a standard-header like it's used by the files app.
 				<a
 					v-tooltip.auto="closeTranslated"
 					href="#"
-					class="app-sidebar__close icon-close"
-					@click.prevent="closeSidebar" />
+					class="app-sidebar__close"
+					@click.prevent="closeSidebar">
+					<Close class="app-sidebar__close-icon" :size="24" decorative />
+				</a>
 
 				<!-- container for figure and description, allows easy switching to compact mode -->
 				<div class="app-sidebar-header__info">
@@ -266,13 +268,16 @@ import EmptyContent from '../EmptyContent/EmptyContent'
 import { t } from '../../l10n'
 import { directive as ClickOutside } from 'v-click-outside'
 
+import Close from 'vue-material-design-icons/Close.vue'
+
 export default {
 	name: 'AppSidebar',
 
 	components: {
 		Actions,
 		AppSidebarTabs,
 		EmptyContent,
+		Close,
 	},
 
 	directives: {
@@ -596,6 +601,11 @@ $top-buttons-spacing: 6px;
 				opacity: $opacity_full;
 				background-color: $action-background-hover;
 			}
+
+			.app-sidebar__close-icon {
+				width: $clickable-area;
+				height: $clickable-area;
+			}
 		}
 
 		// Compact mode only affects a sidebar with a figure