Permalink
Browse files

Merge pull request #236 from kurudrive/develop

1.8.9
  • Loading branch information...
kurudrive committed Oct 1, 2015
2 parents 79db830 + e35f6b5 commit b90caafe663745ee9d71978d0633e1172fead326
Showing with 47 additions and 32 deletions.
  1. +1 −1 README.md
  2. +24 −14 functions.php
  3. +1 −1 header.php
  4. +0 −2 inc/theme-options.php
  5. +2 −2 index.php
  6. +4 −4 js/biz-vektor-min.js
  7. +4 −1 js/biz-vektor.js
  8. +3 −1 js/master.js
  9. +2 −0 plugins/sns/module_snsBtns.php
  10. +4 −0 plugins/sns/style_bizvektor_sns.css
  11. +1 −5 readme.txt
  12. +1 −1 style.css
View
@@ -11,7 +11,7 @@ Vektor,Inc.
## Author URI
http://www.vektor-inc.co.jp/
## Version
1.8.6
1.8.9
## License
GNU General Public License
View
@@ -105,14 +105,17 @@ function biz_vektor_theme_setup() {
register_nav_menus( array( 'FooterSiteMap' => 'Footer SiteMap', ) );
load_theme_textdomain('biz-vektor', get_template_directory() . '/languages');
/*-------------------------------------------*/
/* Set content width
/* (Auto set up to media max with.)
/*-------------------------------------------*/
global $content_width;
if ( ! isset( $content_width ) ) $content_width = 640;
}
/*-------------------------------------------*/
/* Set content width
/* (Auto set up to media max with.)
/*-------------------------------------------*/
if ( ! isset( $content_width ) )
$content_width = 640;
/*-------------------------------------------*/
/* WidgetArea initiate
@@ -326,6 +329,12 @@ function biz_vektor_get_page_for_posts(){
/*-------------------------------------------*/
/* head_description
/*-------------------------------------------*/
add_action( 'wp_head', 'biz_vektor_setHeadDescription' );
function biz_vektor_setHeadDescription(){
echo '<meta name="description" content="' . getHeadDescription() . '" />';
}
function getHeadDescription() {
global $wp_query;
$post = $wp_query->get_queried_object();
@@ -345,15 +354,15 @@ function getHeadDescription() {
}
} else if (is_category() || is_tax()) {
if ( ! $post->description ) {
$metadescription = sprintf(__('About %s', 'biz-vektor'),single_cat_title()).get_bloginfo('name').' '.get_bloginfo('description');
$metadescription = sprintf(__('About %s', 'biz-vektor'),single_cat_title( '' , false )).get_bloginfo('name').' '.get_bloginfo('description');
} else {
$metadescription = esc_html( $post->description );
$metadescription = $post->description;
}
} else if (is_tag()) {
$metadescription = strip_tags(tag_description());
$metadescription = tag_description();
$metadescription = str_replace(array("\r\n","\r","\n"), '', $metadescription); // delete br
if ( ! $metadescription ) {
$metadescription = sprintf(__('About %s', 'biz-vektor'),single_tag_title()).get_bloginfo('name').' '.get_bloginfo('description');
$metadescription = sprintf(__('About %s', 'biz-vektor'),single_tag_title( '' , false )).get_bloginfo('name').' '.get_bloginfo('description');
}
} else if (is_archive()) {
if (is_year()){
@@ -377,10 +386,9 @@ function getHeadDescription() {
$metaExcerpt = $post->post_excerpt;
if ($metaExcerpt) {
// $metadescription = strip_tags($post->post_excerpt);
$metadescription = strip_tags($post->post_excerpt);
$metadescription = $post->post_excerpt;
} else {
$metadescription = mb_substr( strip_tags($post->post_content), 0, 240 ); // kill tags and trim 240 chara
$metadescription = str_replace(array("\r\n","\r","\n"), ' ', $metadescription); // delete br
}
} else {
$metadescription = get_bloginfo('description');
@@ -389,8 +397,10 @@ function getHeadDescription() {
if ( $paged != '0'){
$metadescription = '['.sprintf(__('Page of %s', 'biz-vektor' ),$paged).'] '.$metadescription;
}
$metadescription = apply_filters( 'metadescriptionCustom', $metadescription );
echo $metadescription;
$metadescription = str_replace(array("\r\n","\r","\n"), '', $metadescription); // delete br
$metadescription = apply_filters( 'metadescriptionCustom', strip_tags($metadescription) );
return $metadescription;
}
/*-------------------------------------------*/
View
@@ -8,8 +8,8 @@
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>" />
<title><?php wp_title(); ?></title>
<meta name="description" content="<?php getHeadDescription(); ?>" />
<link rel="start" href="<?php echo home_url(); ?>" title="HOME" />
<link rel="alternate" href="<?php echo home_url(); ?>" hreflang="<?php echo substr(get_bloginfo ( 'language' ), 0, 2);?>" />
<!-- <?php echo get_biz_vektor_name();?> v<?php echo BizVektor_Theme_Version; ?> -->
<?php
View
@@ -30,8 +30,6 @@
/*-------------------------------------------*/
/* Create keywords
/*-------------------------------------------*/
/* GoogleAnalytics
/*-------------------------------------------*/
/* footer
/*-------------------------------------------*/
/* slide show
View
@@ -73,11 +73,11 @@
<?php endif; //$options['listInfoArchive'] ?>
<?php elseif (file_exists(get_stylesheet_directory( ).'/module_loop_'.$post_type.'.php')): ?>
<?php elseif (file_exists(get_stylesheet_directory( ).'/module_loop_'.$postType.'.php')): ?>
<?php while ( have_posts() ) : the_post(); ?>
<?php get_template_part('module_loop_'.$post_type); ?>
<?php get_template_part('module_loop_'.$postType); ?>
<?php endwhile; ?>
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -578,6 +578,8 @@ master.js 他複数のファイルをGruntなどのビルドツールでマー
/*-------------------------------------------*/
/* ページ内するするスクロール
/*-------------------------------------------*/
/* snsCount
/*-------------------------------------------*/
/*-------------------------------------------*/
/* 編集ガイド
@@ -853,7 +855,8 @@ jQuery(window).load(function() {
var defaultparams = {}
if(bv_sliderParams){defaultparams = jQuery.extend(defaultparams,bv_sliderParams)}
jQuery('.flexslider').flexslider(defaultparams);
});
});
var breakPoint1 = 950; // cssのブレイクポイントよりもスクロールバー分少なめ
var breakPoint2 = 655;
View
@@ -13,6 +13,8 @@ master.js 他複数のファイルをGruntなどのビルドツールでマー
/*-------------------------------------------*/
/* ページ内するするスクロール
/*-------------------------------------------*/
/* snsCount
/*-------------------------------------------*/
/*-------------------------------------------*/
/* 編集ガイド
@@ -288,4 +290,4 @@ jQuery(window).load(function() {
var defaultparams = {}
if(bv_sliderParams){defaultparams = jQuery.extend(defaultparams,bv_sliderParams)}
jQuery('.flexslider').flexslider(defaultparams);
});
});
@@ -14,6 +14,8 @@
<div class="socialSet">
<script>window.twttr=(function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],t=window.twttr||{};if(d.getElementById(id))return t;js=d.createElement(s);js.id=id;js.src="https://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);t._e=[];t.ready=function(f){t._e.push(f);};return t;}(document,"script","twitter-wjs"));</script>
<ul style="margin-left:0px;">
<li class="sb_facebook sb_icon">
@@ -18,6 +18,10 @@
#content .socialSet ul li.sb_icon.sb_google .icon_sns { color:#dd4b39; }
#content .socialSet ul li.sb_icon.sb_line .icon_sns { color:#6ebd30; }
#content .socialSet ul li.sb_pocket { margin-left:5px;}
#content .socialSet .sb_facebook_count, #content .socialSet .sb_hatena_count, #content .socialSet .sb_twitter_count { display:inline-block; margin-left:5px; padding:2px 5px; border-radius:5px; line-height:1; vertical-align:top; font-size:77%; color:#ffffff; }
#content .socialSet .sb_facebook_count { background:#425dab; }
#content .socialSet .sb_hatena_count { background:#2c6ebd; }
#content .socialSet .sb_twitter_count { background:#00abec; }
#fb-like-box{ text-align: center; background-color: #f9f9f9; margin:40px auto;border:4px solid #efefef; }
View
@@ -31,8 +31,4 @@ http://bizvektor.com/contact/
== Changelog ==
- v1.8.7
fix <link rel="start"
- v1.8.6
for WordPress 4.3
https://github.com/kurudrive/biz-vektor/commits/master
View
@@ -5,7 +5,7 @@ Theme URI: http://bizvektor.com
Description: BizVektor theme will allow you to build a high-quality web site. It is possible to change the color, to switch to a completely different design. In addition, it is also possible to increase the number of designs by plug-ins.
Author: Vektor,Inc.
Author URI: http://www.vektor-inc.co.jp
Version: 1.8.8
Version: 1.8.9
Tags: white, red, blue, black, green, orange, purple, two-columns, right-sidebar, left-sidebar, custom-background, custom-colors, custom-header, custom-menu, editor-style,theme-options
Text Domain: biz-vektor

0 comments on commit b90caaf

Please sign in to comment.