fix: conflicts

luka-nextcloud · luka-nextcloud · commit 79284bce37b7 · 2022-06-21T09:42:15.000+02:00
Signed-off-by: Luka Trovic &lt;luka@nextcloud.com&gt;
diff --git a/css/style.scss b/css/style.scss
@@ -73,3 +73,12 @@ li.ProseMirror-selectednode:after {
     transform: translate3d(0, 0, 0);
   }
 }
+
+#viewer > div.modal-header > div.modal-title {
+  font-weight: bold;
+}
+
+#viewer > div.modal-header {
+  background-color: var(--color-main-background);
+  border-top: 3px solid var(--color-primary-element);
+}

Original file line number	Diff line number	Diff line change
`@@ -73,3 +73,12 @@ li.ProseMirror-selectednode:after {`
`73`	`73`	`transform: translate3d(0, 0, 0);`
`74`	`74`	`}`
`75`	`75`	`}`
	`76`	`+`
	`77`	`+#viewer > div.modal-header > div.modal-title {`
	`78`	`+ font-weight: bold;`
	`79`	`+}`
	`80`	`+`
	`81`	`+#viewer > div.modal-header {`
	`82`	`+ background-color: var(--color-main-background);`
	`83`	`+ border-top: 3px solid var(--color-primary-element);`
	`84`	`+}`