Merge branch 'GavernWP-v.1.8'

GavickPro · Aug 8, 2013 · f561e13 · f561e13
2 parents 2c0c30b + b8407c4
commit f561e13
Show file tree

Hide file tree

Showing 52 changed files with 2,672 additions and 1,987 deletions.
diff --git a/MeetGavernWP/attachment.php b/MeetGavernWP/attachment.php
@@ -74,7 +74,7 @@
 		</section>
 		<?php endif; ?>
 
-		<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+		<?php get_template_part( 'layouts/content.post.footer' ); ?>
 	</article>
 
 	<?php comments_template('', true); ?>

diff --git a/MeetGavernWP/content-aside.php b/MeetGavernWP/content-aside.php
@@ -12,10 +12,10 @@
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<header class="aside">
-			<?php include(gavern_file('layouts/content.post.header.php')); ?>
+			<?php get_template_part( 'layouts/content.post.header' ); ?>
 		</header>
 
-		<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+		<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 		<?php if ( is_search() || is_archive() || is_tag() ) : ?>
 		<section class="summary">
@@ -34,5 +34,5 @@
 		</section>
 		<?php endif; ?>
 
-		<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+		<?php get_template_part( 'layouts/content.post.footer' ); ?>
 	</article>
diff --git a/MeetGavernWP/content-audio.php b/MeetGavernWP/content-audio.php
@@ -11,10 +11,10 @@
 ?>
 	<article id="post-<?php the_ID(); ?>" <?php post_class( 'indexed' ); ?>>
 		<header class="audio">
-			<?php include(gavern_file('layouts/content.post.header.php')); ?>
+			<?php get_template_part( 'layouts/content.post.header' ); ?>
 		</header>
 
-		<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+		<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 		<?php if ( is_search() || is_archive() || is_tag() ) : ?>
 		<section class="summary">
@@ -33,5 +33,5 @@
 		</section>
 		<?php endif; ?>
 
-		<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+		<?php get_template_part( 'layouts/content.post.footer' ); ?>
 	</article>
diff --git a/MeetGavernWP/content-chat.php b/MeetGavernWP/content-chat.php
@@ -11,10 +11,10 @@
 ?>
 	<article id="post-<?php the_ID(); ?>" <?php post_class( 'indexed' ); ?>>
 		<header class="chat">
-			<?php include(gavern_file('layouts/content.post.header.php')); ?>
+			<?php get_template_part( 'layouts/content.post.header' ); ?>
 		</header>
 
-		<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+		<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 		<?php if ( is_search() || is_archive() || is_tag() ) : ?>
 		<section class="summary">
@@ -33,5 +33,5 @@
 		</section>
 		<?php endif; ?>
 
-		<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+		<?php get_template_part( 'layouts/content.post.footer' ); ?>
 	</article>
diff --git a/MeetGavernWP/content-gallery.php b/MeetGavernWP/content-gallery.php
@@ -12,10 +12,10 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="gallery">
-		<?php include(gavern_file('layouts/content.post.header.php')); ?>
+		<?php get_template_part( 'layouts/content.post.header' ); ?>
 	</header>
 
-	<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+	<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 	<?php if ( is_search() || is_archive() || is_tag() ) : ?>
 	<section class="summary">
@@ -65,5 +65,5 @@
 	</section>
 	<?php endif; ?>
 
-	<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+	<?php get_template_part( 'layouts/content.post.footer' ); ?>
 </article>
diff --git a/MeetGavernWP/content-image.php b/MeetGavernWP/content-image.php
@@ -11,10 +11,10 @@
 ?>
 	<article id="post-<?php the_ID(); ?>" <?php post_class( 'indexed' ); ?>>
 		<header class="image">
-			<?php include(gavern_file('layouts/content.post.header.php')); ?>
+			<?php get_template_part( 'layouts/content.post.header' ); ?>
 		</header>
 
-		<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+		<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 		<?php if ( is_search() || is_archive() || is_tag() ) : ?>
 		<section class="summary">
@@ -33,5 +33,5 @@
 		</section>
 		<?php endif; ?>
 
-		<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+		<?php get_template_part( 'layouts/content.post.footer' ); ?>
 	</article>
diff --git a/MeetGavernWP/content-link.php b/MeetGavernWP/content-link.php
@@ -10,10 +10,10 @@
 ?>
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="link">
-		<?php include(gavern_file('layouts/content.post.header.php')); ?>
+		<?php get_template_part( 'layouts/content.post.header' ); ?>
 	</header>
 
