windhamdavid 5 years ago
parent
commit
21610dfb8c
9 changed files with 63 additions and 42 deletions
  1. 4 11
      footer.php
  2. 3 1
      functions.php
  3. 9 9
      header-home.php
  4. 10 10
      header.php
  5. 1 0
      inc/tweaks.php
  6. 10 8
      index.php
  7. 19 2
      js/init.js
  8. 6 0
      js/scripts.js
  9. 1 1
      page-notebook.php

+ 4 - 11
footer.php

@@ -1,11 +1,13 @@
 <div class="container-full footer dark">
 	<div class="container">
-		<div class"row">
+		<div class="row">
 			<!--some fun footer stuff -->	
 			<div class="col-md-4">
 				<p class="dim">.col-md-4<p>
 			</div>
-			<div class="col-md-4">.col-md-4</div>
+			<div class="col-md-4">
+				<p class="dim">.col-md-4<p>
+			</div>
 			<div class="col-md-4">
 				<p class="dim right"><a href="https://github.com/windhamdavid/dw"><span class="fa fa-15x fa-code-fork"></span> </a></p>
 				<p class="small dim right">&copy; 2005-2015</p>
@@ -13,18 +15,9 @@
 		</div>
 	</div>
 </div>
-</div>
 <?php wp_footer(); ?>
 <!--[if lt IE 9]>
 	<script src="<?php echo get_template_directory_uri(); ?>/js/html5shiv.min.js"></script>
 <![endif]-->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', 'UA-1906067-6', 'davidawindham.com');
-  ga('send', 'pageview');
-</script>
 </body>
 </html>

+ 3 - 1
functions.php

