Merge pull request #120 from vektor-inc/develop

3.0.5
vektor-inc · May 8, 2017 · 388ad0a · 388ad0a
2 parents 7c11018 + 93b1e8c
commit 388ad0a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/design_skin/origin/_scss/_outer.scss b/design_skin/origin/_scss/_outer.scss
@@ -131,7 +131,7 @@ ul.gMenu {
 .gMenu_description { display:block; overflow:hidden;font-size:10px; line-height: 14px; }
 
 @media (max-width: 991px){
- .gMenu_outer { overflow:hidden;display: none; }
+ .gMenu_outer { overflow:scroll;display: none; height: 20em;}
  .gMenu_outer.itemOpen { display: block; }
  .gMenu_outer.itemClose { display: none; }
  .gMenu_description { display: none; }

diff --git a/design_skin/origin/css/style.css b/design_skin/origin/css/style.css
@@ -2761,7 +2761,7 @@ ul.gMenu ul li li li li a { padding-left: 5em; }
 
 .gMenu_description { display: block; overflow: hidden; font-size: 10px; line-height: 14px; }
 
-@media (max-width: 991px) { .gMenu_outer { overflow: hidden; display: none; }
+@media (max-width: 991px) { .gMenu_outer { overflow: scroll; display: none; height: 20em; }
  .gMenu_outer.itemOpen { display: block; }
  .gMenu_outer.itemClose { display: none; }
  .gMenu_description { display: none; }

diff --git a/js/_master.js b/js/_master.js
@@ -38,12 +38,14 @@
  // jQuery('.menuBtn').each(function(){
  jQuery('.menuBtn').click(function(){
  if ( !jQuery('.menuBtn').hasClass('menuOpen') ) {
- jQuery('body').removeClass('headerMenuClose').addClass('headerMenuOpen');
+ jQuery('body').removeClass('headerMenuClose').addClass('headerMenuOpen'); // 今後廃止
+ jQuery('body').removeClass('header-menu-close').addClass('header-menu-open');
  jQuery('.menuBtn').removeClass('menuClose').addClass('menuOpen');
  jQuery('#gMenu_outer').removeClass('itemClose').addClass('itemOpen');
  jQuery('#menuBtn i').removeClass('fa-bars').addClass('fa-times');
  } else {
- jQuery('body').removeClass('headerMenuOpen');
+ jQuery('body').removeClass('headerMenuOpen'); // 今後廃止
+ jQuery('body').removeClass('header-menu-open');
  jQuery('.menuBtn').removeClass('menuOpen').addClass('menuClose');
  jQuery('#gMenu_outer').removeClass('itemOpen').addClass('itemClose');
  jQuery('#menuBtn i').removeClass('fa-times').addClass('fa-bars');

diff --git a/readme.txt b/readme.txt
@@ -32,6 +32,9 @@ http://www.vektor-inc.co.jp/inquiry/
 
 == Changelog ==
 
+v3.0.5
+* [ Bug fix ][ Header menu vertical ]
+
 v3.0.4
 * [ Bug fix ][ breadcrumb ]
 

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@ Theme URI: https://lightning.nagoya
 Description: Lightning is a very simple & easy to customize theme which is based on the Bootstrap. It is also very friendly with custom post types and custom taxonomies. When you add a new one, the breadcrumbs will be adjusted and posts will look beautifully without editing or adding a template files.
 Author: Vektor,Inc.
 Author URI: http://www.vektor-inc.co.jp
-Version:3.0.4
+Version:3.0.5
 Tags: two-columns, one-column, right-sidebar, custom-colors, custom-menu, editor-style, theme-options
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html