windhamdavid 4 years ago
parent
commit
eaafacdf17
12 changed files with 285 additions and 475 deletions
  1. 1 1
      css/fullcalendar.css
  2. 24 1
      footer-home.php
  3. 36 0
      footer-studio.php
  4. 1 1
      front-page.php
  5. 0 3
      functions.php
  6. 37 0
      header-studio.php
  7. 5 0
      inc/tweaks.php
  8. 6 2
      js/front-page.js
  9. 78 304
      js/studio.js
  10. 15 56
      page-about.php
  11. 50 93
      page-studio.php
  12. 32 14
      style.css

+ 1 - 1
css/fullcalendar.css

@@ -649,7 +649,7 @@ a.fc-more:hover {
 }
 
 .fc-basic-view tbody .fc-row {
-	min-height: 4em; /* ensure that all rows are at least this tall */
+	min-height: 3em; /* ensure that all rows are at least this tall */
 }
 
 /* a "rigid" row will take up a constant amount of height because content-skeleton is absolute */

+ 24 - 1
footer-home.php

@@ -1,7 +1,30 @@
 <div class="container-fluid footer-home dark">
 	<div class="container">
 		<div class="row">
-			<div class="col-md-3 col-sm-offset-9">
+			<div class="col-sm-3">
+				<ul style="float:left;margin-right:10px;">
+					<li><a href="<?php echo home_url( '/' ); ?>about"><span class="fa fa-file-text-o fa-fw"></span> About</a></li>
+					<li><a href="<?php echo home_url( '/' ); ?>desk"><span class="fa fa-pencil-square-o fa-fw"></span> Desk</a></li>
+					<li><a href="http://code.davidawindham.com"><span class="fa fa-code fa-fw"></span> Code</a></li>
+				</ul>
+				<ul>
+					<li><a href="<?php echo home_url( '/' ); ?>studio"><span class="fa fa-lightbulb-o fa-fw"></span> Studio</a></li>
+					<li><a href="<?php echo home_url( '/' ); ?>contact"><span class="fa fa-envelope-o fa-fw"></span> Contact</a></li>
+					<li><a href="<?php echo home_url( '/' ); ?>sitemap"><span class="fa fa-sitemap fa-fw"></span> Sitemap</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-4">
+				<ul class="social">
+					<li><a href="https://github.com/windhamdavid" class="" rel="me"><span class="fa fa-2x fa-github-square"></span></a></li>
+					<li><a href="https://twitter.com/windhamdavid" class="" rel="me"><span class="fa fa-2x fa-twitter-square"></span></a></li>
+					<li><a href="https://plus.google.com/+DavidWindham1" class="" rel="me"><span class="fa fa-2x fa-google-plus-square"></span></a></li>
+					<li><a href="https://www.facebook.com/windhamdavid" class=""><span class="fa fa-2x fa-facebook-square"></span></a></li>
+					<li><a href="http://windhamdavid.tumblr.com/" class=""><span class="fa fa-2x fa-tumblr-square"></span></a></li>		
+				</ul>
+			</div>
+			<div class="col-md-3 col-sm-offset-5">
 				<p class="small dim right">&copy; 2005-2015<br />
 				<span class="small dull right">This website uses cookies</span></p>
 			</div>

+ 36 - 0
footer-studio.php

