update: merge conflict resolved + fixes

2021-01-21 23:54:20 +01:00
parent ef2b2295e4 32b055c2db
commit bc64019b63
28 changed files with 274 additions and 239 deletions
--- a/src/styles/content/_index.scss
+++ b/src/styles/content/_index.scss
@ -166,3 +166,11 @@ main {
    border: 3px solid white;                  /* creates padding around scroll thumb */
  }
 }
+
+
+solid-display-value-markdown {
+  
+  p {
+    margin: 0;
+  }
+}