Merge branch 'master' of https://gitlab.so-ra.co.jp/sora/achievement into css整理

achievement-official.conohawing.com/assets/js/faq.js

+// menu pc
+$(function () {
+ $(".p-faq-Q").on("click", function () {
+  $(this).next().slideToggle();
+  $(this).toggleClass("active"); //追加部分
+ });
+
+ var $container = $(".content");
+ var $input = $(".search__input").find('input[type=text]');
+ var $items = $container.find("h4");
+ var $item = $();
+ var itemsIndexed = [];
+ $items.each(function () {
+  //正規表現でキーワードを抽出
+  itemsIndexed.push($(this).text().replace(/\s{2,}/g, ' ').toLowerCase());
+ });
+ $input.on('keyup', function (e) {
+  $items.each(function () {
+   $item = $(this);
+   //spanで括ってハイライト
+   $item.html($item.html().replace(/<span class="highlight">([^<]+)<\/span>/gi, '$1'));
+  });
+  var searchVal = $.trim($input.val()).toLowerCase();
+  if (searchVal.length) {
+   for (var i in itemsIndexed) {
+    $item = $items.eq(i);
+    if (itemsIndexed[i].indexOf(searchVal) != -1) {
+     $item.html($item.html().replace(new RegExp(searchVal + '(?!([^<]+)?>)', 'gi'), '<span class="highlight">$&</span>'));
+     $item.parent().parent().css("display", "block");
+    } else {
+     $item.parent().parent().css("display", "none");
+
+     var len1 = $('#sect1 .p-faq-Box').filter(':visible').length;
+     var len2 = $('#sect2 .p-faq-Box').filter(':visible').length;
+     var len3 = $('#sect3 .p-faq-Box').filter(':visible').length;
+     var len4 = $('#sect4 .p-faq-Box').filter(':visible').length;
+     var len5 = $('#sect5 .p-faq-Box').filter(':visible').length;
+     var len6 = $('#sect6 .p-faq-Box').filter(':visible').length;
+     if (len1 == 0) {
+      $("#faq-01").css("display", "none");
+     } else {
+      $("#faq-01").css("display", "block");
+     }
+     if (len2 == 0) {
+      $("#faq-02").css("display", "none");
+     } else {
+      $("#faq-02").css("display", "block");
+     }
+     if (len3 == 0) {
+      $("#faq-03").css("display", "none");
+     } else {
+      $("#faq-03").css("display", "block");
+     }
+     if (len4 == 0) {
+      $("#faq-04").css("display", "none");
+     } else {
+      $("#faq-04").css("display", "block");
+     }
+     if (len5 == 0) {
+      $("#faq-05").css("display", "none");
+     } else {
+      $("#faq-05").css("display", "block");
+     }
+     if (len6 == 0) {
+      $("#faq-06").css("display", "none");
+     } else {
+      $("#faq-06").css("display", "block");
+     }
+     if (len1 == 0 && len2 == 0 && len3 == 0 && len4 == 0 && len5 == 0 && len6 == 0) {
+      $(".faq-notfound").css("display", "block");
+     } else {
+      $(".faq-notfound").css("display", "none");
+     }
+
+    }
+   }
+  } else {
+   $items.parent().parent().css("display", "block");
+   $("#faq-01").css("display", "block");
+   $("#faq-02").css("display", "block");
+   $("#faq-03").css("display", "block");
+   $("#faq-04").css("display", "block");
+   $("#faq-05").css("display", "block");
+   $("#faq-06").css("display", "block");
+  }
+ });
+});

achievement-official.conohawing.com/assets/js/faq.min.js

