issue #3 & issue #2

brainwp · May 18, 2015 · 78d6a90 · 78d6a90
2 parents eaf848a + 618fc24
commit 78d6a90
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 17 deletions.
diff --git a/assets/.DS_Store b/assets/.DS_Store
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -4,7 +4,7 @@
     -webkit-text-size-adjust: 100%}
 body {
     margin: 0;
-overflow-x:hidden;
+overflow:hidden;
 
 }
 article, aside, details, figcaption, figure, footer, header, hgroup, main, menu, nav, section, summary {

diff --git a/assets/js/main.js b/assets/js/main.js
@@ -150,26 +150,24 @@ jQuery(document).ready(function($) {
 	$(window).scroll(function() {
 		var st = $(this).scrollTop();
 
-	   if($(window).scrollTop() + $(window).height() == $(document).height()) {
+	   if(st > lastScrollTop && $(window).scrollTop() + $(window).height() == $(document).height()) {
 	      $('#footer').css('position','absolute')
 					  .css('top','0')
 					.css('width','100vw')
 					.css('z-index','9999')
 		$('#header-principal').css('margin-top',altura_footer)
-		window.scrollTo(0, 0)
+		st = 0;
+		window.scrollTo(0, 0);
 
 	   }
-		// else if ($(window).scrollTop()  > $(window).height() ){
-		// 			
-		// 		}
 		else if (st < lastScrollTop && $(window).scrollTop() == 0){
 			$('#footer').css('position','relative')
 												  .css('top','0')
 												.css('width','100vw')
 												.css('z-index','9999')
 									$('#header-principal').css('margin-top','0')
-		window.scrollTo(0, $(document).height() - 1 )
-
+		window.scrollTo(0, $(document).height() - 10 )
+		st = $(document).height();							
 		}
 		lastScrollTop = st;
 

diff --git a/content-secao.php b/content-secao.php
@@ -47,15 +47,15 @@
 	 case 'discografia':
 	  	$entre = '';
 	  	$antes = '<header class="entry-header"><h1 class="entry-title">'.get_the_title($post->ID).'</h1></header><!-- .entry-header -->';
-	 	$depois = '';
+	 	$depois = '<svg height="400" width="500">
+	 		<polygon id="poligono_social" points=""/>
+ 			<polygon id="triangulo_social" points=""/>
+		</svg>';
 	     break;
 
 	case 'social':
 	  	$entre = '';
-	  	$antes = '<svg height="400" width="500">
-	 		<polygon id="poligono_social" points=""/>
- 			<polygon id="triangulo_social" points=""/>
-		</svg><header class="entry-header"><h1 class="entry-title">'.get_the_title($post->ID).'</h1></header><!-- .entry-header -->';
+	  	$antes = '<header class="entry-header"><h1 class="entry-title">'.get_the_title($post->ID).'</h1></header><!-- .entry-header -->';
 	 	$depois = '';
 	     break;
 	}

diff --git a/front-page.php b/front-page.php
@@ -57,9 +57,9 @@
 
 		$args = array(
 			'post_type' => 'secao',
-			'meta_key' => 'ordem',
-			'orderby' => 'meta_value',
-			'order'   => 'ASC'
+			// 'meta_key' => 'ordem',
+			// 			'orderby' => 'meta_value',
+			// 			'order'   => 'ASC'
 		);
 		$cont=0;
 		global $count;

diff --git a/inc/shortcodes.php b/inc/shortcodes.php
@@ -26,7 +26,11 @@ function short_query_func( $atts ) {
 	   case 'projeto':
 		     $per_page= '99999';
 			$thumb='thumb-projeto';
-			$class_container = "col-sm-8";		
+			$class_container = "col-sm-8";
+			$antes_interno = '<a href="" class="botao" id="left"><span class="esquerda glyphicon glyphicon glyphicon-menu-left"></span></a>';
+    		$depois_interno = '<a class="botao" href="" id="right"><span class="direita glyphicon glyphicon glyphicon-menu-right"></span></a>';
+
+
 	         break;
 	   case 'midia':
 			 $per_page= '3';