-	<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+	<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 	<?php if(is_search() || is_archive() || is_tag()) : ?>
 	<section class="summary">
@@ -32,5 +32,5 @@
 	</section>
 	<?php endif; ?>
 
-	<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+	<?php get_template_part( 'layouts/content.post.footer' ); ?>
 </article>
diff --git a/MeetGavernWP/content-page.php b/MeetGavernWP/content-page.php
@@ -29,11 +29,11 @@
 <article id="post-<?php the_ID(); ?>" <?php post_class($classname); ?>>
 	<?php if($show_title) : ?>
 	<header>
-		<?php include(gavern_file('layouts/content.post.header.php')); ?>
+		<?php get_template_part( 'layouts/content.post.header' ); ?>
 	</header>
 	<?php endif; ?>
 
-	<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+	<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 	<section class="content">
 		<?php the_content(); ?>
@@ -42,5 +42,5 @@
 		<?php gk_post_links(); ?>
 	</section>
 
-	<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+	<?php get_template_part( 'layouts/content.post.footer' ); ?>
 </article>
diff --git a/MeetGavernWP/content-quote.php b/MeetGavernWP/content-quote.php
@@ -12,10 +12,10 @@
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<header class="quote">
-			<?php include(gavern_file('layouts/content.post.header.php')); ?>
+			<?php get_template_part( 'layouts/content.post.header' ); ?>
 		</header>
 
-		<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+		<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 		<?php if ( is_search() || is_archive() || is_tag() ) : ?>
 		<section class="summary">
@@ -34,5 +34,5 @@
 		</section>
 		<?php endif; ?>
 
-		<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+		<?php get_template_part( 'layouts/content.post.footer' ); ?>
 	</article>
diff --git a/MeetGavernWP/content-single.php b/MeetGavernWP/content-single.php
@@ -12,10 +12,10 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(is_page_template('template.fullwidth.php') ? ' page-fullwidth' : null); ?>>
 	<header>
-		<?php include(gavern_file('layouts/content.post.header.php')); ?>
+		<?php get_template_part( 'layouts/content.post.header' ); ?>
 	</header>
 
-	<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+	<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 	<section class="content">
 		<?php the_content(); ?>
@@ -24,5 +24,5 @@
 		<?php gk_post_links(); ?>
 	</section>
 
-	<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+	<?php get_template_part( 'layouts/content.post.footer' ); ?>
 </article>
diff --git a/MeetGavernWP/content-status.php b/MeetGavernWP/content-status.php
@@ -12,10 +12,10 @@
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<header class="status">
-			<?php include(gavern_file('layouts/content.post.header.php')); ?>
+			<?php get_template_part( 'layouts/content.post.header' ); ?>
 		</header>
 
-		<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+		<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 		<?php if (is_search() || is_archive() || is_tag()) : ?>
 		<section class="summary">
@@ -34,5 +34,5 @@
 		</section>
 		<?php endif; ?>
 
-		<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+		<?php get_template_part( 'layouts/content.post.footer' ); ?>
 	</article>
diff --git a/MeetGavernWP/content-video.php b/MeetGavernWP/content-video.php
@@ -11,11 +11,11 @@
 ?>
 	<article id="post-<?php the_ID(); ?>" <?php post_class( 'indexed' ); ?>>
 		<header class="video">
-			<?php include(gavern_file('layouts/content.post.header.php')); ?>
+			<?php get_template_part( 'layouts/content.post.header' ); ?>
 		</header>
 
 		<?php if ( is_search() || is_archive() || is_tag() ) : ?>
-		<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+		<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 		<section class="summary">
 			<?php the_excerpt(); ?>
@@ -33,5 +33,5 @@
 		</section>
 		<?php endif; ?>
 
-		<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+		<?php get_template_part( 'layouts/content.post.footer' ); ?>
 	</article>
diff --git a/MeetGavernWP/content.php b/MeetGavernWP/content.php
@@ -12,10 +12,10 @@
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<header>
-			<?php include(gavern_file('layouts/content.post.header.php')); ?>
+			<?php get_template_part( 'layouts/content.post.header' ); ?>
 		</header>
 
-		<?php include(gavern_file('layouts/content.post.featured.php')); ?>
+		<?php get_template_part( 'layouts/content.post.featured' ); ?>
 
 		<?php if ( is_search() || is_archive() || is_tag() ) : ?>
 		<section class="summary">
@@ -30,5 +30,5 @@
 		</section>
 		<?php endif; ?>
 
