Merge pull request #198 from jdm135/master

Fix bug with carousel minHeight. Update appStyle.
BuildFire · Mar 3, 2016 · 0494c69 · 0494c69
2 parents e5d9108 + 8f606e3
commit 0494c69
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/scripts/buildfire/components/carousel/carousel.js b/scripts/buildfire/components/carousel/carousel.js
@@ -376,7 +376,11 @@ buildfire.components.carousel.view.prototype = {
         }
 
         this.cssWidth = this.width + "px";
-        this.cssHeight = this.height + "px";
+		if(this.height > 380){
+			this.cssHeight = '380px';
+		}else{
+			this.cssHeight = this.height + "px";			
+		}
 
 		// Set Min height on carousel so doesn't push content down on load.
 		this._minHeight = '180px';

diff --git a/styles/appStyle.css b/styles/appStyle.css
@@ -9,6 +9,9 @@
 	-webkit-tap-highlight-color: transparent;
 	-webkit-tap-highlight-color:rgba(0,0,0,0);
 	-webkit-touch-callout: none;
+}
+/* Prevent user selection on everything except input/textarea */
+*:not(input):not(textarea){
 	-webkit-user-select: none;
 	-khtml-user-select: none;
  	-moz-user-select: none;