Merge branch 'szk11001-master'

weblab · Aug 7, 2014 · 06f3bd2 · 06f3bd2
2 parents 5652c2c + ce64a14
commit 06f3bd2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 
 *.xml
+
+*.xml
diff --git a/css/header-image.css b/css/header-image.css
@@ -1,6 +1,15 @@
 /* - - - - - - - - - - - - - - - - - - - 
 	== Header Image 
 - - - - - - - - - - - - - - - - - - - */
+#masthead {
+  -ms-word-break: break-all;
+  word-break: break-all;
+  word-break: break-word;
+  -webkit-hyphens: auto;
+  -moz-hyphens: auto;
+  hyphens: auto;
+}
+
 #masthead.header-image .container {
   position: relative;
 }

diff --git a/footer.php b/footer.php
@@ -11,7 +11,7 @@
 	</div><!-- .container-->
 	</div><!-- #content -->
 	<div id="footers">
-		<?php get_template_part('mega-footer'); ?>
+		<?php get_template_part('inc/mega','footer'); ?>
 		<footer id="footer" class="site-footer" role="contentinfo">
 			<div class="container">
 				<ul id="uc-footer-links" class="clearfix">