+$(function(){$(".p-faq-Q").on("click",function(){$(this).next().slideToggle(),$(this).toggleClass("active")});var e=$(".content"),t=$(".search__input").find("input[type=text]"),n=e.find("h4"),i=$(),a=[];n.each(function(){a.push($(this).text().replace(/\s{2,}/g," ").toLowerCase())}),t.on("keyup",function(){n.each(function(){i=$(this),i.html(i.html().replace(/<span class="highlight">([^<]+)<\/span>/gi,"$1"))});var s=$.trim(t.val()).toLowerCase();if(s.length)for(var o in a)if(i=n.eq(o),-1!=a[o].indexOf(s))i.html(i.html().replace(new RegExp(s+"(?!([^<]+)?>)","gi"),'<span class="highlight">$&</span>')),i.parent().parent().css("display","block");else{i.parent().parent().css("display","none");var l=$("#sect1 .p-faq-Box").filter(":visible").length,f=$("#sect2 .p-faq-Box").filter(":visible").length,r=$("#sect3 .p-faq-Box").filter(":visible").length,c=$("#sect4 .p-faq-Box").filter(":visible").length,h=$("#sect5 .p-faq-Box").filter(":visible").length,d=$("#sect6 .p-faq-Box").filter(":visible").length;0==l?$("#faq-01").css("display","none"):$("#faq-01").css("display","block"),0==f?$("#faq-02").css("display","none"):$("#faq-02").css("display","block"),0==r?$("#faq-03").css("display","none"):$("#faq-03").css("display","block"),0==c?$("#faq-04").css("display","none"):$("#faq-04").css("display","block"),0==h?$("#faq-05").css("display","none"):$("#faq-05").css("display","block"),0==d?$("#faq-06").css("display","none"):$("#faq-06").css("display","block"),0==l&&0==f&&0==r&&0==c&&0==h&&0==d?$(".faq-notfound").css("display","block"):$(".faq-notfound").css("display","none")}else n.parent().parent().css("display","block"),$("#faq-01").css("display","block"),$("#faq-02").css("display","block"),$("#faq-03").css("display","block"),$("#faq-04").css("display","block"),$("#faq-05").css("display","block"),$("#faq-06").css("display","block")})});
\ No newline at end of file

achievement-official.conohawing.com/assets/js/functions.js

@@ -248,5 +248,8 @@ jQuery(window).load(function () {
 $(function () {
  $(".page-schedule .c-nav-link1, .c-footer__list li a").on("click", function () {
   $('#seminar').trigger('click');
- })
+ });
+ $(".search__input").submit(function (e) {
+  e.preventDefault();
+ });
 });

achievement-official.conohawing.com/assets/js/functions.min.js

