From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Wed, 22 Mar 2017 12:42:00 +0000 (-0400)
Subject: Merge tag 'v1.0.3' into develop
X-Git-Tag: v1.0.4^2~3
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=e29503be8f04ce1dc5af89617f9cef738d65d6a5;p=WP-Themes%2FCCEOEM.git

Merge tag 'v1.0.3' into develop

adding twitter icon to the header

Conflicts:
	header.php
---

e29503be8f04ce1dc5af89617f9cef738d65d6a5
diff --cc header.php
index abeefc7,49e9c85..fe88d00
--- a/header.php
+++ b/header.php
@@@ -30,9 -30,10 +30,10 @@@
                              </p>
                          </div>
                          <div id="top" class="small-12 medium-4 right columns">
-                             <div id="header_social" class="small-1 columns">
+                             <div id="header_social" class="small-3 columns">
                                  <div id="icons">
-                                     <a id="face" target="_blank" href="www.facebook.com/pages/Charlevoix-Cheboygan-Emmet-Office-of-Emergency-Management/172092252841082"><img src="<?php echo get_template_directory_uri(); ?>/assets/facebook.jpg"></a>
 -                                    <a id="face" target="_blank" href="http://www.facebook.com/pages/Charlevoix-Cheboygan-Emmet-Office-of-Emergency-Management/172092252841082"><img src="<?php echo get_template_directory_uri(); ?>/assets/facebook.jpg"></a>
 -                                    <a id="face" target="_blank" href="https://twitter.com/TriCountyCCEOEM"><img src="<?php echo get_template_directory_uri(); ?>/assets/twit.png"></a>
++                                     <a id="face" target="_blank" href="http://www.facebook.com/pages/Charlevoix-Cheboygan-Emmet-Office-of-Emergency-Management/172092252841082"><img src="<?php echo get_template_directory_uri(); ?>/assets/facebook.jpg"></a>
++                                    <a id="twitter" target="_blank" href="https://twitter.com/TriCountyCCEOEM"><img src="<?php echo get_template_directory_uri(); ?>/assets/twit.png"></a>
                                  </div>
                              </div>
                              <div id="header_phone" class="small-5 columns">