add article img (Tencent#339)

* add article img
sign1 · Apr 27, 2016 · b37830b · b37830b
1 parent 9ad4230
commit b37830b
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 2 deletions.
diff --git a/dist/example/images/pic_article.png b/dist/example/images/pic_article.png
diff --git a/dist/example/images/pic_article_1.jpg b/dist/example/images/pic_article_1.jpg
diff --git a/dist/example/images/pic_article_2.jpg b/dist/example/images/pic_article_2.jpg
diff --git a/dist/example/index.html b/dist/example/index.html
@@ -569,6 +569,10 @@ <h3>1.1 节标题</h3>
                     tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
                     quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
                     consequat. Duis aute</p>
+                <p>
+                    <img src="./images/pic_article.png" alt="">
+                    <img src="./images/pic_article.png" alt="">
+                </p>
             </section>
             <section>
                 <h3>1.2 节标题</h3>

diff --git a/dist/style/weui.css b/dist/style/weui.css
diff --git a/dist/style/weui.min.css b/dist/style/weui.min.css
diff --git a/src/example/fragment/article.html b/src/example/fragment/article.html
@@ -12,6 +12,10 @@ <h3>1.1 节标题</h3>
                     tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
                     quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
                     consequat. Duis aute</p>
+                <p>
+                    <img src="./images/pic_article.png" alt="">
+                    <img src="./images/pic_article.png" alt="">
+                </p>
             </section>
             <section>
                 <h3>1.2 节标题</h3>

diff --git a/src/example/images/pic_article.png b/src/example/images/pic_article.png
diff --git a/src/style/widget/weui_page/weui_article.less b/src/style/widget/weui_page/weui_article.less
@@ -20,4 +20,13 @@
         font-weight:400;
         font-size: 15px;
     }
+    * {
+        max-width: 100%;
+        -webkit-box-sizing: border-box;
+        box-sizing: border-box;
+        word-wrap: break-word;
+    }
+    p {
+        margin: 10px 0;
+    }
 }