-if($(function(){var e=function(){return{option:".c-nav-menu1 li",init:function(){var e=$(this.option),o=this;$(document).off("mouseenter.megaMenuOpen"),$(document).on("mouseenter.megaMenuOpen",this.option,function(){var n=$(this).data("target");return n||($(".c-nav2").hide(),e.removeClass("is-open")),!n||$(this).hasClass("is-open")?!1:(e.removeClass("is-open"),$(this).addClass("is-open"),$(".c-nav2").hide(),$(".c-nav2-"+n).fadeIn("normal"),$(document).off("mouseenter.megaMenuClose"),void o.menuClose())})},menuClose:function(){var e=$(this.option);$(document).on("mouseenter.megaMenuClose","div",function(o){$(o.target).hasClass("c-nav1")||$(o.target).parents(".c-nav")[0]||$(o.target).parents(".c-nav2")[0]||$(o.target).hasClass("c-nav2")||($(".c-nav2").hide(),$(".bg-nav").remove(),e.removeClass("is-open"),$(document).off("mouseenter.megaMenuClose"))})},destroy:function(){$(document).off("mouseenter.megaMenuOpen")}}}();e.init()}),$(window).on("load resize",function(){$(window).width()<=767?($(".menu-icon").off("click").on("click",function(){$(this).toggleClass("is-active"),$(this).parent().next().next().slideToggle()}),$(".nav-sp .c-nav-link1").off("click").on("click",function(){$(this).hasClass("open")?($(this).removeClass("open"),$(this).next().slideToggle()):($(this).addClass("open"),$(this).next().slideToggle())}),$(".c-footer__list >li > .showSp").off("click").on("click",function(e){e.preventDefault(),$(this).next(".c-footer__listsub").slideToggle()}),$(".c-nav2").removeAttr("style")):($(".menu-icon").off("click"),$(".menu-icon").removeClass("is-active"),$(".nav-sp").removeAttr("style"),$(".nav-sp .c-nav-link1").off("click"),$(".nav-sp .c-navSP").removeAttr("style"),$(".c-footer__list >li > .showSp").off("click"),$(".c-footer__listsub").removeAttr("style"))}),$(".c-toTop").length){var scrollTrigger=10,backToTop=function(){var e=$(window).scrollTop();e>scrollTrigger?$(".c-toTop").fadeIn():$(".c-toTop").fadeOut()};backToTop(),$(window).on("scroll",function(){backToTop()}),$(".c-toTop").on("click",function(e){e.preventDefault(),$("html,body").animate({scrollTop:0},400)})}jQuery(document).ready(function(){$(".box-video").click(function(){$("iframe",this)[0].src+="&amp;autoplay=1",$(this).addClass("open")})}),$(function(){$(".tab").click(function(){$(".is-active").removeClass("is-active"),$(this).addClass("is-active"),$(".is-show").removeClass("is-show");const e=$(this).index();$(".tabCont").eq(e).addClass("is-show"),$(window).scroll()})}),$(function(){$("a.btn--stop ,.reserveStop a").click(function(){return!1})}),$(function(){var e=navigator.userAgent;if(e.indexOf("iPhone")>0||e.indexOf("Android")>0&&e.indexOf("Mobile")>0);else{var o=$(window),t=$("header").clone().addClass("fixed-nav").appendTo("body"),n="is-show";o.on("load scroll",function(){var e=$(this).scrollTop();e>300?t.addClass(n):t.removeClass(n)})}var i=50,s=100;$("a[href^=#]").click(function(){var e=navigator.userAgent;if(e.indexOf("iPhone")>0||e.indexOf("Android")>0&&e.indexOf("Mobile")>0){var o=$(this).attr("href"),t=$("#"==o||""==o?"html":o),n=t.offset().top-s;return $("html, body").animate({scrollTop:n},500,"swing"),!1}var o=$(this).attr("href"),t=$("#"==o||""==o?"html":o),n=t.offset().top-i;return $("html, body").animate({scrollTop:n},500,"swing"),!1})}),function(e){e.fn.fixMe=function(){return this.each(function(){function n(){t=o.clone(),t.find("tbody").remove().end().addClass("fixed").insertBefore(o),i()}function i(){t.width(o.outerWidth()),t.find("th").each(function(t){e(this).css("width",o.find("th").eq(t).outerWidth()+"px")})}function s(){var n=e(this).scrollTop(),i=e(this).scrollLeft(),s=e(".header").height();tableOffsetTop=o.offset().top-s,tableOffsetBottom=tableOffsetTop+o.height()-o.find("thead").height(),tableOffsetLeft=o.offset().left,tableOffsetTop>n||n>tableOffsetBottom?t.hide():n>=tableOffsetTop&&tableOffsetBottom>=n&&t.is(":hidden")&&t.show(),t.css({left:tableOffsetLeft-i+"px",top:s})}var t,o=e(this);e(window).resize(i),e(window).scroll(s),n()})}}(jQuery),$(window).on("load",function(){screen.width>767&&$(".schedule-table").fixMe()}),jQuery(window).load(function(){function e(){$("#seminar").trigger("click"),jQuery("html, body").animate({scrollTop:0},0)}""!=window.location.hash&&e(window.location.hash.substr(1))}),$(function(){$(".page-schedule .c-nav-link1, .c-footer__list li a").on("click",function(){$("#seminar").trigger("click")})});
\ No newline at end of file
+if($(function(){var e=function(){return{option:".c-nav-menu1 li",init:function(){var e=$(this.option),t=this;$(document).off("mouseenter.megaMenuOpen"),$(document).on("mouseenter.megaMenuOpen",this.option,function(){var i=$(this).data("target");return i||($(".c-nav2").hide(),e.removeClass("is-open")),!i||$(this).hasClass("is-open")?!1:(e.removeClass("is-open"),$(this).addClass("is-open"),$(".c-nav2").hide(),$(".c-nav2-"+i).fadeIn("normal"),$(document).off("mouseenter.megaMenuClose"),void t.menuClose())})},menuClose:function(){var e=$(this.option);$(document).on("mouseenter.megaMenuClose","div",function(t){$(t.target).hasClass("c-nav1")||$(t.target).parents(".c-nav")[0]||$(t.target).parents(".c-nav2")[0]||$(t.target).hasClass("c-nav2")||($(".c-nav2").hide(),$(".bg-nav").remove(),e.removeClass("is-open"),$(document).off("mouseenter.megaMenuClose"))})},destroy:function(){$(document).off("mouseenter.megaMenuOpen")}}}();e.init()}),$(window).on("load resize",function(){$(window).width()<=767?($(".menu-icon").off("click").on("click",function(){$(this).toggleClass("is-active"),$(this).parent().next().next().slideToggle()}),$(".nav-sp .c-nav-link1").off("click").on("click",function(){$(this).hasClass("open")?($(this).removeClass("open"),$(this).next().slideToggle()):($(this).addClass("open"),$(this).next().slideToggle())}),$(".c-footer__list >li > .showSp").off("click").on("click",function(e){e.preventDefault(),$(this).next(".c-footer__listsub").slideToggle()}),$(".c-nav2").removeAttr("style")):($(".menu-icon").off("click"),$(".menu-icon").removeClass("is-active"),$(".nav-sp").removeAttr("style"),$(".nav-sp .c-nav-link1").off("click"),$(".nav-sp .c-navSP").removeAttr("style"),$(".c-footer__list >li > .showSp").off("click"),$(".c-footer__listsub").removeAttr("style"))}),$(".c-toTop").length){var scrollTrigger=10,backToTop=function(){var e=$(window).scrollTop();e>scrollTrigger?$(".c-toTop").fadeIn():$(".c-toTop").fadeOut()};backToTop(),$(window).on("scroll",function(){backToTop()}),$(".c-toTop").on("click",function(e){e.preventDefault(),$("html,body").animate({scrollTop:0},400)})}jQuery(document).ready(function(){$(".box-video").click(function(){$("iframe",this)[0].src+="&amp;autoplay=1",$(this).addClass("open")})}),$(function(){$(".tab").click(function(){$(".is-active").removeClass("is-active"),$(this).addClass("is-active"),$(".is-show").removeClass("is-show");const e=$(this).index();$(".tabCont").eq(e).addClass("is-show"),$(window).scroll()})}),$(function(){$("a.btn--stop ,.reserveStop a").click(function(){return!1})}),$(function(){var e=navigator.userAgent;if(e.indexOf("iPhone")>0||e.indexOf("Android")>0&&e.indexOf("Mobile")>0);else{var t=$(window),n=$("header").clone().addClass("fixed-nav").appendTo("body"),i="is-show";t.on("load scroll",function(){var e=$(this).scrollTop();e>300?n.addClass(i):n.removeClass(i)})}var o=50,s=100;$("a[href^=#]").click(function(){var e=navigator.userAgent;if(e.indexOf("iPhone")>0||e.indexOf("Android")>0&&e.indexOf("Mobile")>0){var t=$(this).attr("href"),n=$("#"==t||""==t?"html":t),i=n.offset().top-s;return $("html, body").animate({scrollTop:i},500,"swing"),!1}var t=$(this).attr("href"),n=$("#"==t||""==t?"html":t),i=n.offset().top-o;return $("html, body").animate({scrollTop:i},500,"swing"),!1})}),function(e){e.fn.fixMe=function(){return this.each(function(){function i(){n=t.clone(),n.find("tbody").remove().end().addClass("fixed").insertBefore(t),o()}function o(){n.width(t.outerWidth()),n.find("th").each(function(n){e(this).css("width",t.find("th").eq(n).outerWidth()+"px")})}function s(){var i=e(this).scrollTop(),o=e(this).scrollLeft(),s=e(".header").height();tableOffsetTop=t.offset().top-s,tableOffsetBottom=tableOffsetTop+t.height()-t.find("thead").height(),tableOffsetLeft=t.offset().left,tableOffsetTop>i||i>tableOffsetBottom?n.hide():i>=tableOffsetTop&&tableOffsetBottom>=i&&n.is(":hidden")&&n.show(),n.css({left:tableOffsetLeft-o+"px",top:s})}var n,t=e(this);e(window).resize(o),e(window).scroll(s),i()})}}(jQuery),$(window).on("load",function(){screen.width>767&&$(".schedule-table").fixMe()}),jQuery(window).load(function(){function e(){$("#seminar").trigger("click"),jQuery("html, body").animate({scrollTop:0},0)}""!=window.location.hash&&e(window.location.hash.substr(1))}),$(function(){$(".page-schedule .c-nav-link1, .c-footer__list li a").on("click",function(){$("#seminar").trigger("click")}),$(".search__input").submit(function(e){e.preventDefault()})});
\ No newline at end of file

