buncha shit

MESH-Dev · Feb 24, 2017 · feb4ad5 · feb4ad5
1 parent 3964649
commit feb4ad5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/assets/js/script.js b/assets/js/script.js
@@ -51,7 +51,7 @@ jQuery(document).ready(function($){
 
 	function centerGreeting(){
 		var hgH = $('.home_greeting').height();
-		console.log(hgH);
+		//console.log(hgH);
 		var calcH = -(hgH/2);
 
 		$('#home .content').css({"margin-top":calcH});
@@ -72,7 +72,7 @@ var wWidth = $(window).width();
 var dc_top, de_top, bt_top;
 
 if(wWidth > 750){
-	var dc_top = 160;
+	var dc_top = 125;
 	var bt_top = 168;
 	var de_top = 160;
 }
@@ -334,14 +334,13 @@ function GoToProject(project_id, reorder){
 		controller.scrollTo(photos_id);
 	}
 
-
+	$('#detail_scrollarea').css("-webkit-overflow-scrolling","touch");
 	infoOpen();
 
 
-
-
 
 
+
 	if(run_once === 0){
 
 		$('.project-wrap').each(function () {
@@ -425,7 +424,7 @@ $(document).on('click', 'p#explore_text', function () {
 		fullScreenExitTrigger();
 	});
 
-if (windowsize < 751) {
+if (windowsize < 768) {
 
 
 	$(document).on('click', '.project-wrap img', function (e) {
@@ -436,7 +435,7 @@ if (windowsize < 751) {
 }
 $(window).resize(function() {
   windowsize = $(window).width();
-  if (windowsize < 751) {
+  if (windowsize < 768) {
 
 
 	$(document).on('click', '.project-wrap img', function (e) {
@@ -474,6 +473,7 @@ $('#detail_close').click(function(e) {
 $('#detail_exit').click(function(e) {
 	e.preventDefault();
 	infoClose(e);
+	$('#detail_scrollarea').css("-webkit-overflow-scrolling","auto");
 	$('header').removeClass('detail-open').addClass('absolute');
 	$('#sayHello').slideUp(200);
 	$('#detail_exit').animate({
@@ -529,23 +529,34 @@ detailView.paused(true)
     .to("#detail_exit", 0.25, {autoAlpha:1, delay:0.6}, "closed")
     .to(".detail_nav", 0.25, {autoAlpha:1, delay:0.65}, "closed")
     //.to("#copy_1", 0.25, {css:{left:"0px", autoAlpha:1}, delay:0.7}, "closed")//make this #current_copy (copy in view)
-    .to("#infobar", 0.1, {css:{cursor:"default"}}, "closed")
+    .to("#infobar", 0.1, {css:{cursor:"default"}, onComplete: checkSize}, "closed")
     .add("open");
 //Detail View Expand definition
 
 
 //Detail View Expand function calls
 function infoOpen(){
     detailView.play();
+
 }
 
 function infoClose(event){
+	$('#detail_scrollarea').css("-webkit-overflow-scrolling","auto");
     event.stopPropagation();
     detailView.reverse();
 }
 //Detail View Expand function calls
 
+function checkSize(){
 
+	windowsize = $(window).width();
+	if (windowsize < 768) {
+		setTimeout(function(){ fullScreenTrigger(); }, 1000);	 	
+
+
+	}
+
+}
 
 //Fullscreen Definition ------
 fullscreen_open.add("start")
@@ -668,9 +679,10 @@ function hideTooltipBack(){
 
 var go_to = getQueryVariable('p');
 
-if(go_to !== ''){
+if(go_to){
 
 	//var project_id = "#" + go_to;
+	//console.log("gt " + go_to);
 	GoToProject(go_to, true);
 
 }

diff --git a/footer.php b/footer.php
@@ -5,7 +5,7 @@
 </div>
 
 <div class="rotate">
-	<h2>ROTATE DEVICE!</h2>
+	<h2>Rotate your device for best experience! </h2>
 </div>
 <footer class="site-footer">
 	<div class="wrap">

diff --git a/sass.css b/sass.css
@@ -3408,7 +3408,7 @@ footer.site-footer p {
   cursor: pointer;
   position: fixed;
   border: 0px;
-  background-color: #0000f8;
+  background-color: rgba(0, 0, 247, 0.85);
   height: 100vh;
   width: 38%;
   min-width: 350px;
@@ -3676,7 +3676,6 @@ span#back_tip:after {
   width: 100vw;
   height: 100vh;
   overflow-y: scroll;
-  -webkit-overflow-scrolling: touch;
   top: 0;
   right: 0;
   z-index: 2;

diff --git a/sass/modules/_layout.scss b/sass/modules/_layout.scss
@@ -1879,7 +1879,7 @@ footer.site-footer{
     cursor: pointer;
     position: fixed;
     border: 0px;
-    background-color: $blue;
+    background-color: rgba(0, 0, 247, 0.85);
     height: 100vh;
     width: 38%;
     //Change this if needed to make things fit
@@ -2163,7 +2163,7 @@ span#back_tip {
     width: 100vw;
     height: 100vh;
     overflow-y: scroll;
-    -webkit-overflow-scrolling: touch;
+    //-webkit-overflow-scrolling: touch;
     top:0;
     right: 0;
     z-index:2;

diff --git a/template-people-new.php b/template-people-new.php
@@ -164,10 +164,7 @@
 
 
 	<div id="detail_scrollarea">
-	    <i id="fullscreen" class="material-icons" >fullscreen</i>
-	    <i id="fullscreen_exit" class="material-icons" >fullscreen_exit</i>
-	    <span id="fs_tip" class="tooltip">Expand the Images</span>
-	    <span id="fs_close_tip" class="tooltip">Close Fullscreen</span>
+
 
 	    <div>
 	    </div>