@@ -0,0 +1,36 @@
+<div class="container-fluid footer-home dark">
+	<div class="container">
+		<div class="row">
+			<div class="col-sm-3">
+				<ul style="float:left;margin-right:10px;">
+					<li><a href="<?php echo home_url( '/' ); ?>about"><span class="fa fa-file-text-o fa-fw"></span> About</a></li>
+					<li><a href="<?php echo home_url( '/' ); ?>desk"><span class="fa fa-pencil-square-o fa-fw"></span> Desk</a></li>
+					<li><a href="http://code.davidawindham.com"><span class="fa fa-code fa-fw"></span> Code</a></li>
+				</ul>
+				<ul>
+					<li><a href="<?php echo home_url( '/' ); ?>studio"><span class="fa fa-lightbulb-o fa-fw"></span> Studio</a></li>
+					<li><a href="<?php echo home_url( '/' ); ?>contact"><span class="fa fa-envelope-o fa-fw"></span> Contact</a></li>
+					<li><a href="<?php echo home_url( '/' ); ?>sitemap"><span class="fa fa-sitemap fa-fw"></span> Sitemap</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="row">
+			<div class="col-md-4">
+				<ul class="social">
+					<li><a href="https://github.com/windhamdavid" class="" rel="me"><span class="fa fa-2x fa-github-square"></span></a></li>
+					<li><a href="https://twitter.com/windhamdavid" class="" rel="me"><span class="fa fa-2x fa-twitter-square"></span></a></li>
+					<li><a href="https://plus.google.com/+DavidWindham1" class="" rel="me"><span class="fa fa-2x fa-google-plus-square"></span></a></li>
+					<li><a href="https://www.facebook.com/windhamdavid" class=""><span class="fa fa-2x fa-facebook-square"></span></a></li>
+					<li><a href="http://windhamdavid.tumblr.com/" class=""><span class="fa fa-2x fa-tumblr-square"></span></a></li>		
+				</ul>
+			</div>
+			<div class="col-md-3 col-sm-offset-5">
+				<p class="small dim right">&copy; 2005-2015<br />
+				<span class="small dull right">This website uses cookies</span></p>
+			</div>
+		</div>
+	</div>
+</div>
+<?php wp_footer(); ?>
+</body>
+</html>

File diff suppressed because it is too large
+ 1 - 1
front-page.php


+ 0 - 3
functions.php

