Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master

2013-05-21 09:47:11 -04:00
parent a44e816877 073c6d9a79
commit 094e396556
6 changed files with 37 additions and 31 deletions
--- a/common/static/sass/_mixins.scss
+++ b/common/static/sass/_mixins.scss
@@ -8,7 +8,7 @@
 }

 // mixins - line height
-@mixin lh($fontSize: auto){
+@mixin line-height($fontSize: auto){
  line-height: ($fontSize*1.48) + px;
  line-height: (($fontSize/10)*1.48) + rem;
 }