windhamdavid 4 years ago
parent
commit
7017f55846
8 changed files with 80 additions and 51 deletions
  1. 1 1
      404.php
  2. 9 10
      footer-home.php
  3. 9 10
      footer-studio.php
  4. 1 1
      page-contact.php
  5. 1 1
      page-desk.php
  6. 1 1
      page-sitemap.php
  7. 6 6
      page-studio.php
  8. 52 21
      style.css

+ 1 - 1
404.php

@@ -16,4 +16,4 @@
 			</div>
 		</div>
 	</div>
-<?php get_footer('studio'); ?>
+<?php get_footer('home'); ?>

+ 9 - 10
footer-home.php

@@ -1,27 +1,26 @@
-<div class="container-fluid footer-home dark">
+<div class="container-fluid footer footer-home dark">
 	<div class="container">
 		<div class="row">
 			<div class="col-sm-3">
-				<ul style="float:left;margin-right:10px;">
+				<ul style="float:left;margin-right:5px;">
 					<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>
+					<li><a href="<?php echo home_url( '/' ); ?>shop"><span class="fa fa-credit-card fa-fw"></span> Shop</a></li>
 				</ul>
 				<ul>
+					<li><a href="<?php echo home_url( '/' ); ?>desk"><span class="fa fa-pencil-square-o fa-fw"></span> Desk</a></li>
 					<li><a href="<?php echo home_url( '/' ); ?>studio"><span class="fa fa-flask 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 class="social">			
+					<li><a href="https://twitter.com/windhamdavid" class="twitter" rel="me"><span class="fa fa-2x fa-twitter-square"></span></a></li>
+					<li><a href="https://plus.google.com/+DavidWindham1" class="gplus" rel="me"><span class="fa fa-2x fa-google-plus-square"></span></a></li>
+					<li><a href="https://www.facebook.com/windhamdavid" class="facebook"><span class="fa fa-2x fa-facebook-square"></span></a></li>
+					<li><a href="https://github.com/windhamdavid" class="github" rel="me"><span class="fa fa-2x fa-github-square"></span></a></li>
 				</ul>
 			</div>
 			<div class="col-md-3 col-sm-offset-5">

+ 9 - 10
footer-studio.php

@@ -1,27 +1,26 @@
-<div class="container-fluid footer-home dark">
+<div class="container-fluid footer footer-home dark">
 	<div class="container">
 		<div class="row">
 			<div class="col-sm-3">
-				<ul style="float:left;margin-right:10px;">
+				<ul style="float:left;margin-right:5px;">
 					<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>
+					<li><a href="<?php echo home_url( '/' ); ?>shop"><span class="fa fa-credit-card fa-fw"></span> Shop</a></li>
 				</ul>
 				<ul>
+					<li><a href="<?php echo home_url( '/' ); ?>desk"><span class="fa fa-pencil-square-o fa-fw"></span> Desk</a></li>
 					<li><a href="<?php echo home_url( '/' ); ?>studio"><span class="fa fa-flask 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( '/' ); ?>shop"><span class="fa fa-credit-card fa-fw"></span> Shop</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 class="social">			
+					<li><a href="https://twitter.com/windhamdavid" class="twitter" rel="me"><span class="fa fa-2x fa-twitter-square"></span></a></li>
+					<li><a href="https://plus.google.com/+DavidWindham1" class="gplus" rel="me"><span class="fa fa-2x fa-google-plus-square"></span></a></li>
+					<li><a href="https://www.facebook.com/windhamdavid" class="facebook"><span class="fa fa-2x fa-facebook-square"></span></a></li>
+					<li><a href="https://github.com/windhamdavid" class="github" rel="me"><span class="fa fa-2x fa-github-square"></span></a></li>
 				</ul>
 			</div>
 			<div class="col-md-3 col-sm-offset-5">

+ 1 - 1
page-contact.php

@@ -45,4 +45,4 @@
 		</div>
 	</div>
 
-<?php get_footer('studio'); ?>
+<?php get_footer('home'); ?>

+ 1 - 1
page-desk.php

@@ -53,4 +53,4 @@ get_header(); ?>
 			</main>
 		</div>
 	</div>
-<?php get_footer('studio'); ?>
+<?php get_footer('home'); ?>

+ 1 - 1
page-sitemap.php

@@ -100,4 +100,4 @@ get_header(); ?>
 		</article>
 	</div>
 	
-<?php get_footer(); ?>
+<?php get_footer('home'); ?>

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


+ 52 - 21
style.css

@@ -1125,10 +1125,7 @@ h4.spread {
   -o-transform: rotate(-45deg);
 }
 
-ul.social li {
-	float: left;
-	padding: 1px 3px;
-}
+
 #archives li {
 	list-style: none;
 	margin: 2px 8px;
@@ -1173,7 +1170,54 @@ img.dw {
 .front-nav {
 	margin: 10px 0 0;
 }
-
+/*============================================
+					Footer
+==============================================*/
+.footer {
+	padding: 90px 0 30px;
+}
+.footer-home {
+	padding: 90px 0 50px;
+}
+.footer a {
+	color: #777777;
+}
+.footer a:hover {
+	color: #FFFFFF;
+	text-decoration: none;
+}
+.footer span.fa:hover {
+	color: #FFFFFF;
+	text-decoration: none;
+}
+p.cc {
+	float: right;
+	font-size: 14px;
+	margin: 2px 20px 30px 10px;
+}
+ul.social {
+	margin: 0;
+}
+ul.social li {
+	float: left;
+	padding: 0 4px;
+}
+ul.social li:first-child {
+	float: left;
+	padding: 0 4px 0 0;
+}
+ul.social a.github span:hover {
+	color: #FFFFFF;
+}
+ul.social a.twitter span:hover {
+	color: #00B0ED;
+}
+ul.social a.gplus span:hover {
+	color: #DF4A32;
+}
+ul.social a.facebook span:hover {
+	color: #3B5998;
+}
 
 /*============================================
 					Content 
@@ -1310,19 +1354,13 @@ body.art .site-title a {
 .posts-front {
 	padding: 40px 0;
 }
-
 .dark {
 	background: #222;
 }
 .bottom {
 	padding-top: 50px;
 }
-.footer {
-	padding: 50px 0;
-}
-.footer-home {
-	padding: 90px 0 50px;
-}
+
 .centered {
 	float: none;
 	margin: 0 auto;
@@ -1395,21 +1433,14 @@ table.icons tbody > tr > td {
 	padding: 1px;
 }
 
-/*===== Footer =====*/
-p.cc {
-	float: right;
-	font-size: 14px;
-	margin: 2px 20px 30px 10px;
-}
+
 span.quiet {
 	display: none;
 }
 span.right {
 	float: right;
 }
-.footer {
-	padding: 50px 0 30px;
-}
+
 
 .form-row {
   margin: 10px 0;