windhamdavid 5 years ago
parent
commit
929e7ef6cc
7 changed files with 15 additions and 800 deletions
  1. 0 207
      card.css
  2. 0 88
      card.php
  3. 0 184
      css/card-ie.css
  4. 0 198
      css/card-mob.css
  5. 3 24
      front-page.php
  6. 12 11
      functions.php
  7. 0 88
      page-card.php

+ 0 - 207
card.css

@@ -1,207 +0,0 @@
-/* @override http://silverbullet.local/~david/trunk/david/wp-content/themes/daw/card.css */
-
-html, body, div, span, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-abbr, address, cite, code,
-del, dfn, em, img, ins, kbd, q, samp,
-small, strong, sub, sup, var,
-b, i,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section, summary,
-time, mark, audio, video {
-  margin:0;
-  padding:0;
-  border:0;
-  outline:0;
-  font-size:100%;
-  vertical-align:baseline;
-  background:transparent;
-}
-
-body {
-	line-height: 1;
-
-}
-h1, h2, h3, h4, h5, h6 {
-	clear: both;
-	font-weight: normal;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote {
-	quotes: none;
-}
-blockquote:before, blockquote:after {
-	content: '';
-	content: none;
-}
-del {
-	text-decoration: line-through;
-}
-
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-a img {
-	border: none;
-}
-.clear {
-	clear: both;
-}
-
-
-
-
-body {
-		background: rgba(160,160,160,0.73) url(img/3.png);
-}
-body,
-input,
-textarea {
-	color: #666;
-	font-size: 12px;
-	line-height: 18px;
-}
-hr {
-	background-color: #e7e7e7;
-	border: 0;
-	clear: both;
-	height: 1px;
-	margin-bottom: 18px;
-}
-
-/* Text elements */
-p {
-	font-size: 13px;
-	margin-bottom: 8px;
-}
-h4 {
-	font-size: 13px;
-	margin-bottom: 10px;
-}
-h3 {
-	font-size: 14px;
-	margin-bottom: 0px;
-}
-h2 {
-	font-size: 16px;
-	margin-left: 25px;
-}
-	p.noindent {
-	margin-bottom: 10px;
-	text-indent : 0px;
-}
-a:link {
-	color: #000;
-	text-decoration: none;
-}
-a:visited {
-	color: #000;
-	text-decoration: none;
-}
-a:active,
-a:hover {
-	color: #757576;
-	text-decoration: none;
-}
-
-/* Text meant only for screen readers */
-.screen-reader-text {
-	position: absolute;
-	left: -9000px;
-}
-
-/* =Layout
--------------------------------------------------------------- */
-body {
-  padding: 0;
-  margin: 0;
-}
-.header {
-	margin: 0 0 50px 0;
-}
-#container {
-	margin: 0 auto;
-	text-align: center;
-}
-#content {
-	margin: 150px auto;	
-	width:500px;
-	background: #fff;
-	padding: 20px;
-	border: 1px solid #dadada;
-}
-#content img {
-	float: left;
-	margin: -5px 0 -40px 95px;
-}
-#content .icons img {
-	margin: 3px;
-	float: none;
-}
-.card #content {
-	margin: 150px auto;
-	-webkit-animation-name: Rotation;
-	-webkit-animation-iteration-count: infinite;
-	-webkit-animation-timing-function: linear;
-	-webkit-animation-duration: 400s;
-	z-index:-1;
-	width:450px;
-	border-top: 1px solid #fff;
-    -webkit-box-shadow: 0px 3px 5px #cbcbcb;
-    -moz-box-shadow: 0px 3px 5px #cbcbcb;
-    box-shadow: 0px 3px 5px #cbcbcb;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-
-}
-
-.bottom {
-	margin-top: 32px;
-}
-.bottom p {
-	margin: 0;
-}
-.bottom a {
-	color: #666;
-}
-.left-bottom {
-	float: left;
-	display: block;
-	text-align: left;
-	margin: 0px 0 0 50px;
-}
-.left-bottom p {
-	font-size: 9px;
-}
-.right-bottom {
-
-	margin: 0px 50px 0 0;
-	text-align: right;
-	font-size: 9px;
-}
-.right-bottom p {
-	font-size: 9px;
-}
-.contact {
-	font-size: 12px;
-}
-
-
-
-@-webkit-keyframes Rotation {
-from {
-	-webkit-transform: rotate(0deg);
-	}
-
-to {
-	-webkit-transform: rotate(360deg);
-
-	}
-}

File diff suppressed because it is too large
+ 0 - 88
card.php


+ 0 - 184
css/card-ie.css