achievement-official.conohawing.com/common_previous/css/other.css

@@ -604,47 +604,48 @@ other.css
  -ms-flex-align: center;
  align-items: center;
 }
+
 @media screen and (max-width: 767px) {
  .otherSingle2__item .otherSingle2__txt {
-   display: block;
+  display: block;
  }
 }
 
 .otherSingle2__item .otherSingle2__number {
-  padding-top: 1px;
-  width: 100px;
-  margin-right: 10px;
-  background: #7d0000;
+ padding-top: 1px;
+ width: 100px;
+ margin-right: 10px;
+ background: #7d0000;
 }
 
 @media screen and (max-width: 767px) {
  .otherSingle2__item .otherSingle2__number {
-   margin-bottom: 4px;
+  margin-bottom: 4px;
  }
 }
 
 .otherSingle2__item .otherSingle2__ttl {
-    width: calc(100% - 120px);
+ width: calc(100% - 120px);
 }
 
 @media screen and (max-width: 767px) {
  .otherSingle2__item .otherSingle2__ttl {
-    width: 100%;
+  width: 100%;
  }
 }
 
 .otherSingle2__item .otherSingle2__item__text3 span {
-  font-size: 1.6rem;
-  font-weight: bold;
+ font-size: 1.6rem;
+ font-weight: bold;
 }
 
 .otherSingle2__item .otherSingle2__item__text3 strong {
-  font-size: 3.6rem;
+ font-size: 3.6rem;
 }
 
 @media screen and (max-width: 767px) {
  .otherSingle2__item .otherSingle2__item__text3 {
-    width: 100%;
+  width: 100%;
  }
 }
 
