diff --git a/MeetGavernWP/attachment.php b/MeetGavernWP/attachment.php
index c83f70d..c534002 100644
--- a/MeetGavernWP/attachment.php
+++ b/MeetGavernWP/attachment.php
@@ -74,7 +74,7 @@
-
+
diff --git a/MeetGavernWP/content-aside.php b/MeetGavernWP/content-aside.php
index 240351f..3f77c68 100644
--- a/MeetGavernWP/content-aside.php
+++ b/MeetGavernWP/content-aside.php
@@ -12,10 +12,10 @@
>
-
+
-
+
diff --git a/MeetGavernWP/content-audio.php b/MeetGavernWP/content-audio.php
index 8341a7c..f735529 100644
--- a/MeetGavernWP/content-audio.php
+++ b/MeetGavernWP/content-audio.php
@@ -11,10 +11,10 @@
?>
>
-
+
-
+
\ No newline at end of file
diff --git a/MeetGavernWP/content-chat.php b/MeetGavernWP/content-chat.php
index e24de4f..9212888 100644
--- a/MeetGavernWP/content-chat.php
+++ b/MeetGavernWP/content-chat.php
@@ -11,10 +11,10 @@
?>
>
-
+
-
+
\ No newline at end of file
diff --git a/MeetGavernWP/content-gallery.php b/MeetGavernWP/content-gallery.php
index 816fe4b..c73a773 100644
--- a/MeetGavernWP/content-gallery.php
+++ b/MeetGavernWP/content-gallery.php
@@ -12,10 +12,10 @@
>
-
+
-
+
diff --git a/MeetGavernWP/content-image.php b/MeetGavernWP/content-image.php
index b1d1426..2eabdd8 100644
--- a/MeetGavernWP/content-image.php
+++ b/MeetGavernWP/content-image.php
@@ -11,10 +11,10 @@
?>
>
-
+
-
+
\ No newline at end of file
diff --git a/MeetGavernWP/content-link.php b/MeetGavernWP/content-link.php
index b3d0140..93e10cd 100644
--- a/MeetGavernWP/content-link.php
+++ b/MeetGavernWP/content-link.php
@@ -10,10 +10,10 @@
?>
>
-
+
-
+
\ No newline at end of file
diff --git a/MeetGavernWP/content-page.php b/MeetGavernWP/content-page.php
index b0e12be..9edcd80 100644
--- a/MeetGavernWP/content-page.php
+++ b/MeetGavernWP/content-page.php
@@ -29,11 +29,11 @@
>
-
+
-
+
\ No newline at end of file
diff --git a/MeetGavernWP/content-quote.php b/MeetGavernWP/content-quote.php
index a740558..b87f102 100644
--- a/MeetGavernWP/content-quote.php
+++ b/MeetGavernWP/content-quote.php
@@ -12,10 +12,10 @@
>
-
+
-
+
\ No newline at end of file
diff --git a/MeetGavernWP/content-single.php b/MeetGavernWP/content-single.php
index 9960601..fc20091 100644
--- a/MeetGavernWP/content-single.php
+++ b/MeetGavernWP/content-single.php
@@ -12,10 +12,10 @@
>
-
+
-
+
diff --git a/MeetGavernWP/content-status.php b/MeetGavernWP/content-status.php
index fb4bade..dcdb3bb 100644
--- a/MeetGavernWP/content-status.php
+++ b/MeetGavernWP/content-status.php
@@ -12,10 +12,10 @@
>
-
+
-
+
\ No newline at end of file
diff --git a/MeetGavernWP/content-video.php b/MeetGavernWP/content-video.php
index 45772dd..d441877 100644
--- a/MeetGavernWP/content-video.php
+++ b/MeetGavernWP/content-video.php
@@ -11,11 +11,11 @@
?>
>
-
+
-
+
\ No newline at end of file
diff --git a/MeetGavernWP/content.php b/MeetGavernWP/content.php
index 27c9e28..276e841 100644
--- a/MeetGavernWP/content.php
+++ b/MeetGavernWP/content.php
@@ -12,10 +12,10 @@
>
-
+
-
+
\ No newline at end of file
diff --git a/MeetGavernWP/css/back-end/template.css b/MeetGavernWP/css/back-end/template.css
index f39b0cf..ede1bb8 100644
--- 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
index f2a79c8..a69995f 100644
--- 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
index 03efa19..879262c 100644
--- 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,12 +94,12 @@
.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;
@@ -107,7 +107,7 @@
}
.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
index 1625c0a..66e6c75 100644
--- 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
==================================== */
diff --git a/MeetGavernWP/css/wp.css b/MeetGavernWP/css/wp.css
index 71f9af1..d301dab 100644
--- a/MeetGavernWP/css/wp.css
+++ b/MeetGavernWP/css/wp.css
@@ -46,6 +46,29 @@
margin: 0;
}
+#main-menu > li.haschild:after {
+ content: "\f078";
+ font-family: FontAwesome;
+ font-size: 10px;
+ margin: 0 0 0 -5px;
+ position: relative;
+ top: -2px;
+}
+
+#main-menu > li li.haschild {
+ position: relative;
+}
+
+#main-menu > li li.haschild:after {
+ content: "\f054";
+ font-family: FontAwesome;
+ font-size: 10px;
+ margin: 0;
+ position: absolute;
+ right: 10px;
+ top: 7px;
+}
+
#main-menu > li > a {
color: #777;
margin: 0;
diff --git a/MeetGavernWP/gavern/base.php b/MeetGavernWP/gavern/base.php
index 4d615fc..2a60029 100644
--- a/MeetGavernWP/gavern/base.php
+++ b/MeetGavernWP/gavern/base.php
@@ -9,16 +9,16 @@
define('GAVERN_WP', 1);
// Including file with template object class
-require_once(gavern_file('gavern/classes/class.gkobject.php'));
+include_once(gavern_file('gavern/classes/class.gkobject.php'));
// Including file with template browser class
-require_once(gavern_file('gavern/classes/class.gkbrowser.php'));
+include_once(gavern_file('gavern/classes/class.gkbrowser.php'));
// Including file with menu walker class
-require_once(gavern_file('gavern/classes/class.menu.walker.php'));
+include_once(gavern_file('gavern/classes/class.menu.walker.php'));
// Including file with mobile menu walker class
-require_once(gavern_file('gavern/classes/class.menu.walker.mobile.php'));
+include_once(gavern_file('gavern/classes/class.menu.walker.mobile.php'));
// Including file used for WPML support
if (defined('ICL_SITEPRESS_VERSION')) {
- require_once(gavern_file('gavern/wpml.php'));
+ include_once(gavern_file('gavern/wpml.php'));
}
class GavernWP {
diff --git a/MeetGavernWP/gavern/config/en_US/template.json b/MeetGavernWP/gavern/config/en_US/template.json
index dbdb65a..a0a22d9 100644
--- a/MeetGavernWP/gavern/config/en_US/template.json
+++ b/MeetGavernWP/gavern/config/en_US/template.json
@@ -2,8 +2,8 @@
"template": {
"name": "MeetGavernWP",
"update_name": "gk_meetgavern_wp",
- "date": "05/07/2013",
- "version": "1.7",
+ "date": "05/08/2013",
+ "version": "1.8",
"description": "Free GavickPro Wordpress theme based on the GavernWP framework"
},
"developer_config": {
diff --git a/MeetGavernWP/gavern/filters.php b/MeetGavernWP/gavern/filters.php
index a49111a..6b23c3d 100644
--- a/MeetGavernWP/gavern/filters.php
+++ b/MeetGavernWP/gavern/filters.php
@@ -8,6 +8,10 @@
* Built-in filters:
*
* - gavern_social_api
+ * - gavern_social_api_fb
+ * - gavern_social_api_gplus
+ * - gavern_social_api_twitter
+ * - gavern_social_api_pinterest
* - gavern_thumbnail_caption
* - gavern_blog_name
* - gavern_blog_desc
diff --git a/MeetGavernWP/gavern/form.parser.php b/MeetGavernWP/gavern/form.parser.php
index ab14293..75b28ae 100644
--- a/MeetGavernWP/gavern/form.parser.php
+++ b/MeetGavernWP/gavern/form.parser.php
@@ -9,7 +9,7 @@
*
**/
-require_once(TEMPLATEPATH . '/gavern/form_elements/standard.php');
+include_once(TEMPLATEPATH . '/gavern/form_elements/standard.php');
/**
*
@@ -114,7 +114,7 @@ private function output() {
// load these files only once time
if(!class_exists($file_config->class)) {
// load the main PHP class
- require_once(TEMPLATEPATH . '/gavern/form_elements/'.($field->type).'/'.($file_config->php));
+ include_once(TEMPLATEPATH . '/gavern/form_elements/'.($field->type).'/'.($file_config->php));
}
// create the object
if(class_exists($file_config->class)) {
diff --git a/MeetGavernWP/gavern/form_elements/Fonts/fonts.php b/MeetGavernWP/gavern/form_elements/Fonts/fonts.php
index 792696b..9c31d09 100644
--- a/MeetGavernWP/gavern/form_elements/Fonts/fonts.php
+++ b/MeetGavernWP/gavern/form_elements/Fonts/fonts.php
@@ -80,6 +80,21 @@ public function output() {
';
// squirrel fonts selector
$squirrel_fonts = (glob(TEMPLATEPATH . '/fonts/*' , GLOB_ONLYDIR));
+ $squirrel_fonts_len = count($squirrel_fonts);
+
+ for($i = 0; $i < $squirrel_fonts_len; $i++) {
+
+ if(
+ substr($squirrel_fonts[$i], -7) === 'gk-font' ||
+ substr($squirrel_fonts[$i], -12) === 'font-awesome' ||
+ substr($squirrel_fonts[$i], -11) === 'woocommerce'
+ ) {
+ $squirrel_fonts[$i] = false;
+ }
+ }
+
+ $squirrel_fonts = array_filter($squirrel_fonts);
+ $squirrel_fonts = array_values($squirrel_fonts);
$output .= '