From 8f606e3aa2b470eed91e49bc848da12d23144c1d Mon Sep 17 00:00:00 2001
From: John Marcus <johnmarcusdev@gmail.com>
Date: Wed, 2 Mar 2016 17:16:40 -0800
Subject: [PATCH] Fix bug with carousel minHeight. Update appStyle.

---
 scripts/buildfire/components/carousel/carousel.js | 6 +++++-
 styles/appStyle.css                               | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/buildfire/components/carousel/carousel.js b/scripts/buildfire/components/carousel/carousel.js
index 9ba3ed30..844f2b0a 100644
--- 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
index 4eb442c3..f91aec00 100644
--- 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;