@@ -1741,3 +1742,83 @@ other.css
  -webkit-transform: rotate(135deg);
  transform: rotate(135deg);
 }
+
+.p-faq .search {
+ margin-bottom: 27px;
+}
+
+.p-faq .search__input {
+ width: 100%;
+ height: 40px;
+ border: 2px solid #dbdbdb;
+ position: relative;
+ margin-bottom: 10px;
+}
+
+.p-faq .search__input input[type="text"] {
+ width: 100%;
+ height: 100%;
+ border: none;
+ font-size: 1.4rem;
+ color: #363636;
+ padding: 0 40px 0 10px;
+}
+
+.p-faq .search__input input[type="text"]::-webkit-input-placeholder {
+ color: #777;
+ opacity: 1;
+}
+
+.p-faq .search__input input[type="text"]::-moz-placeholder {
+ color: #777;
+ opacity: 1;
+}
+
+.p-faq .search__input input[type="text"]:-ms-input-placeholder {
+ color: #777;
+ opacity: 1;
+}
+
+.p-faq .search__input input[type="text"]::-ms-input-placeholder {
+ color: #777;
+ opacity: 1;
+}
+
+.p-faq .search__input input[type="text"]::placeholder {
+ color: #777;
+ opacity: 1;
+}
+
+.p-faq .search__input input[type="text"]:-ms-input-placeholder {
+ color: #777;
+}
+
+.p-faq .search__input input[type="text"]::-ms-input-placeholder {
+ color: #777;
+}
+
+.p-faq .search__input input[type="submit"] {
+ width: 40px;
+ height: 100%;
+ position: absolute;
+ top: 0;
+ right: 0;
+ border: none;
+ background-color: transparent;
+ background-image: url(/assets/img/common/icon_search.png);
+ background-position: center;
+ background-repeat: no-repeat;
+}
+
+.p-faq .highlight {
+ background-color: #fffd77;
+}
+
+.p-faq .faq-notfound {
+ display: none;
+ font-size: 24px;
+ line-height: 1.1;
+ font-weight: bold;
+ margin-bottom: 12px;
+ text-align: center;
+}