windhamdavid 5 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">

File diff suppressed because it is too large
+ 57 - 5
index.php