[MAINTAIN-166] fix conflict

ymcatwincities · Sep 21, 2021 · 9f9b777 · 9f9b777
1 parent 2071069
commit 9f9b777
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/themes/openy_themes/openy_carnation/dist/css/style.css b/themes/openy_themes/openy_carnation/dist/css/style.css
diff --git a/themes/openy_themes/openy_carnation/src/scss/modules/_blog.scss b/themes/openy_themes/openy_carnation/src/scss/modules/_blog.scss
@@ -89,8 +89,13 @@
   ol, ul {
     margin: 1rem 0;
   }
+
+  img {
+    height: auto;
+    width: 100%;
+  }
 }
 
 .view-mode-node-blog img {
   border-radius: 1rem;
-}
+}