Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule

2013-02-19 15:21:47 -05:00
parent 4d57f1b9ee 821e2d06e9
commit 2b01ecc1af
4 changed files with 11 additions and 3 deletions
--- a/common/lib/xmodule/xmodule/css/html/display.scss
+++ b/common/lib/xmodule/xmodule/css/html/display.scss
@@ -49,10 +49,18 @@ p {

 em, i {
  font-style: italic;
+
+  span {
+    font-style: italic;
+  }
 }

 strong, b {
  font-weight: bold;
+
+  span {
+    font-weight: bold;
+  }
 }

 p + p, ul + p, ol + p {