-		<?php include(gavern_file('layouts/content.post.footer.php')); ?>
+		<?php get_template_part( 'layouts/content.post.footer' ); ?>
 	</article>
diff --git a/MeetGavernWP/css/back-end/template.css b/MeetGavernWP/css/back-end/template.css
@@ -66,12 +66,15 @@ textarea {
 .gkWrap > h1:first-child small {
 	border-left: 1px solid #fff;
 	float: left;
-	font-size: 10px;
+	font-size: 11px;
 	font-weight: 400;
-	line-height: 26px;
-	margin: 4px 0 0 24px;
+	line-height: 15px;
+	margin: 1px 0 0 24px;
 	padding-left: 16px
 }
+.gkWrap > h1:first-child small span {
+	display: block;
+}
 .gkWrap > h1:first-child a {
 	background: url(../../images/back-end/icons.png) no-repeat 0 -640px;
 	display: block;
@@ -382,6 +385,31 @@ p[data-visible="false"] {
 	cursor: pointer;
 }
 
+/* Social Media */
+#gkSocial {
+	float: right;
+	line-height: 1.0;
+	margin: 7px 24px 0 0;
+}
+
+#gkSocial > span {
+	display: block;
+	float: left;
+	font-size: 12px;
+	margin: 4px 10px 0 0;
+}
+
+@media (max-width: 1200px) {
+	#gkSocial {
+		clear: both;
+		float: left;
+	}
+
+	.gkWrap > h1:first-child {
+		height: 72px;
+	}
+}
+
 /* width <= 720px */ 
 @media only screen and (max-width: 900px), only screen and (max-device-width: 900px) and (-moz-max-device-pixel-ratio: 1.5), only screen and (max-device-width: 900px) and (-o-max-device-pixel-ratio: 1.5/1), only screen and (max-device-width: 900px) and (-webkit-max-device-pixel-ratio: 1.5), only screen and (max-device-width: 900px) and (max-device-pixel-ratio: 1.5), only screen and (max-device-width: 1800px) and (-moz-min-device-pixel-ratio: 2), only screen and (max-device-width: 1800px) and (-o-min-device-pixel-ratio: 2/1), only screen and (max-device-width: 1800px) and (-webkit-min-device-pixel-ratio: 2), only screen and (max-device-width: 1800px) and (min-device-pixel-ratio: 2) {
 	#gkTabs {

diff --git a/MeetGavernWP/css/font-awesome.css b/MeetGavernWP/css/font-awesome.css
@@ -28,7 +28,7 @@
 @font-face {
   font-family: 'FontAwesome';
   src: url('font-awesome/fontawesome-webfont.eot?v=3.2.1');
-  src: url('font-awesome/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('font-awesome/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('font-awesome/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
+  src: url('font-awesome/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('font-awesome/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('font-awesome/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('font-awesome/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
   font-weight: normal;
   font-style: normal;
 }

diff --git a/MeetGavernWP/css/shortcodes.elements.css b/MeetGavernWP/css/shortcodes.elements.css
@@ -78,7 +78,7 @@
 	margin: 10px 0;
 	min-height: 16px;
 	overflow: hidden;
-	padding: 10px 15px;
+	padding: 15px 20px;
 	position: relative;
 }
 
@@ -94,20 +94,20 @@
 
 .gk-toggle.opened > h3:after,
 .gk-toggle.closed > h3:after {
-	background: transparent url('../images/toggler.png') no-repeat 0 0;
-	content: " ";
+	content: "\f056";
+	color: #dd5749;
 	cursor: pointer;
 	display: block;
-	height: 21px;
-	line-height: 21px;
+	font-family: FontAwesome;
+	font-size: 21px;
 	position: absolute;
 	right: 0;
 	top: 8px;
 	width: 21px;
 }
 
 .gk-toggle.closed > h3:after {
-	background: transparent url('../images/toggler.png') no-repeat 0 -40px;	
+	content: "\f055";
 }
 
 .gk-toggle > h3 {
@@ -117,7 +117,7 @@
 	font-size: 16px;
 	line-height: 17px;
 	margin: -10px 0;
-	padding: 10px 0;
+	padding: 10px 0 15px;
 	position: relative;	
 	z-index: 1;
 }

diff --git a/MeetGavernWP/css/tablet.css b/MeetGavernWP/css/tablet.css
@@ -245,6 +245,11 @@
 	border-top: none!important;
 }
 
+#main-menu > li.haschild:after,
+#main-menu > li li.haschild:after {
+	display: none!important;
+}
+
 /* 10.5. Footer
 ==================================== */