Merge branch 'master' of github.com:reach3mobile/AmigosApp

reach3mobile · May 11, 2012 · a120c43 · a120c43
2 parents 7804480 + 8e7bbac
commit a120c43
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/css/_notes/dwsync.xml b/css/_notes/dwsync.xml
@@ -1 +1 @@
-<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="style.css" server="purplepaisleyproductions.com/www/r3/" local="3419505009" remote="12009440012" /><file name="jquery.mobile-1.1.0.minTEST_Photo.css" server="purplepaisleyproductions.com/www/r3/" local="3419505419" remote="12009440012" /></dwsync>
+<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="style.css" server="purplepaisleyproductions.com/www/r3/" local="3419517445" remote="12009468632" /><file name="jquery.mobile-1.1.0.minTEST_Photo.css" server="purplepaisleyproductions.com/www/r3/" local="3419505419" remote="12009468632" /></dwsync>

diff --git a/index.html b/index.html
@@ -48,8 +48,9 @@
   <script src="js/libs/modernizr-2.0.6.min.js"></script>
 </head>
 
-<body class="nav_bod">
+<body class="nav_bod" style="visibility:hidden;">
   <div class="bg-grad"></div>
+
 
 			<div class="navbar_index" data-role="page">
 
@@ -87,7 +88,7 @@ <h1>Welcome!</h1>
 			    </section><!-- /content -->
 					<a href="#" data-rel="back" data-role="button">Dismiss</a>
 
-				</div><!-- end goodbye page -->
+				</div><!-- end welcome page -->
 
 				<div id="goodbyePage" data-role="dialog" data-theme="c">
 					<header data-role="header" data-position="fixed" data-theme="c">
@@ -111,7 +112,7 @@ <h1>Goodbye!</h1>
 				    <h1>R3M Mission Statement:</h1>
 			            <p>ReachReachReach (r3) exists to foster the growth and harness the power of the best and brightest minds in New Mexico in order to build a vibrant, bleeding edge mobile platforms and technologies company that erases the line between "It's possible" and "It's patented." r3's primary purpose, while pushing the boundaries of innovation and creative mobile solutions is to keep New Mexico talent in New Mexico by co-creating a fun, inspirational, highly rewarding, and profitable work environment that reflects the character of our team members.</p>
 
-                        <h2><a href="http://youtu.be/2RJYrQwWX5A" target="_blank" title="New Mexico's Future">Click Here for New Mexico's Future</a></h2>
+                        <h2><a href="http://youtu.be/2RJYrQwWX5A" target="_blank" title="New Mexico's Future">Click Here* for New Mexico's Future</a></h2>
                         <p><small>*Note: You must be able to access the internet to view this link.</small></p>
 
 

diff --git a/js/script.js b/js/script.js
@@ -258,7 +258,7 @@ $(".navbar_index").live("pageshow", function (event) {
     button.addClass("hidden");
   // if it is the last day or beyond then change to goodbye and update url
   }else if (daysSinceStart() >= 8) {
-    $("div.ui-page-active a.introbutton > span > span").text("Goodbye!");
+    $("div.ui-page-active a.introbutton > span > span").text("Goodbye! (click me)");
     button.attr("href", "#goodbyePage");
   };
 });