AUI-458 - Italic and strong tags conflict when combined

liferay · Mar 1, 2012 · 75b2a0d · 75b2a0d
1 parent eced696
commit 75b2a0d
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 7 deletions.
diff --git a/build/aui-skin-base/css/aui-skin-base-min.css b/build/aui-skin-base/css/aui-skin-base-min.css
diff --git a/build/aui-skin-base/css/aui-skin-base.css b/build/aui-skin-base/css/aui-skin-base.css
@@ -15,7 +15,7 @@ fieldset, img {
 	border-width: 0;
 }
 
-address, caption, cite, code, dfn, em, strong, th, var {
+address, caption, cite, code, dfn, th, var {
 	font-style: normal;
 	font-weight: normal;
 }

diff --git a/build/aui-skin-base/css/reset.css b/build/aui-skin-base/css/reset.css
@@ -15,7 +15,7 @@ fieldset, img {
 	border-width: 0;
 }
 
-address, caption, cite, code, dfn, em, strong, th, var {
+address, caption, cite, code, dfn, th, var {
 	font-style: normal;
 	font-weight: normal;
 }

diff --git a/build/aui-skin-classic/css/aui-skin-classic-all-min.css b/build/aui-skin-classic/css/aui-skin-classic-all-min.css
diff --git a/build/aui-skin-classic/css/aui-skin-classic-all.css b/build/aui-skin-classic/css/aui-skin-classic-all.css
@@ -15,7 +15,7 @@ fieldset, img {
 	border-width: 0;
 }
 
-address, caption, cite, code, dfn, em, strong, th, var {
+address, caption, cite, code, dfn, th, var {
 	font-style: normal;
 	font-weight: normal;
 }
@@ -201,6 +201,8 @@ hr, .separator {
 	-webkit-transform-origin: 0 0;
 	/*Change IE7 to using fixed*/
 	*position: fixed !important;
+	/*...And reset back to absolute for IE6*/
+	_position: absolute !important;
 }
 
 .aui-helper-force-offset {

diff --git a/build/aui-skin-classic/css/base.css b/build/aui-skin-classic/css/base.css
@@ -71,6 +71,8 @@
 	-webkit-transform-origin: 0 0;
 	/*Change IE7 to using fixed*/
 	*position: fixed !important;
+	/*...And reset back to absolute for IE6*/
+	_position: absolute !important;
 }
 
 .aui-helper-force-offset {

diff --git a/build/aui-skin-classic/css/reset.css b/build/aui-skin-classic/css/reset.css
@@ -15,7 +15,7 @@ fieldset, img {
 	border-width: 0;
 }
 
-address, caption, cite, code, dfn, em, strong, th, var {
+address, caption, cite, code, dfn, th, var {
 	font-style: normal;
 	font-weight: normal;
 }

diff --git a/src/aui-skin-base/css/reset.css b/src/aui-skin-base/css/reset.css
@@ -15,7 +15,7 @@ fieldset, img {
 	border-width: 0;
 }
 
-address, caption, cite, code, dfn, em, strong, th, var {
+address, caption, cite, code, dfn, th, var {
 	font-style: normal;
 	font-weight: normal;
 }