Merge "Fix code blocks within sub-elements in markdown"
diff --git a/polygerrit-ui/app/elements/shared/gr-markdown/gr-markdown.ts b/polygerrit-ui/app/elements/shared/gr-markdown/gr-markdown.ts
index 50f0602..c315603 100644
--- a/polygerrit-ui/app/elements/shared/gr-markdown/gr-markdown.ts
+++ b/polygerrit-ui/app/elements/shared/gr-markdown/gr-markdown.ts
@@ -80,9 +80,9 @@
         /* Pre will preserve whitespace and line breaks but not wrap */
         white-space: pre;
       }
-      /* Code within a sentence needs display:inline to shrink and not take a
-         whole row */
-      p code {
+      /* Non-multiline code elements need display:inline to shrink and not take
+         a whole row */
+      :not(pre) > code {
         display: inline;
       }
       p {