Merge remote-tracking branch 'upstream/master' into node-requirable

Conflicts:
	Gruntfile.js

1 files changed, 4 insertions, 9 deletions

diff --git a/less/type.less b/less/type.less
index 93414474a..6ab3c0804 100644
--- a/less/type.less
+++ b/less/type.less
@@ -74,15 +74,10 @@ p {
 // Emphasis & misc
 // -------------------------
 
-// Ex: 14px base font * 85% = about 12px
+// Ex: (12px small font / 14px base font) * 100% = about 85%
 small,
 .small {
-  font-size: 85%;
-}
-
-// Undo browser default styling
-cite {
-  font-style: normal;
+  font-size: floor((100% * @font-size-small / @font-size-base));
 }
 
 mark,
@@ -219,13 +214,13 @@ dd {
   @media (min-width: @grid-float-breakpoint) {
     dt {
       float: left;
-      width: (@component-offset-horizontal - 20);
+      width: (@dl-horizontal-offset - 20);
       clear: left;
       text-align: right;
       .text-overflow();
     }
     dd {
-      margin-left: @component-offset-horizontal;
+      margin-left: @dl-horizontal-offset;
     }
   }
 }