9bdc50e6 by TaishiTokudome

Merge branch 'master' into 'deployment/production'

サイドバーの追従しない条件を変更

See merge request !16
2 parents 5928741a d5e260be
...@@ -212,7 +212,7 @@ if ($this->params->get('logoFile')) { ...@@ -212,7 +212,7 @@ if ($this->params->get('logoFile')) {
212 var cH = obj.height(); 212 var cH = obj.height();
213 var cwrapH = $("#c_wrap").height(); 213 var cwrapH = $("#c_wrap").height();
214 // 特定のページではスクロールしない 214 // 特定のページではスクロールしない
215 var excludedPages = [".record-page", ".infomation-all-page", ".information-page", ".info-record-page", ".info-exam-page", ."info-news-page", ".info-topix-page", ".info-media-page", ".infomation-all-page"]; 215 var excludedPages = [".record-page", ".information-page"];
216 var excludedPagesSelector = excludedPages.join(', '); 216 var excludedPagesSelector = excludedPages.join(', ');
217 var isExcluded = false; 217 var isExcluded = false;
218 if (document.querySelector(excludedPagesSelector)) { 218 if (document.querySelector(excludedPagesSelector)) {
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!