From 61d62bd1c7d884f1eebb1347fbeea5117015ff10 Mon Sep 17 00:00:00 2001 From: qiu-deqing Date: Wed, 30 Jul 2014 00:01:06 +0800 Subject: [PATCH 1/2] update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 81d3796..d17c32e 100644 --- a/README.md +++ b/README.md @@ -242,7 +242,7 @@ Content-Type: text/html; charset=iso-8859-1 2.不会在元素前后进行换行 3.受``white-space``控制 4.``margin/padding``在竖直方向上无效，水平方向上有效 -5.``width/height``属性无效 +5.``width/height``属性对非替换行内元素无效 6.浮动或绝对定位时会转换为``block`` 7.``vertical-align``属性生效 From 08ec55c181e3e7e450ac588e2285c954a865a7c2 Mon Sep 17 00:00:00 2001 From: qiu-deqing Date: Wed, 30 Jul 2014 00:10:38 +0800 Subject: [PATCH 2/2] update --- README.md | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f63a2e9..87abdca 100644 --- a/README.md +++ b/README.md @@ -257,11 +257,8 @@ Content-Type: text/html; charset=iso-8859-1 2.不会在元素前后进行换行 3.受``white-space``控制 4.``margin/padding``在竖直方向上无效，水平方向上有效 -<<<<<<< HEAD -5.``width/height``属性对非替换行内元素无效 -======= -5.``width/height``属性无效，宽度由元素内容决定 ->>>>>>> 5e53497e4b4940323a54ca6a8f214611c4b4a836 +5.``width/height``属性对非替换行内元素无效，宽度由元素内容决定 +6.非替换行内元素的行框高由``line-height``确定，替换行内元素的行框高由``height``,``margin``,``padding``,``border``决定 6.浮动或绝对定位时会转换为``block`` 7.``vertical-align``属性生效