windhamdavid 10 years ago
parent
commit
309756b6b1
5 changed files with 75 additions and 25 deletions
  1. 2 2
      css/bootstrap.css
  2. 2 2
      footer-home.php
  3. 5 6
      functions.php
  4. 9 10
      header-home.php
  5. 57 5
      index.php

+ 2 - 2
css/bootstrap.css

@@ -1,12 +1,12 @@
 /* @override http://macs.local/david/wp-content/themes/dw/css/bootstrap.css */
 
-/*
+/*!
  * Bootstrap v3.2.0 (http://getbootstrap.com)
  * Copyright 2011-2014 Twitter, Inc.
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 
-/* normalize.css v3.0.1 | MIT License | git.io/normalize */
+/*! normalize.css v3.0.1 | MIT License | git.io/normalize */
 html {
   font-family: sans-serif;
   -webkit-text-size-adjust: 100%;

+ 2 - 2
footer-home.php

@@ -12,7 +12,7 @@
 							<li><a href="#archives" data-toggle="collapse" data-parent=".navmenu"><span class="fa fa-folder-open-o fa-fw"></span> Archives</a>
 						</ul>
 					</div>
-					<div class="col-md-6">
+					<div class="col-lg-6">
 						<ul>
 							<li class="dim"><a href="<?php echo home_url( '/' ); ?>"><span class="fa fa-home fa-fw"></span> Address</a>: South Carolina USA</li>
 							<li class="dim"><a href="<?php echo home_url( '/' ); ?>"><span class="fa fa-phone fa-fw"></span> Phone</a>: 803-712-3283</li>
@@ -44,7 +44,7 @@
 							<li class="dim"><a href="<?php echo home_url( '/' ); ?>"><span class="fa fa-calculator fa-fw"></span> Billing</a>: billing.davidawindham.com</li>
 						</ul>
 					</div>
-					<div class="col-md-4">
+					<div class="col-lg-4">
 
 					</div>
 				</div>

+ 5 - 6
functions.php

@@ -30,7 +30,7 @@ function dw_scripts() {
 	
 	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( 'modern', get_template_directory_uri() . '/js/modernizr.js', 'jquery', '', 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 );
@@ -42,18 +42,17 @@ function dw_scripts() {
 	//wp_enqueue_script( 'scriptmin', get_template_directory_uri() . '/js/script.min.js', 'jquery', '', true );
 	//wp_enqueue_script( 'script', get_template_directory_uri() . '/js/script.js', 'jquery', '', true );
 
-
+	if ( is_front_page() || is_home() ) {
+		//wp_enqueue_script( 'skroll', get_template_directory_uri() . '/js/skrollr.min.js', 'jquery', '', true );	
+	} 
 
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );
 	} 
 	
-	if ( is_front_page() || is_home() ) {
-		//wp_enqueue_script( 'skroll', get_template_directory_uri() . '/js/skrollr.min.js', 'jquery', '', true );	
-	} 
-	
 	wp_enqueue_script( 'init', get_template_directory_uri() . '/js/init.js', 'jquery', '', true );
 	
+	
 	if ( is_page('notebook') || is_archive() || is_search() ) {
 		
 		global $wp_rewrite;

+ 9 - 10
header-home.php

@@ -19,7 +19,7 @@
 	<div class="container-full">
 		<div class="container">
 			<div class="row">
-				<div class="col-lg-8 col-lg-offset-2 col-centered">
+				<div class="col-lg-8 col-lg-offset-2 centered">
 					<div class="welcome"></div>
 					<div class="screen-reader">
 						<h1>Hello,</h1>
@@ -30,17 +30,16 @@
 			</div>
 		</div>
 	</div>
-	<div class="container-full top-lead">
-		<div class="container">
-		</div>
-	</div>
 </div>
 <div class="modal fade terminal" tabindex="-1" role="dialog" aria-labelledby="welcomeback" aria-hidden="true">
-  <div class="modal-dialog modal-lg">
-    <div class="modal-content">
-      <div class="welcome-back"></div>
-    </div>
-  </div>
+	<div class="modal-dialog modal-lg">
+		<div class="modal-content">
+			<div class="welcome-back">
+				<div class="welcome-back-text"></div>
+				<div class="thermo"></div>	
+			</div>
+		</div>
+	</div>
 </div>
 <header id="header">
 	<div id="nav">

+ 57 - 5
index.php

@@ -32,12 +32,12 @@
 			</div>
 		</div>
 	</div>
-	<video id="tv" class="sat" preload="auto" autoplay="true" loop="loop" muted="muted" volume="0">
+	<video id="tv" class="sat" preload="auto" autostart="false" loop="loop" poster="wp-content/themes/dw/img/tv.jpg">
 	     <source src="<?php echo get_bloginfo('template_directory');?>/img/tv.mp4" type="video/mp4">
 	     <source src="<?php echo get_bloginfo('template_directory');?>/img/tv.webm" type="video/webm">
 	</video>
 	<div class="container-full">
-		<div id="carousel" class="carousel slide carousel-fade" data-ride="carousel">
+		<div id="caro-lead" class="carousel slide carousel-fade" data-ride="carousel" data-interval="false">
 			<div class="carousel-inner">
 				<div class="item active">
 					<div class="container">
@@ -128,18 +128,70 @@
 		<div class="container">
 			<div class="row">
 				<div class="col-xs-5">
-
+					<p>&nbsp;</p>
+					<p>&nbsp;</p>
+					<p>&nbsp;</p>
 				</div>
 				<div class="col-xs-4">
 					
 				</div>
-				<div class="col-xs-3 front-nav">
+				<div class="col-xs-2">
 					
 				</div>
 			</div>
 		</div>
 	</div>
-	<div class="container-full dark">
+	<div class="container-full top-lead">
+		<div id="caro" class="carousel slide">
+			<ol class="carousel-indicators">
+			    <li data-target="#caro" data-slide-to="0" class="active"></li>
+			    <li data-target="#caro" data-slide-to="1"></li>
+			    <li data-target="#caro" data-slide-to="2"></li>
+			  </ol>
+			<div class="carousel-inner">
+				<div class="item active">
+					<div class="container animac">
+						<svg xmlns="http://www.w3.org/2000/svg" id="svg-mac" class="svg" viewBox="0 0 960 480" preserveAspectRatio="xMinYMin meet">
+							<path fill="#B4BEC8" stroke="#B4BEC8" stroke-width="2px" stroke-miterlimit="10" d="M570.14 440.2l-29.165-28.99c-7.103-8.5-6.152-36.718-6.02-40.665H425.048c.133 3.947 1.082 32.164-6.018 40.666l-29.166 28.99c-1.237 1.404-1.712 2.505-1.623 3.37h-.054c.76 7.727 6.664 6.332 13.607 6.332H558.01c6.696 0 12.412 1.27 13.493-5.56.58-.953.274-2.282-1.364-4.14z"/>
+							<path fill="#C8D2DC" stroke="#C8D2DC" stroke-width="2px" stroke-miterlimit="10" d="M727.488 355.125c0 8.514-6.597 15.42-14.738 15.42h-465.5c-8.14 0-14.74-6.906-14.74-15.42V45.42c0-8.517 6.6-15.42 14.74-15.42h465.5c8.142 0 14.738 6.903 14.738 15.42v309.705z"/>
+							<path fill="#fff" stroke="#C8D2DC" stroke-width="2px" stroke-miterlimit="10" d="M489.01 343.713c-.042-4.223 3.447-6.254 3.605-6.352-1.963-2.866-5.018-3.263-6.102-3.31-2.602-.26-5.074 1.53-6.39 1.53s-3.356-1.49-5.506-1.448c-2.836.04-5.445 1.645-6.907 4.182-2.942 5.11-.75 12.672 2.116 16.814 1.4 2.02 3.072 4.305 5.268 4.22 2.114-.08 2.913-1.362 5.467-1.362 2.556 0 3.274 1.363 5.51 1.322 2.273-.04 3.716-2.064 5.105-4.098 1.61-2.35 2.273-4.63 2.313-4.748-.05-.02-4.434-1.7-4.48-6.75M484.807 331.31c1.168-1.41 1.953-3.37 1.738-5.327-1.68.068-3.713 1.12-4.916 2.53-1.08 1.247-2.027 3.245-1.77 5.16 1.87.143 3.784-.95 4.947-2.362"/>
+							<path fill="#3C4650" stroke="#3C4650" stroke-width="2px" stroke-miterlimit="10" d="M727.488 315.527V45.982c0-8.828-6.597-15.982-14.738-15.982h-465.5c-8.14 0-14.74 7.155-14.74 15.982v269.545H727.49z"/>
+							<path fill="#141E28" stroke="#141E28" stroke-width="2px" stroke-miterlimit="10" d="M251.2 48.887h457.205v245.52H251.2z"/>
+						</svg>
+					</div>
+				</div>
+				<div class="item">
+					<div class="container animac hide-svg">
+						<svg xmlns="http://www.w3.org/2000/svg" id="svg-imac" class="svg" viewBox="0 0 960 480" preserveAspectRatio="xMinYMin meet">
+							<path fill="#B4BEC8" stroke="#B4BEC8" stroke-width="2px" stroke-miterlimit="10" d="M570.14 440.2l-29.165-28.99c-7.103-8.5-6.152-36.718-6.02-40.665H425.048c.133 3.947 1.082 32.164-6.018 40.666l-29.166 28.99c-1.237 1.404-1.712 2.505-1.623 3.37h-.054c.76 7.727 6.664 6.332 13.607 6.332H558.01c6.696 0 12.412 1.27 13.493-5.56.58-.953.274-2.282-1.364-4.14z"/>
+							<path fill="#C8D2DC" stroke="#C8D2DC" stroke-width="2px" stroke-miterlimit="10" d="M727.488 355.125c0 8.514-6.597 15.42-14.738 15.42h-465.5c-8.14 0-14.74-6.906-14.74-15.42V45.42c0-8.517 6.6-15.42 14.74-15.42h465.5c8.142 0 14.738 6.903 14.738 15.42v309.705z"/>
+							<path fill="#fff" stroke="#C8D2DC" stroke-width="2px" stroke-miterlimit="10" d="M489.01 343.713c-.042-4.223 3.447-6.254 3.605-6.352-1.963-2.866-5.018-3.263-6.102-3.31-2.602-.26-5.074 1.53-6.39 1.53s-3.356-1.49-5.506-1.448c-2.836.04-5.445 1.645-6.907 4.182-2.942 5.11-.75 12.672 2.116 16.814 1.4 2.02 3.072 4.305 5.268 4.22 2.114-.08 2.913-1.362 5.467-1.362 2.556 0 3.274 1.363 5.51 1.322 2.273-.04 3.716-2.064 5.105-4.098 1.61-2.35 2.273-4.63 2.313-4.748-.05-.02-4.434-1.7-4.48-6.75M484.807 331.31c1.168-1.41 1.953-3.37 1.738-5.327-1.68.068-3.713 1.12-4.916 2.53-1.08 1.247-2.027 3.245-1.77 5.16 1.87.143 3.784-.95 4.947-2.362"/>
+							<path fill="#3C4650" stroke="#3C4650" stroke-width="2px" stroke-miterlimit="10" d="M727.488 315.527V45.982c0-8.828-6.597-15.982-14.738-15.982h-465.5c-8.14 0-14.74 7.155-14.74 15.982v269.545H727.49z"/>
+							<path fill="#141E28" stroke="#141E28" stroke-width="2px" stroke-miterlimit="10" d="M251.2 48.887h457.205v245.52H251.2z"/>
+						</svg>
+					</div>
+				</div>
+				<div class="item">
+					<div class="container animac hide-svg">
+						<svg xmlns="http://www.w3.org/2000/svg" id="svg" class="svg" width="250px" height="250px" preserveAspectRatio="xMinYMin meet">
+							<path fill="#3C4650" stroke="#B4BEC8" stroke-width="2px" stroke-miterlimit="10"  d="M0.5,125a124.5,124.5 0 1,0 249,0a124.5,124.5 0 1,0 -249,0"/>
+							<path fill="#B4BEC8" stroke="#B4BEC8" stroke-width="2px" stroke-miterlimit="10"  d="M242.8,131.8c-0.4-29.9-22.1-50.1-48.1-50c-16.9,0-28.6,8.4-28.6,8.4s12.7-16.2,12.6-36.9c-0.2-24.7-23-47.9-52.4-47.9C97.6,5.4,71.8,26,72.3,55.5C72.6,76.3,85,90.2,85,90.2c0,0-13.9-8.7-29-8.2C16.5,83,6.6,115.8,7.3,132.9c1.2,33.4,15.4,53.8,52.7,54.2c34.2,0.4,54.9-32.3,61-43.5c1.5-9.5,0-13.9,0-13.9c-3.1,1.6-14.5,27.9-35.6,16.1c-6.8-3.8-8.8-16.7-5.2-26.3c6.3-16.9,18.3-18.7,36-40.3c6.8-8.3,8.2-13.6,8.2-13.6s1.2,5.2,7.8,13.2c17.4,21.2,30.1,23.6,36.7,40.4c4.1,10.4,1.8,23-6,26.9c-20.3,10.1-31.4-15.1-34.9-16.5c0,0-1.2,4,0.1,12.8c2.6,5.7,21.7,44.2,64,44.2C226.3,186.6,243.1,156.2,242.8,131.8z"/>
+							<path fill="#B4BEC8" stroke="#B4BEC8" stroke-width="2px" stroke-miterlimit="10"  d="M124.5,154.1c0,0-10.8,37.5-12.7,41.9c-4.9,11.3-26.6,38.8-26.6,38.8s25.2-2.8,40.4-2.8c15.6,0,39.2,3.2,39.2,3.2s-22.8-28.1-27.6-39.6C135.4,191.2,124.5,154.1,124.5,154.1z"/>
+						</svg>
+					</div>
+				</div>
+			</div>
+			<a class="left carousel-control" href="#caro" role="button" data-slide="prev">
+			    <span class="glyphicon glyphicon-chevron-left"></span>
+			    <span class="sr-only">Previous</span>
+			  </a>
+			  <a class="right carousel-control" href="#caro" role="button" data-slide="next">
+			    <span class="glyphicon glyphicon-chevron-right"></span>
+			    <span class="sr-only">Next</span>
+			  </a>
+		</div>
+	</div>
+	<div class="container-full dark bottom">
 		<div class="container">
 			<div class="row">
 				<div class="col-sm-8">