Add modal clear view timeout and modal title

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
nextcloud-libraries · Feb 26, 2019 · 95a28f3 · 95a28f3
1 parent de16d5e
commit 95a28f3
Show file tree

Hide file tree

Showing 6 changed files with 240 additions and 62 deletions.
diff --git a/src/assets/iconfont/close.svg b/src/assets/iconfont/close.svg
diff --git a/src/assets/iconfont/more.svg b/src/assets/iconfont/more.svg
diff --git a/src/assets/iconfont/pause.svg b/src/assets/iconfont/pause.svg
diff --git a/src/assets/iconfont/play.svg b/src/assets/iconfont/play.svg
diff --git a/src/components/Action/Action.vue b/src/components/Action/Action.vue
@@ -28,8 +28,7 @@
 		v-on="isSingleAction && firstAction.action ? { click: firstAction.action } : {}">
 		<!-- If more than one action, create a popovermenu -->
 		<template v-if="!isSingleAction">
-			<div v-click-outside="closeMenu" tabindex="0" class="action-item__menutoggle"
-				:class="moreIconClass"
+			<div v-click-outside="closeMenu" tabindex="0" class="icon action-item__menutoggle"
 				@click.prevent="toggleMenu" />
 			<div :class="{ 'open': opened }" class="action-item__menu popovermenu">
 				<popover-menu :menu="actions" />
@@ -70,10 +69,6 @@ export default {
 					}
 				]
 			}
-		},
-		forceWhite: {
-			type: Boolean,
-			default: false
 		}
 	},
 	data() {
@@ -87,9 +82,6 @@ export default {
 		},
 		firstAction() {
 			return this.actions[0]
-		},
-		moreIconClass() {
-			return `icon-more${this.forceWhite ? '-white' : ''}`
 		}
 	},
 	mounted() {
@@ -113,6 +105,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import '~Fonts/scss/iconfont-vue';
+
 .action-item {
 	display: inline-block;
 
@@ -128,6 +122,7 @@ export default {
 	// icon-more
 	&__menutoggle {
 		display: inline-block;
+		@include iconfont('more');
 	}
 	// properly position the menu
 	&--multiple {