[Merge] Merging open-master in; resolved conflicts

2015-06-15 16:47:23 -07:00
parent 043a2ed581 db0cd9cf3a
commit d8a66b426f
5 changed files with 154 additions and 29 deletions
--- a/platform/commonUI/general/res/sass/controls/_buttons.scss
+++ b/platform/commonUI/general/res/sass/controls/_buttons.scss
@@ -59,6 +59,7 @@ $pad: $interiorMargin * $baseRatio;
 	@include box-sizing(border-box);
 	@include text-shadow(rgba(black, 0.3) 0 1px 1px);
 	cursor: pointer;
+	line-height: 1.2em;
 	text-decoration: none;
 	&.major {
 		$bg: $colorKey;
@@ -147,4 +148,14 @@ a.btn span,
 a.l-btn,
 a.l-btn span {
 	display: inline-block;
+}
+
+.l-btn {
+	padding: 0 $pad;
+	&.sm {
+		padding: 0 $interiorMargin;
+	}
+	&.vsm {
+		padding: 0 $interiorMargin/2;
+	}
 }