Skip to content

Commit

Permalink
Merge pull request #1882 from vektor-inc/develop
Browse files Browse the repository at this point in the history
[ Change version ] 1.66.0.0
  • Loading branch information
kurudrive authored Dec 12, 2023
2 parents 7f0f7b9 + f0f59b3 commit 2218727
Show file tree
Hide file tree
Showing 14 changed files with 1,814 additions and 849 deletions.
23 changes: 23 additions & 0 deletions inc/vk-components/package/_scss/_vk-post.scss
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,16 @@ $xxl-min: 1400px;
/*-------------------------------------------*/
/* If exclude the .vk_posts that, when you select the .media don't work */
.vk_posts .vk_post-col {
// 5 と 7 は horizontal でのみ使用
// 他のように -30px でないのは そもそも -30px 自体が vk_post の独自仕様であるため
// horizontal では -30px をつける必要がないのでつけていない
&-5 {
width: 41.67%;
}
&-7 {
width: 58.33%;
}

&-xs-2 {
width: calc(16.66% - 30px);
}
Expand Down Expand Up @@ -325,6 +335,13 @@ $xxl-min: 1400px;
}

&.card-horizontal {
// テーマなどが bootstrap の grid を読み込むと、
// horizontal に残っている col-5/col-7 のクラスにpadding をつけられてしまうので打ち消し
// ( horizontal から col-5/col-7 のクラスを削除したらこちらも削除可 )
.vk_post-col-5,
.vk_post-col-7 {
padding: 0;
}
.vk_post_imgOuter {
height: 100%;
border-bottom: none;
Expand All @@ -338,8 +355,14 @@ $xxl-min: 1400px;
border-right:none;
border-left:$border_image;
}
.card-horizontal-inner-row {
flex-direction: row-reverse;
}
}
}
.card-horizontal-inner-row {
display: flex;
}
}

/*-------------------------------------------*/
Expand Down
10 changes: 6 additions & 4 deletions inc/vk-components/package/class-vk-component-posts.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* VK Components Posts
*
* @package VK Component
* @version 1.5.0
* @version 1.6.0
*
* *********************** CAUTION ***********************
* The original of this file is located at:
Expand Down Expand Up @@ -840,17 +840,19 @@ public static function get_view_type_card( $post, $options ) {
public static function get_view_type_card_horizontal( $post, $options ) {
$html = '';
$html .= self::get_view_first_div( $post, $options );
$html .= '<div class="row no-gutters card-horizontal-inner-row">';
$html .= '<div class="card-horizontal-inner-row">';

if ( $options['display_image'] ) {
$html .= '<div class="col-5 card-img-outer">';
// col-5 は古いクラス名 / 現在は vk_post-col-5 にスタイルをあてている
$html .= '<div class="vk_post-col-5 col-5 card-img-outer">';
$attr = array(
'class_outer' => '',
'class_image' => 'card-img card-img-use-bg',
);
$html .= self::get_thumbnail_image( $post, $options, $attr );
$html .= '</div><!-- /.col -->';
$html .= '<div class="col-7">';
// col-7 は古いクラス名 / 現在は vk_post-col-7 にスタイルをあてている
$html .= '<div class="vk_post-col-7 col-7">';
}

$html .= self::get_view_body( $post, $options );
Expand Down
2 changes: 1 addition & 1 deletion inc/vk-components/package/css/vk-components.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja-vk-blocks-admin-js.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion languages/vk-blocks-pro-ja-vk-blocks-build-js.json

Large diffs are not rendered by default.

Binary file modified languages/vk-blocks-pro-ja.mo
Binary file not shown.
Loading

0 comments on commit 2218727

Please sign in to comment.