From e824b4901817429231cd9ab6aa068cc0a0849e3a Mon Sep 17 00:00:00 2001
From: Jose Antonio Marquez
Date: Wed, 1 Feb 2012 10:16:16 -0800
Subject: Applying global button styles to cloud popup

---
 js/io/ui/cloudpopup.reel/cloudpopup.html     |  6 +++---
 js/io/ui/cloudpopup.reel/cloudpopup.js       |  6 +++---
 js/io/ui/cloudpopup.reel/css/cloudpopup.css  | 29 ++++------------------------
 js/io/ui/cloudpopup.reel/css/cloudpopup.scss | 24 +----------------------
 4 files changed, 11 insertions(+), 54 deletions(-)

(limited to 'js/io')

diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.html b/js/io/ui/cloudpopup.reel/cloudpopup.html
index 5d7de347..fa4533d7 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.html
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.html
@@ -38,13 +38,13 @@
 	    		
 	    		<label for="cloud_url">Cloud Server URL:</label><input type="text" id="cloud_url" class="cloud_url" value="http://localhost:16380" />
 	    		
-	    		<button class="btn_test">Test</button>
+	    		<button class="btn_test nj-skinned">Test</button>
 	    		
 	    		<label>Status:</label><div class="status">&nbsp;</div>
 	    		
-	    		<button class="btn_cancel">Cancel</button>
+	    		<button class="btn_cancel nj-skinned">Cancel</button>
 	    		
-	    		<button class="btn_ok">Ok</button>
+	    		<button class="btn_ok nj-skinned">Ok</button>
 	    		
 	    	</div>
     	</div>
diff --git a/js/io/ui/cloudpopup.reel/cloudpopup.js b/js/io/ui/cloudpopup.reel/cloudpopup.js
index d256f226..e8558179 100755
--- a/js/io/ui/cloudpopup.reel/cloudpopup.js
+++ b/js/io/ui/cloudpopup.reel/cloudpopup.js
@@ -28,9 +28,9 @@ exports.CloudPopup = Montage.create(Component, {
     	enumerable: false,
     	value: function () {
     		//
-    		this.components.test_btn = this.element.getElementsByClassName('btn_test')[0];
-    		this.components.ok_btn = this.element.getElementsByClassName('btn_ok')[0];
-    		this.components.cancel_btn = this.element.getElementsByClassName('btn_cancel')[0];
+    		this.components.test_btn = this.element.getElementsByClassName('btn_test nj-skinned')[0];
+    		this.components.ok_btn = this.element.getElementsByClassName('btn_ok nj-skinned')[0];
+    		this.components.cancel_btn = this.element.getElementsByClassName('btn_cancel nj-skinned')[0];
     		this.components.status = this.element.getElementsByClassName('status')[0];
     		this.components.url = this.element.getElementsByClassName('cloud_url')[0];
     	}
diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.css b/js/io/ui/cloudpopup.reel/css/cloudpopup.css
index b42263b9..eac18083 100644
--- a/js/io/ui/cloudpopup.reel/css/cloudpopup.css
+++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.css
@@ -68,11 +68,12 @@
   width: 176px;
   border-radius: 4px;
   text-shadow: 1px 1px 1px #222;
+  font-family: 'Droid Sans', sans-serif;
   border: 1px #5c5c5c solid;
   background: #292929 -webkit-gradient(linear, left top, left bottom, color-stop(45%, #434343), color-stop(100%, #292929));
 }
 
-/* line 80, cloudpopup.scss */
+/* line 81, cloudpopup.scss */
 .cloud_popup .content input:focus {
   text-shadow: none;
   background: #FFF;
@@ -80,29 +81,7 @@
   color: #292929;
 }
 
-/* line 88, cloudpopup.scss */
-.cloud_popup .content button {
-  display: block;
-  border: 0px;
-  margin: 0px;
-  padding: 4px;
-  border: 1px #333 solid;
-  background: #292929 -webkit-gradient(linear, left top, left bottom, color-stop(0%, #494949), color-stop(100%, #292929));
-  border-radius: 4px;
-  color: #FFF;
-  text-transform: uppercase;
-  cursor: pointer;
-  text-shadow: 1px 1px 1px #000;
-}
-
-/* line 103, cloudpopup.scss */
-.cloud_popup .content button:hover {
-  border: 1px #222 solid;
-  background: #292929 -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5c5c5c), color-stop(100%, #161616));
-  color: #EEE;
-}
-
-/* line 111, cloudpopup.scss */
+/* line 89, cloudpopup.scss */
 .cloud_popup .content .status {
   float: left;
   clear: right;
@@ -111,7 +90,7 @@
   width: 240px;
 }
 
-/* line 120, cloudpopup.scss */
+/* line 98, cloudpopup.scss */
 .cloud_popup .content .btn_ok, .cloud_popup .content .btn_cancel {
   width: 80px;
   text-align: center;
diff --git a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
index 1ae5579b..047e2dd1 100755
--- a/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
+++ b/js/io/ui/cloudpopup.reel/css/cloudpopup.scss
@@ -72,6 +72,7 @@ $grey_light: #494949;
 	width: 176px;
 	border-radius: 4px;
 	text-shadow: 1px 1px 1px #222;
+	font-family: 'Droid Sans', sans-serif;
 	border: 1px lighten($grey_dark, 20%) solid;
 	background: $grey_dark -webkit-gradient(linear, left top, left bottom, color-stop(45%, lighten($grey_dark, 10%)), color-stop(100%, $grey_dark));
 }
@@ -84,29 +85,6 @@ $grey_light: #494949;
     color: $grey_dark;
 }
 
-.cloud_popup .content button
-{
-	display: block;
-	border: 0px;
-	margin: 0px;
-	padding: 4px;
-	border: 1px #333 solid;
-	background: $grey_dark -webkit-gradient(linear, left top, left bottom, color-stop(0%, $grey_light), color-stop(100%, $grey_dark));
-	border-radius: 4px;
-	color: #FFF;
-	text-transform: uppercase;
-	cursor: pointer;
-	text-shadow: 1px 1px 1px #000;
-}
-
-.cloud_popup .content button:hover
-{
-	
-	border: 1px #222 solid;
-	background: $grey_dark -webkit-gradient(linear, left top, left bottom, color-stop(0%, lighten($grey_dark, 20%)), color-stop(100%, darken($grey_light, 20%)));
-	color: #EEE;
-}
-
 .cloud_popup .content .status
 {
 	float: left;
-- 
cgit v1.2.3