@@ -1,184 +0,0 @@
-html, body, div, span, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-abbr, address, cite, code,
-del, dfn, em, img, ins, kbd, q, samp,
-small, strong, sub, sup, var,
-b, i,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section, summary,
-time, mark, audio, video {
-  margin:0;
-  padding:0;
-  border:0;
-  outline:0;
-  font-size:100%;
-  vertical-align:baseline;
-  background:transparent;
-}
-
-body {
-	line-height: 1;
-
-}
-h1, h2, h3, h4, h5, h6 {
-	clear: both;
-	font-weight: normal;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote {
-	quotes: none;
-}
-blockquote:before, blockquote:after {
-	content: '';
-	content: none;
-}
-del {
-	text-decoration: line-through;
-}
-
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-a img {
-	border: none;
-}
-.clear {
-	clear: both;
-}
-
-
-
-
-body {
-		background: rgba(160,160,160,0.73) url(images/3.png);
-}
-body,
-input,
-textarea {
-	color: #666;
-	font-size: 12px;
-	line-height: 18px;
-}
-hr {
-	background-color: #e7e7e7;
-	border: 0;
-	clear: both;
-	height: 1px;
-	margin-bottom: 18px;
-}
-
-/* Text elements */
-p {
-	font-size: 13px;
-	margin-bottom: 8px;
-}
-h4 {
-	font-size: 13px;
-	margin-bottom: 10px;
-}
-h3 {
-	font-size: 14px;
-	margin-bottom: 0px;
-}
-h2 {
-	font-size: 16px;
-}
-	p.noindent {
-	margin-bottom: 10px;
-	text-indent : 0px;
-}
-a:link {
-	color: #000;
-	text-decoration: none;
-}
-a:visited {
-	color: #000;
-	text-decoration: none;
-}
-a:active,
-a:hover {
-	color: #757576;
-	text-decoration: none;
-}
-
-/* Text meant only for screen readers */
-.screen-reader-text {
-	position: absolute;
-	left: -9000px;
-}
-
-/* =Layout
--------------------------------------------------------------- */
-body {
-  padding: 0;
-  margin: 0;
-}
-.header {
-	margin: 0 0 55px 0;
-}
-#container {
-	margin: 0 auto;
-	text-align: center;
-}
-#content {
-	margin: 150px auto;	
-	width:500px;
-	background: #fff;
-	padding: 20px;
-	border: 1px solid #dadada;
-}
-#content img {
-	float: left;
-	margin: -5px 0 -40px 65px;
-}
-.card #content {
-	margin: 150px auto;
-	width: 500px;
-//	-webkit-animation-name: Rotation;
-	-webkit-animation-iteration-count: infinite;
-	-webkit-animation-timing-function: linear;
-	-webkit-animation-duration: 400s;
-	z-index:-1;
-	border-top: 1px solid #fff;
-    -webkit-box-shadow: 0px 3px 5px #cbcbcb;
-    -moz-box-shadow: 0px 3px 5px #cbcbcb;
-    box-shadow: 0px 3px 5px #cbcbcb;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-
-}
-
-.bottom {
-	margin-top: 50px;
-}
-.bottom p {
-	margin: 0;
-}
-.left-bottom {
-	float: left;
-	display: block;
-	text-align: left;
-	margin: 0px 0 0 50px;
-}
-.left-bottom p {
-	font-size: 9px;
-}
-.right-bottom {
-
-	margin: 0px 50px 0 0;
-	text-align: right;
-	font-size: 9px;
-}
-.right-bottom p {
-	font-size: 9px;
-}
-.contact {
-	font-size: 12px;
-}

+ 0 - 198
css/card-mob.css

