[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/_constants.scss
+++ b/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%;