@@ -23,12 +23,14 @@ function dw_scripts() {
 	wp_enqueue_style( 'boot', get_template_directory_uri() . '/css/bootstrap.css');
 	//wp_enqueue_style( 'jasny', get_template_directory_uri() . '/css/jasny-bootstrap.css');
 	wp_enqueue_style( 'font', get_template_directory_uri() . '/css/font-awesome.css');
+	wp_enqueue_style( 'ani', get_template_directory_uri() . '/css/animate.css');
 	
 	wp_deregister_script('jquery');
 	wp_enqueue_script('jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true);
 	
-	wp_enqueue_script( 'scripts', get_template_directory_uri() . '/js/scripts.js', 'jquery', '', true );
+	//wp_enqueue_script( 'scripts', get_template_directory_uri() . '/js/scripts.js', 'jquery', '', true );
 	wp_enqueue_script( 'script', get_template_directory_uri() . '/js/script.js', 'jquery', '', true );
+	wp_enqueue_script( 'trans', get_template_directory_uri() . '/js/smooth.js', 'jquery', '', true );
 	wp_enqueue_script( 'init', get_template_directory_uri() . '/js/init.js', 'jquery', '', true );
 
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {

+ 9 - 9
header-home.php

@@ -1,15 +1,13 @@
+<!DOCTYPE html>
+<!--[if lt IE 9]><html class="ie"><![endif]-->
+<!--[if gte IE 9]><!--><html lang="en-US"><!--<![endif]-->
+<head>
 <!--
 	     .     . .              .       .  . 
 	. . ...-..-| |-. .-. .-.-..-| .-.. ...-| 
 	 ` ` '' '`-'-' '-`-`-' ' '`-'-`-`-` '`-'-
 -->
-<!DOCTYPE html>
-<!--[if lt IE 9]><html class="ie"><![endif]-->
-<!--[if gte IE 9]><!--><html><!--<![endif]-->
-<html lang="en-US">
-<head>
 <meta charset="UTF-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title><?php dw_page_title();?></title>
 <?php wp_head(); ?>
@@ -679,9 +677,11 @@
 		<li><a href="#archives" class="list-group-item" data-toggle="collapse" data-parent=".navmenu"><span class="fa fa-folder-open-o fa-fw"></span> Archives</a>
 	</ul>
 	<div class="collapse" id="archives">
-	<?php wp_get_archives( array( 'type' => 'yearly') ); ?>
+		<ul>
+			<?php wp_get_archives( array( 'type' => 'yearly') ); ?>
+		</ul>
 	</div>
-	<div class="clear">
+	<div class="clear"></div>
 	<a href="#social" class="list-group-item" data-toggle="collapse" data-parent=".navmenu"><span class="fa fa-external-link fa-fw"></span> Connect</a>
 	<div class="collapse" id="social">
 		<ul class="social">
@@ -696,6 +696,6 @@
 			<li><a href="https://keybase.io/windhamdavid" class=""><span class="fa fa-15x fa-key"></span></a></li>
 			<li><a href="https://www.coinbase.com/windhamdavid" class=""><span class="fa fa-15x fa-bitcoin"></span></a></li>
 			<li><a href="https://angel.co/windhamdavid" class=""><span class="fa fa-15x fa-angellist"></span></a></li>
-		<ul>
+		</ul>
 	</div>	
 </nav>

+ 10 - 10
header.php

@@ -1,15 +1,13 @@
+<!DOCTYPE html>
+<!--[if lt IE 9]><html class="ie"><![endif]-->
+<!--[if gte IE 9]><!--><html lang="en-US"><!--<![endif]-->
+<head>
 <!--
 	     .     . .              .       .  . 
 	. . ...-..-| |-. .-. .-.-..-| .-.. ...-| 
 	 ` ` '' '`-'-' '-`-`-' ' '`-'-`-`-` '`-'-
 -->
-<!DOCTYPE html>
-<!--[if lt IE 9]><html class="ie"><![endif]-->
-<!--[if gte IE 9]><!--><html><!--<![endif]-->
-<html lang="en-US">
-<head>
 <meta charset="UTF-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <title><?php dw_page_title();?></title>
 <?php wp_head(); ?>
@@ -19,7 +17,7 @@
 	<div class="navbar navbar-fixed-top">
 		<div class="container">
 		<div class="site-title">
-			<a href="http://davidawindham.com" title="David Windham"><img class="dw" title="David Windham" src="<?php echo get_bloginfo('template_directory');?>/img/dw.png" width="17"/></a>
+			<a href="http://davidawindham.com" title="David Windham"><img class="dw" title="David Windham" alt="David Windham" src="<?php echo get_bloginfo('template_directory');?>/img/dw.png" width="17"/></a>
 			<a href="<?php echo home_url( '/' ); ?>" class="navbar-brand navbar-right" title="David A. Windham" rel="home">David A. Windham</a>			
 		</div>
 		</div>
@@ -35,9 +33,11 @@
 		<li><a href="#archives" class="list-group-item" data-toggle="collapse" data-parent=".navmenu"><span class="fa fa-folder-open-o fa-fw"></span> Archives</a>
 	</ul>
 	<div class="collapse" id="archives">
-	<?php wp_get_archives( array( 'type' => 'yearly') ); ?>
+		<ul>
+			<?php wp_get_archives( array( 'type' => 'yearly') ); ?>
+		</ul>
 	</div>
-	<div class="clear">
+	<div class="clear"></div>
 	<a href="#social" class="list-group-item" data-toggle="collapse" data-parent=".navmenu"><span class="fa fa-external-link fa-fw"></span> Connect</a>
 	<div class="collapse" id="social">
 		<ul class="social">
@@ -53,6 +53,6 @@
 			<li><a href="https://www.coinbase.com/windhamdavid" class=""><span class="fa fa-15x fa-bitcoin"></span></a></li>
 			<li><a href="http://en.wikipedia.org/wiki/User:Windhamdavid" class=""><span class="fa fa-15x fa-globe"></span></a></li>
 			<li><a href="https://angel.co/windhamdavid" class=""><span class="fa fa-15x fa-angellist"></span></a></li>
-		<ul>
+		</ul>
 	</div>		
 </nav>

+ 1 - 0
inc/tweaks.php

@@ -37,6 +37,7 @@ add_action( 'admin_head', 'dw_hide' );
 
 function dw_oembed_filter($html, $url, $attr, $post_ID) {
     $return = '<div class="video-container">'.$html.'</div>';
+	$return = str_replace('frameborder="0" allowfullscreen', 'style="border:none"', $return);
     return $return;
 }
 add_filter( 'embed_oembed_html', 'dw_oembed_filter', 10, 4 ) ;

+ 10 - 8
index.php

@@ -1,21 +1,23 @@
 <!--perhaps an altenate header -->
 <?php get_header('home'); ?>
-	<div class="container-full leader dark">
+	<div id="big-top" class="container-full leader dark">
 		<!-- Not sure what I'm going to have on my main page just yet maybe the card again -->
 		<div class="container">
-			<h1 class="light">Some Static Content</h1>
-			<h2 class="light">Some Static Content</h2>
-			<h3 class="light">Some Static Content</h3>
-			<h4 class="light">Some Static Content</h4>
-			<h5 class="light">Some Static Content</h5>
-			<h6 class="light">Some Static Content</h6>
+			<div class="m-scene scene_element scene_element--fadeinright">
+				<h1 class="light">Some Static Content</h1>
+				<h2 class="light">Some Static Content</h2>
+				<h3 class="light">Some Static Content</h3>
+				<h4 class="light">Some Static Content</h4>
+				<h5 class="light">Some Static Content</h5>
+				<h6 class="light">Some Static Content</h6>
+			</div>
 		</div>
 	</div>
 	<div class="container">
 		<div id="content" role="main">
 			<main id="main" class="site-main" role="main">
 				<!-- Not sure what I'm going to have on my main page just yet -->
-				<?php query_posts('showposts=22'); ?>
+				<?php query_posts('showposts=1'); ?>
 				<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
 				<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 					<div class="entry-content">

+ 19 - 2
js/init.js

@@ -5,7 +5,7 @@ $('.nav-toggle').on( 'click', function() {
 });
 
 $(window).bind("load", function () {
-    $('#loader').fadeOut(100);
+    $('#loader').fadeOut(900);
 });
 	
 var headerHeight = $('.navbar').height();
@@ -37,5 +37,22 @@ var commentsDiv = $('#comments');
 			});
 		});
 	}
+});
 
-});
+;(function ($) {
+ 	'use strict';
+    var $body    = $('html, body'),
+        content  = $('#big-top').smoothState({
+            prefetch: true,
+            pageCacheSize: 4,
+            onStart: {
+                duration: 250,
+                render: function (url, $container) {
+                    content.toggleAnimationClass('is-exiting');
+                    $body.animate({
+                        scrollTop: 0
+                    });
+                }
+            }
+        }).data('smoothState');
+})(jQuery);

+ 6 - 0
js/scripts.js

@@ -0,0 +1,6 @@
+(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+ga('create', 'UA-1906067-6', 'davidawindham.com');
+ga('send', 'pageview');

+ 1 - 1
page-notebook.php

@@ -21,7 +21,7 @@ get_header(); ?>
 				</div>
 			</div>
 			<?php endwhile; ?>
-			</div>
+			</main>
 		</div>
 	</div>
 <?php get_footer(); ?>