Merging in open1248, resolve conflicts

2015-06-16 14:07:53 -07:00
parent 4887ba0e58 c6c4fa7182
commit c428df524c
7 changed files with 81 additions and 88 deletions
--- a/platform/commonUI/general/res/sass/_constants.scss
+++ b/platform/commonUI/general/res/sass/_constants.scss
@@ -152,6 +152,9 @@ $imageThumbPad: 1px;
 // Bubbles
 $bubbleArwSize: 10px;
 $bubblePad: $interiorMargin;
+$bubbleMinW: 100px;
+$bubbleMaxW: 300px;
+

 // Timing
-$controlFadeMs: 100ms;
+$controlFadeMs: 100ms;