Merge pull request #22415 from nextcloud/backport/22358/stable18

[stable18] fix event icon sizes and text alignment
nextcloud · Aug 26, 2020 · ab575c9 · ab575c9
2 parents a2f8cae + 20ee1d6
commit ab575c9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 21 deletions.
diff --git a/apps/workflowengine/js/workflowengine.js b/apps/workflowengine/js/workflowengine.js
diff --git a/apps/workflowengine/js/workflowengine.js.map b/apps/workflowengine/js/workflowengine.js.map
diff --git a/apps/workflowengine/src/components/Event.vue b/apps/workflowengine/src/components/Event.vue
@@ -83,10 +83,7 @@ export default {
 	}
 	.isComplex {
 		img {
-			vertical-align: top;
-			padding-top: 4px;
-			padding-bottom: 4px;
-			padding-left: 4px;
+			vertical-align: text-top;
 		}
 		span {
 			padding-top: 2px;
@@ -130,6 +127,11 @@ export default {
 		font-weight: 900;
 	}
 
+	.option__icon {
+		width: 16px;
+		height: 16px;
+	}
+
 	.eventlist img,
 	.eventlist .text {
 		vertical-align: middle;

diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue
@@ -232,21 +232,22 @@ export default {
 	.trigger p, .action p {
 		min-height: 34px;
 		display: flex;
-		align-items: center;
 
 		& > span {
 			min-width: 50px;
 			text-align: right;
 			color: var(--color-text-maxcontrast);
 			padding-right: 10px;
-			padding-top: 7px;
-			margin-bottom: auto;
+			padding-top: 6px;
 		}
 		.multiselect {
 			flex-grow: 1;
 			max-width: 300px;
 		}
 	}
+	.trigger p:first-child span {
+			padding-top: 3px;
+	}
 
 	.check--add {
 		background-position: 7px center;