@@ -63,13 +63,10 @@ function dw_scripts() {
 	}
 	
 	elseif ( is_page('studio') ) {
-		wp_enqueue_style( 'cal', get_template_directory_uri() . '/css/fullcalendar.css');
 		wp_enqueue_script('jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true);
 		wp_enqueue_script( 'modern', get_template_directory_uri() . '/js/modernizr.js', 'jquery', '', true );
 		wp_enqueue_script( 'boostrap', get_template_directory_uri() . '/js/bootstrap.min.js', 'jquery', '', true );
 		wp_enqueue_script( 'offcanvas', get_template_directory_uri() . '/js/jasny-bootstrap.js', 'jquery', '', true );
-		wp_enqueue_script( 'time', get_template_directory_uri() . '/js/moment.min.js', 'jquery', '', true );
-		wp_enqueue_script( 'cal', get_template_directory_uri() . '/js/fullcalendar.min.js', 'jquery', '', true );
 		wp_enqueue_script( 'scripts', get_template_directory_uri() . '/js/scripts.js', 'jquery', '', true );
 		wp_enqueue_script( 'init', get_template_directory_uri() . '/js/studio.js', 'jquery', '', true );
 	}

+ 37 - 0
header-studio.php

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html lang="en-US">
+<head>
+<!--
+	     .     . .              .       .  . 
+	. . ...-..-| |-. .-. .-.-..-| .-.. ...-| 
+	 ` ` '' '`-'-' '-`-`-' ' '`-'-`-`-` '`-'-
+-->
+<meta charset="UTF-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+<meta name="description" content="Studio | David A. Windham" />
+<title><?php dw_page_title();?></title>
+<?php wp_head(); ?>
+</head>
+<body>
+<?php get_template_part('loader') ?>
+<header id="header">
+	<div id="nav">
+		<div class="navbar navbar-fixed-top">
+			<div class="container">
+				<div class="site-title">
+					<a href="#" class="navbar-brand navbar-right light"  data-toggle="offcanvas" data-target=".navmenu" title="David A. Windham" rel="home">David A. Windham</a>			
+				</div>
+			</div>
+		</div>
+	</div>
+</header>
+<nav id="site-menu" class="slide-menu-left navmenu navmenu-default navmenu-fixed-right offcanvas" role="navigation">
+	<ul class="nav nav-stacked">
+		<li><a href="<?php echo home_url( '/' ); ?>" class="list-group-item"><span class="fa fa-home fa-fw"></span> Home</a></li>
+		<li><a href="<?php echo home_url( '/' ); ?>about" class="list-group-item"><span class="fa fa-file-text-o fa-fw"></span> About</a></li>
+		<li><a href="<?php echo home_url( '/' ); ?>desk" class="list-group-item"><span class="fa fa-pencil-square-o fa-fw"></span> Desk</a></li>
+		<li><a href="<?php echo home_url( '/' ); ?>studio" class="list-group-item"><span class="fa fa-flask fa-fw"></span> Studio</a></li>
+		<li><a href="<?php echo home_url( '/' ); ?>contact" class="list-group-item"><span class="fa fa-envelope-o fa-fw"></span> Contact</a></li>
+	</ul>
+</nav>

+ 5 - 0
inc/tweaks.php

@@ -35,6 +35,11 @@ function dw_hide() {
     </style>
 <?php }
 
+function custom_excerpt_length( $length ) {
+	return 20;
+}
+add_filter( 'excerpt_length', 'custom_excerpt_length', 999 );
+
 add_filter('wp_mail_from', 'dw_fromemail');
 function dw_fromemail($email) {
 	$wpfrom = get_option('admin_email');

+ 6 - 2
js/front-page.js

@@ -29,8 +29,12 @@
 
 
 $(document).ready(function(){
-    $('a.swap').swapAttr().css({'color':'#ccc'});
-    $('#link2').swapAttr('rel');
+	$("a").hover(function() {
+		var col = 'rgb(' + (Math.floor(Math.random() * 256)) + ',' + (Math.floor(Math.random() * 256)) + ',' + (Math.floor(Math.random() * 256)) + ')';
+		$(this).stop().animate({ color: col}, 600); },
+		function() {
+			$(this).stop().animate({ color: col}, 400);
+	});
 	
 	var iconmorph = new SVGMorpheus('#icon')
 	$( "a.zw-card" ).hover(function() {

+ 78 - 304
js/studio.js

@@ -2,324 +2,98 @@ new WOW().init();
 
 jQuery(document).ready(function($) {
 	
-$(window).bind('load', function() {
-	$('#loader').fadeOut(700);
-});
-
-
-/*============================================
-		      Welcome Cookies
-==============================================*/
-
-$(function dw_set_cookie() {
-	var COOKIE = 'windhamdavid-cookie';
-	var dwcookie = $.cookie(COOKIE);
-	if (dwcookie == null) {
-		$.cookie(COOKIE, 'yum-cookies', { expires: 7, path: '/'});
-		$('.terminal-welcome').modal('show');	
-		$('.welcome').typed({
-			strings: ['Hey,', 'Hello,\n^10Welcome to ^10my domain ^10...^10', 'Hello, \nWelcome to my little corner of the internet. \n^10It is nice to ', 'Hello, \nWelcome to my little corner of the internet. \nWhat is your name?^200\n'],
-			typeSpeed: 30,
-			backSpeed: 50,
-			startDelay: 0,
-			backDelay: 0,
-			loop: false,
-			loopCount: false,
-			attr: null,
-			callback: function(){
-				dw_terminal();
-			 }
-		});
-		$('.first-slide').css('visibility','hidden');	
-	}
-	else {
-		$('.terminal').modal('show');
-		if (localStorage.getItem('person') === null) {
-			var person = 'anonymous person';
-		}
-		else {
-			var person = localStorage.getItem('person');
-		}
-		$('.welcome-back-text').typed({
-			strings: ['...', 'Welcome back ' +person],
-			typeSpeed: 30,
-			backSpeed: 50,
-			startDelay: 0,
-			backDelay: 0,
-			loop: false,
-			loopCount: false,
-			attr: null,
-			callback: function(){	
-				dw_terminal();	
-			 }
-		});
-		$('.first-slide').css('visibility','hidden');
-		$('.terminal').on('hidden.bs.modal', function () {
-		    dw_caro();
-			$('.first-slide').css('visibility','visible');
-		});
-	}
-});
-	
-function dw_shift() {
-	$('.terminal-welcome').modal('hide');
-	$('.terminal-welcome').on('hidden.bs.modal', function () {
-	    dw_caro();
-		$('.first-slide').css('visibility','visible');
+	$(window).bind('load', function() {
+		$('#loader').fadeOut(100);
 	});
-}
 
+	$('.nav-toggle').on('touchstart click', function(e) {
+		e.preventDefault();
+		$( this ).toggleClass( 'active' );
+	});
 
-/*============================================
-		      Terminal
-==============================================*/
-(function ($){
-	$.fn.cli = function(handler, prompt, effect){
-		if (!prompt) prompt = '<span class="u">you</span><span class="at">@</span><span class="mee">david</span>&nbsp;&gt;&nbsp;';
-		if (!effect) effect = $.fn.text;
-		return this.each(function(){
-			var self = $(this);
-			function newline(){
-				self.
-				 append('<p class=input><span class=prompt>'+prompt+'</span><span  style=outline:none contenteditable></span></p>');
-				try {
-					$('[contenteditable]', self)[0].focus();
-				}catch(e){
-				}
+	$(function dw_hidenav() {
+		var headerHeight = $('.navbar').height();
+		$(window).on('scroll', { previousTop: 0 },
+			function() {
+			var currentTop = $(window).scrollTop();
+			if (currentTop < this.previousTop) {
+				if (currentTop > 0 && $('.navbar').hasClass('fixed')) {
+						$('.navbar').addClass('visible');
+						$('.site-title a').removeClass('light');
+					} else {
+						$('.navbar').removeClass('visible fixed');
+						$('.site-title a').addClass('light');
+					}
+			} 
+			else {
+				$('.navbar').removeClass('visible');
+				if (currentTop > headerHeight && !$('.navbar').hasClass('fixed')) $('.navbar').addClass('fixed');
 			}
-			newline();
-			self.on('keydown', '[contenteditable]', function(evt){
-				if (evt.keyCode === 13){
-					$(this).removeAttr('contenteditable');
-					effect.call($('<p class=response>').appendTo(self),handler(this.textContent || this.innerText));
-					newline();
-					return false;
-				}
-			});
+			this.previousTop = currentTop;
+			}  
+		);
+	});
+
+	$('.caro-grad').appear();
+	$('.caro-grad').one('appear', dw_appear);
+	function dw_appear() {
+		$('#caro').carousel({
+			interval: 7000,
+			wrap: true,
+			pause: false,
+			keyboard: true
 		});
+		var anima = new DrawFillSVG({elementId: 'svg-imac'});
+		anima.replay();
 	};
-})(jQuery);
 
-function dw_terminal(){
-	function type(text){
-		var span = $('<span>').appendTo(this).after('<span id="blinker" style="background:green">&nbsp;&nbsp;</span>');
-		var style = $('<style>p.input {visibility: hidden} p.input.old {visibility: visible}</style>').appendTo('head');
-		$('p.input').addClass('old');
-		var progress = 0;
-		var timer = setInterval (function(){
-			span.text(text.substr(0, progress++));
-			if (progress > text.length){
-				$('#blinker').remove();
-				style.remove();
-				$('[contenteditable]')[0].focus();
-				clearInterval(timer);
-			}
-		},100);
-	}
-	$('.thermo-intro').cli(function(text){
-		if (text.length > 1) {
-			localStorage.setItem('person', text),
-			dw_shift();
-		};
-		return '';
-		}, null, type);
-	$('.thermo').cli(function(text){
-		if (/exit/i.test(text)) {
-			$('.terminal').modal('hide');
-		}
-		if (/help/i.test(text)) return "I need somebody. Type 'exit' to close";
-		if (/hello/i.test(text)) return "Hello to you!";
-		if (/what/i.test(text)) return "This is a website silly human";
-		if (/and/i.test(text)) return "and what?";
-		if (/who/i.test(text)) return "David A. Windham";
-		if (/when/i.test(text)) return "Yesterday";
-		if (/how/i.test(text)) return "JavaScript is a dynamic computer programming language";
-		if (/why/i.test(text)) return "For fun";
-		if (/you/i.test(text)) return "your mama";
-		if (/cd ../i.test(text)) return "Oh, I see";
-		if (/thermonuclear/i.test(text)) return "Wouldn't you prefer a nice game of chess?";
-		if (text.length < 3) return "type 'exit' to close";
-		return 'command not found: '+text;
-		}, null, type);
-	$('p.input').on('touchstart click', function(e) {
-		e.preventDefault();
-		$('[contenteditable]')[0].focus();
+	$(document).bind('keyup', function(e) {
+	    if(e.which === 39){
+			$('#caro').carousel('next');
+	    }
+	    else if(e.which === 37){
+			$('#caro').carousel('prev');
+	    }
 	});
-}
-
-
-/*============================================
-		     Navigation 
-==============================================*/
-
-$('.nav-toggle').on('touchstart click', function(e) {
-	e.preventDefault();
-	$( this ).toggleClass( 'active' );
-});
-
-$('#nav').affix({
-	//offset: {top: $('.intro').height()-$('.navbar').height()}
-});	
-
-$(function dw_hidenav() {
-	var headerHeight = $('.navbar').height();
-	$(window).on('scroll', { previousTop: 0 },
-		function() {
-		var currentTop = $(window).scrollTop();
-		if (currentTop < this.previousTop) {
-			if (currentTop > 0 && $('.navbar').hasClass('fixed')) {
-					$('.navbar').addClass('visible');
-					$('.site-title a').removeClass('light');
-				} else {
-					$('.navbar').removeClass('visible fixed');
-					$('.site-title a').addClass('light');
-				}
-		} 
-		else {
-			$('.navbar').removeClass('visible');
-			if (currentTop > headerHeight && !$('.navbar').hasClass('fixed')) $('.navbar').addClass('fixed');
-		}
-		this.previousTop = currentTop;
-		}  
-	);
-});
-
 
-/*============================================
-		      Carousel 
-==============================================*/
-
-$('.caro-grad').appear();
-$('.caro-grad').one('appear', dw_appear);
-function dw_appear() {
-	$('#caro').carousel({
-		interval: 5555,
-		wrap: false,
-		pause: false
+	$('#caro').on('slid.bs.carousel', function(event) {
+		var consta = $(event.target);
+		setTimeout(function() {
+			if (consta.find('.item.active').data('id') === 1) {
+				$('#studio-caro').addClass('caro-grad').removeClass('caro-grad3 caro-grad2');
+			}
+			if (consta.find('.item.active').data('id') === 2) {
+				$('#studio-caro').removeClass('caro-grad caro-grad3').addClass('caro-grad2');
+			}
+			if (consta.find('.item.active').data('id') === 3) {	
+				$( '#studio-caro' ).addClass('caro-grad3').removeClass('caro-grad2 caro-grad');
+			}
+		}, 10);
 	});
-	var anima = new DrawFillSVG({elementId: 'sv'});
-	anima.replay();
-};
-
-$(document).bind('keyup', function(e) {
-    if(e.which === 39){
-		//$('#caro-lead').carousel('next');
-		$('#caro').carousel('next');
-    }
-    else if(e.which === 37){
-		//$('#caro-lead').carousel('prev');
-		$('#caro').carousel('prev');
-    }
-});
 
-
-
-/*============================================
-		      SVG Animate
-==============================================*/
-
-$('#caro').on('slid.bs.carousel', function() {
-	$('.active .animac').removeClass('hide-svg fade-svg');
-	var animac = new DrawFillSVG({elementId: 'svg-mac'});
-	var animac1 = new DrawFillSVG({elementId: 'svg-imac'});
-	var animac2 = new DrawFillSVG({elementId: 'svg'});
-	animac.replay();
-	animac1.replay();
-	animac2.replay();
-});
-
-$('#caro').on('slide.bs.carousel', function() {
-	$('.active #svg-imac.bg').attr('class', 'svg screen');
-	$('.active .animac').addClass('fade-svg').delay(1000).queue(function(hideit){
-	    $(this).addClass('hide-svg');
-	    hideit();
+	$('#caro').on('slid.bs.carousel', function() {
+		$('.active .animac').removeClass('hide-svg fade-svg');
+		var animac = new DrawFillSVG({elementId: 'svg-imac'});
+		var animac1 = new DrawFillSVG({elementId: 'sv'});
+		var animac2 = new DrawFillSVG({elementId: 'svg-mac'});
+		animac.replay();
+		animac1.replay();
+		animac2.replay();
 	});
-});
 
-$('#caro').on('slid.bs.carousel', function() {
-	$('.active #svg-imac.screen').delay(2500).queue(function(screenit){
-	    $(this).attr('class', 'bg');
-	    screenit();
+	$('#caro').on('slide.bs.carousel', function() {
+		$('.active #svg-imac.bg').attr('class', 'svg screen');
+		$('.active .animac').addClass('fade-svg').delay(1000).queue(function(hideit){
+		    $(this).addClass('hide-svg');
+		    hideit();
+		});
 	});
-});
-
-
-
-		
-/*============================================
-		      Calendar
-==============================================*/	
-
-$('.calendar').fullCalendar ({
-	firstDay : 1,
-	height: 345,
-	events: [
-			{
-				title: 'Project',
-				start: '2014-09-27',
-				end: '2014-10-02'
-			},
-			{
-				title: 'Conf',
-				start: '2014-10-11',
-				end: '2014-10-13',
-				borderColor: 'red'
-			},
-			{
-				title: 'off',
-				start: '2014-10-13',
-				end: '2014-10-16'	
-			},
-			{
-				title: 'Contract',
-				start: '2014-10-16',
-				end: '2014-10-31'
-			},
-			{
-				title: 'Contract',
-				start: '2014-11-03',
-				end: '2014-11-22'
-			},
-			{
-				title: 'Project',
-				start: '2014-12-01',
-				end: '2014-12-06'
-			},
-			{
-				title: 'Project',
-				start: '2014-12-08',
-				end: '2014-12-13'
-			},
-			{
-				title: 'Holiday',
-				start: '2014-12-22',
-				end: '2015-01-05',
-				borderColor: 'red'
-			},
-			{
-				title: 'Project',
-				start: '2015-01-06',
-				end: '2015-01-25'
-			},
-			{
-				title: 'Project',
-				start: '2015-02-02',
-				end: '2015-02-14'
-			},
-			{
-				title: 'Holiday',
-				start: '2015-02-14',
-				end: '2015-02-19',
-				borderColor: 'red'
-			},
-			{
-				title: 'Project',
-				start: '2015-02-19',
-				end: '2015-03-07'
-			}
-	]
-});
-
 
+	$('#caro').on('slid.bs.carousel', function() {
+		$('.active #svg-imac.screen').delay(2500).queue(function(screenit){
+		    $(this).attr('class', 'bg');
+		    screenit();
+		});
+	});
 		
 });

+ 15 - 56
page-about.php

@@ -71,17 +71,15 @@ get_header('home'); ?>
 	</div>
 	<div class="container-fluid posts-front">
 		<div class="container">
-			<h3 class="dim cm-sans wow fadeIn" data-wow-offset="600">Desk:</h3>
+			<h3 class="light cm-sans wow fadeIn" data-wow-offset="600">Desk:</h3>
 			<div class="row">
 				<div class="col-sm-4 wow fadeInLeft" data-wow-offset="500">
 					<article id="main" class="home">
 						<?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">
-								<h3 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'daw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h3>
-								<?php the_excerpt(); ?>
-							</div>
+						<div class="entry-content">
+							<h4><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'daw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h4>
+							<?php dw_good_excerpt(110); ?>
 						</div>
 						<?php endwhile; ?>
 					</article>
@@ -90,11 +88,9 @@ get_header('home'); ?>
 					<article id="main" class="home">
 						<?php query_posts('showposts=1&offset=1'); ?>
 						<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-						<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-							<div class="entry-content">
-								<h3 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'daw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h3>
-								<?php the_excerpt(); ?>
-							</div>
+						<div class="entry-content">
+							<h4><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'daw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h4>
+							<?php dw_good_excerpt(110); ?>
 						</div>
 						<?php endwhile; ?>
 					</article>
@@ -103,11 +99,9 @@ get_header('home'); ?>
 					<article id="main" class="home">
 						<?php query_posts('showposts=1&offset=2'); ?>
 						<?php if ( have_posts() ) while ( have_posts() ) : the_post(); ?>
-						<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-							<div class="entry-content">
-								<h3 class="entry-title"><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'daw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h3>
-								<?php the_excerpt(); ?>
-							</div>
+						<div class="entry-content">
+							<h4><a href="<?php the_permalink(); ?>" title="<?php printf( esc_attr__( 'Permalink to %s', 'daw' ), the_title_attribute( 'echo=0' ) ); ?>" rel="bookmark"><?php the_title(); ?></a></h4>
+							<?php dw_good_excerpt(110); ?>
 						</div>
 						<?php endwhile; ?>
 					</article>
@@ -119,7 +113,7 @@ get_header('home'); ?>
 		<div class="container light">
 			<div class="row dim">
 				<div class="col-sm-6">
-					<h4>Who</h4>
+					<h4 class="light">Who</h4>
 						<p><img class="me" src="<?php echo get_template_directory_uri();?>/img/me.png">
 							Hello People of the Internet. As you may have discerned, my name is David Windham. Usually when I fill in a bio on a page, I just write 'something else' because I'm not fond of describing myself. I'm a just a simple man living in South Carolina. Here is a <a href="bio">Bio</a> and <a href="CV">CV</a>
 						</p>
@@ -127,11 +121,11 @@ get_header('home'); ?>
 				<div class="col-xs-6">
 					<div class="row">
 						<div class="col-sm-7">
-							<h4>What</h4>
+							<h4 class="light">What</h4>
 							<p>Developer, Designer, Programmer, Artist, Illustrator, Problem Solver, Team Player, Creative, Innovative, Critical, Persistant, Motivated, Productive, Detail Oriented, Responsive, and Occasionally On Task.<p>
 						</div>
 						<div class="col-sm-5">
-							<h4>How</h4>
+							<h4 class="light">How</h4>
 							<div class="table-responsive">
 							  <table class="table table-condensed icons" style><tbody>
 									<tr>
@@ -169,8 +163,7 @@ get_header('home'); ?>
 		<div class="container">
 			<div class="row">
 				<div class="col-sm-8">
-				<div class="row">
-					<h4 class="dim">Why <small>(<i>You'll have to tell me</i>)</small></h3>
+					<h4 class="light">Why <small>(<i>You'll have to tell me</i>)</small></h3>
 					<form action="//davidawindham.us1.list-manage.com/subscribe/post?u=f581cb29340364ff0a4421d5c&amp;id=d7b8f624d3" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
 						<div class="form-row texts">
 							<label class='text-field'>
@@ -208,42 +201,8 @@ get_header('home'); ?>
 						</div>
 					</form>
 				</div>
-				<div class="row" style="padding-top:30px;">
-					<div class="row">
-						<div class="col-sm-2">
-							<ul>
-								<li><a href="<?php echo home_url( '/' ); ?>about"><span class="fa fa-file-text-o fa-fw"></span> About</a></li>
-								<li><a href="<?php echo home_url( '/' ); ?>desk"><span class="fa fa-pencil-square-o fa-fw"></span> Desk</a></li>
-								<li><a href="http://code.davidawindham.com"><span class="fa fa-code fa-fw"></span> Code</a></li>
-							</ul>
-						</div>
-						<div class="col-sm-2">
-							<ul>
-								<li><a href="<?php echo home_url( '/' ); ?>studio"><span class="fa fa-lightbulb-o fa-fw"></span> Studio</a></li>
-								<li><a href="<?php echo home_url( '/' ); ?>contact"><span class="fa fa-envelope-o fa-fw"></span> Contact</a></li>
-								<li><a href="<?php echo home_url( '/' ); ?>sitemap"><span class="fa fa-sitemap fa-fw"></span> Sitemap</a></li>
-							</ul>
-						</div>
-					</div>
-					<div class="row">
-						<ul class="social">
-							<li><a href="https://github.com/windhamdavid" class="" rel="me"><span class="fa fa-2x fa-github-square"></span></a></li>
-							<li><a href="https://twitter.com/windhamdavid" class="" rel="me"><span class="fa fa-2x fa-twitter-square"></span></a></li>
-							<li><a href="https://plus.google.com/+DavidWindham1" class="" rel="me"><span class="fa fa-2x fa-google-plus-square"></span></a></li>
-							<li><a href="https://www.facebook.com/windhamdavid" class=""><span class="fa fa-2x fa-facebook-square"></span></a></li>
-							<li><a href="http://windhamdavid.tumblr.com/" class=""><span class="fa fa-2x fa-tumblr-square"></span></a></li>		
-							<li><a href="http://vimeo.com/windhamdavid" class=""><span class="fa fa-2x fa-vimeo-square"></span></a></li>
-						</ul>
-					</div>
-					<div class="col-sm-2">
-					</div>
-					<div class="col-sm-6">
-
-					</div>
-				</div>
-			</div>
 				<div class="col-sm-4">
-					<h4 class="dim">When</h4>
+					<h4 class="light">When</h4>
 					<div class="calendar"></div>
 				</div>
 			</div>

File diff suppressed because it is too large
+ 50 - 93
page-studio.php


+ 32 - 14
style.css

@@ -589,13 +589,6 @@ h5.contact {
 	box-shadow: 0 0 50px rgba(0,0,0,0.8);
 	padding: 100px 0;
 }
-.caro-grad {
-	background: #5E7A9B;
-	background: -webkit-linear-gradient(top, #355069 0, #5e7a9b 100%);
-	background: -moz-linear-gradient(top, #355069 0, #5e7a9b 100%);
-	background: -o-linear-gradient(top, #355069 0, #5e7a9b 100%);
-	background: linear-gradient(top, #355069 0, #5e7a9b 100%);
-}
 .about {
 	padding: 30px 0 0;
 }
@@ -628,7 +621,7 @@ h5.contact {
 	min-height: 400px;
 }
 #caro {
-	
+	min-height: 400px;
 }
 .hide-svg {
 	visibility: hidden;
@@ -658,7 +651,27 @@ h5.contact {
 	float: right;
 	background: transparent url('img/web.gif') no-repeat 28% 15%;
 }
-
+.caro-grad {
+	background: #5E7A9B;
+	background: -webkit-linear-gradient(top, #355069 0, #5e7a9b 100%);
+	background: -moz-linear-gradient(top, #355069 0, #5e7a9b 100%);
+	background: -o-linear-gradient(top, #355069 0, #5e7a9b 100%);
+	background: linear-gradient(top, #355069 0, #5e7a9b 100%);
+}
+.caro-grad2 {
+	background: #5E7A9B;
+	background: -webkit-linear-gradient(top, #000 0, #5e7a9b 100%);
+	background: -moz-linear-gradient(top, #000 0, #5e7a9b 100%);
+	background: -o-linear-gradient(top, #000 0, #5e7a9b 100%);
+	background: linear-gradient(top, #000 0, #5e7a9b 100%);
+}
+.caro-grad3 {
+	background: #5E7A9B;
+	background: -webkit-linear-gradient(top, #fff 0, #5e7a9b 100%);
+	background: -moz-linear-gradient(top, #fff 0, #5e7a9b 100%);
+	background: -o-linear-gradient(top, #fff 0, #5e7a9b 100%);
+	background: linear-gradient(top, #fff 0, #5e7a9b 100%);
+}
 .bg1 {
 	background-size: cover;
 	-webkit-background-size: cover;
@@ -970,9 +983,7 @@ h5.contact {
   -webkit-transform: rotate(-45deg);
   -o-transform: rotate(-45deg);
 }
-ul.social {
-	padding: 5px 15px;
-}
+
 ul.social li {
 	float: left;
 	padding: 1px 3px;
@@ -1081,13 +1092,20 @@ article h2 {
 article.home {
 	background: rgba(255, 255, 255, 0.9);
 	padding: 70px 60px;
-	border-radius: 10px;
-	min-height: 280px;
+	border-radius: 5px;
+	min-height: 180px;
+	box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
 }
 article.single {
 	background: #fff;
 	box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
 }
+article.blurb {
+	background: #fff;
+	padding: 10px 15px;
+	margin:25px 0;
+	box-shadow: 0 0 5px rgba(0, 0, 0, 0.1);
+}
 .post {
 	margin-bottom: 40px;
 }