[Merge] Merging open-master in; resolved conflicts

platform/commonUI/general/res/sass/_constants.scss

@@ -62,6 +62,11 @@ $colorInfoBubbleFg: #666;
 $colorInfoBubbleBg: #ddd;
 $colorThumbsBubbleFg: lighten($colorBodyFg, 10%);
 $colorThumbsBubbleBg: lighten($colorBodyBg, 10%);
+$colorLimitYellow: #9d7500;
+$colorLimitRed: #aa0000;
+$colorTelemFresh: #fff;
+$colorTelemStale: #888;
+$styleTelemState: italic;
 
 // Ratios
 $ltGamma: 20%;

platform/commonUI/general/res/sass/_main.scss

@@ -47,6 +47,7 @@
 @import "controls/menus";
 @import "features/imagery";
 @import "features/time-display";
+@import "controls/time-controller";
 @import "forms/mixins";
 @import "forms/elems";
 @import "forms/validation";

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;
+	}
 }