@@ -1,198 +0,0 @@
-html, body, div, span, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-abbr, address, cite, code,
-del, dfn, em, img, ins, kbd, q, samp,
-small, strong, sub, sup, var,
-b, i,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, figcaption, figure, 
-footer, header, hgroup, menu, nav, section, summary,
-time, mark, audio, video {
-  margin:0;
-  padding:0;
-  border:0;
-  outline:0;
-  font-size:100%;
-  vertical-align:baseline;
-  background:transparent;
-}
-
-body {
-	line-height: 1;
-
-}
-h1, h2, h3, h4, h5, h6 {
-	clear: both;
-	font-weight: normal;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote {
-	quotes: none;
-}
-blockquote:before, blockquote:after {
-	content: '';
-	content: none;
-}
-del {
-	text-decoration: line-through;
-}
-
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-a img {
-	border: none;
-}
-.clear {
-	clear: both;
-}
-
-
-
-
-body {
-		background: rgba(160,160,160,0.73) url(images/3.png);
-}
-body,
-input,
-textarea {
-	color: #666;
-	font-size: 12px;
-	line-height: 18px;
-}
-hr {
-	background-color: #e7e7e7;
-	border: 0;
-	clear: both;
-	height: 1px;
-	margin-bottom: 18px;
-}
-
-/* Text elements */
-p {
-	font-size: 13px;
-	margin-bottom: 8px;
-}
-h4 {
-	font-size: 17px;
-	margin-bottom: 10px;
-}
-h3 {
-	font-size: 19px;
-	margin-bottom: 0px;
-}
-h2 {
-	font-size: 21px;
-}
-	p.noindent {
-	margin-bottom: 10px;
-	text-indent : 0px;
-}
-a:link {
-	color: #000;
-	text-decoration: none;
-}
-a:visited {
-	color: #000;
-	text-decoration: none;
-}
-a:active,
-a:hover {
-	color: #757576;
-	text-decoration: none;
-}
-
-/* Text meant only for screen readers */
-.screen-reader-text {
-	position: absolute;
-	left: -9000px;
-}
-
-/* =Layout
--------------------------------------------------------------- */
-body {
-  padding: 0;
-  margin: 0;
-}
-.header {
-	margin: 0 0 55px 0;
-}
-#container {
-	margin: 0 auto;
-	text-align: center;
-}
-#content {
-	margin: 150px auto;	
-	width:500px;
-	background: #fff;
-	padding: 20px;
-	border: 1px solid #dadada;
-}
-#content img {
-	float: left;
-	margin: -5px 0 -40px 80px;
-}
-.card #content {
-	margin: 150px auto;
-//	-webkit-animation-name: Rotation;
-	-webkit-animation-iteration-count: infinite;
-	-webkit-animation-timing-function: linear;
-	-webkit-animation-duration: 400s;
-	z-index:-1;
-	width:550px;
-	border-top: 1px solid #fff;
-    -webkit-box-shadow: 0px 3px 5px #cbcbcb;
-    -moz-box-shadow: 0px 3px 5px #cbcbcb;
-    box-shadow: 0px 3px 5px #cbcbcb;
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-
-}
-
-.bottom {
-	margin-top: 50px;
-}
-.bottom p {
-	margin: 0;
-	font-size: 9px;
-}
-.left-bottom {
-	float: left;
-	display: block;
-	text-align: left;
-	margin: 0px 0 0 50px;
-}
-.left-bottom p {
-	font-size: 9px;
-}
-.right-bottom {
-
-	margin: 0px 50px 0 0;
-	text-align: right;
-	font-size: 9px;
-}
-.right-bottom p {
-	font-size: 9px;
-}
-.contact {
-	font-size: 12px;
-}
-
-
-
-@-webkit-keyframes Rotation {
-from {
-	-webkit-transform: rotate(0deg);
-	}
-
-to {
-	-webkit-transform: rotate(360deg);
-
-	}
-}

+ 3 - 24
front-page.php

@@ -67,29 +67,8 @@
 
 		</div> 
 	</div>
-<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>
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="//davidawindham.com/wik/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
-    _paq.push(['setSiteId', 1]);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<noscript><p><img src="//davidawindham.com/wik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
-	  
-<script type='text/javascript' src='<?php echo get_template_directory_uri();?>/js/jquery-2.1.1.min.js'></script>
-<script type="text/javascript" src='<?php echo get_template_directory_uri();?>/js/card.js'></script>
+<script type='text/javascript' src='<?php echo get_template_directory_uri();?>/js/script-o.js'></script>
+<script type='text/javascript' src='<?php echo get_template_directory_uri();?>/js/init-o.js'></script>
+<?php wp_footer(); ?>
 </body> 
 </html>

+ 12 - 11
functions.php

@@ -44,10 +44,16 @@ function dw_scripts() {
 	
 	wp_deregister_script('jquery');
 
+	if ( is_front_page() ) {
+		wp_enqueue_style( 'card', get_template_directory_uri() . '/css/card.css');
+		wp_enqueue_script('jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true);
+		wp_enqueue_script( 'card', get_template_directory_uri() . '/js/card.js', 'jquery', '', true );	
+	}
 	
-	
-	if ( is_front_page() || is_home() ) {
-		
+	elseif ( is_page('card') ) {
+		wp_enqueue_style( 'card', get_template_directory_uri() . '/css/card.css');
+		wp_enqueue_script('jquery', get_template_directory_uri() . '/js/jquery-2.1.1.min.js', array(), false, true);
+		wp_enqueue_script( 'card', get_template_directory_uri() . '/js/card.js', 'jquery', '', true );
 	}
 	
 	elseif ( is_page('home') ) {	
@@ -76,11 +82,6 @@ function dw_scripts() {
 		wp_enqueue_script( 'last-fm', get_template_directory_uri() . '/js/fm.js', 'jquery', '', true );
 	}
 	
-	elseif ( is_page('card') ) {
-		wp_enqueue_style( 'card', get_template_directory_uri() . '/css/card.css');
-		wp_enqueue_script( 'card', get_template_directory_uri() . '/js/card.js', 'jquery', '', true );
-	}
-	
 	elseif ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'jquery', get_template_directory_uri() . '/js/script-o.js', '', '', true );
 		wp_enqueue_script( 'init-o', get_template_directory_uri() . '/js/init-o.js', '', '', true );
@@ -131,9 +132,9 @@ function dw_scripts() {
 
 add_action('wp_footer', 'dw_html5shim', 21);
 function dw_html5shim() { ?>
-	<!--[if lt IE 9]>
-		<script src="<?php echo get_template_directory_uri() . '/js/html5shiv.min.js'?>"></script>
-	<![endif]-->
+<!--[if lt IE 9]>
+	<script src="<?php echo get_template_directory_uri() . '/js/html5shiv.min.js'?>"></script>
+<![endif]-->
 <?php }
 	
 

File diff suppressed because it is too large
+ 0 - 88
page-card.php