Merge pull request #130 from greenpeace/change_font_061702

change_font
greenpeace · Jun 17, 2024 · ee30c2f · ee30c2f
2 parents 760cf54 + cd449d8
commit ee30c2f
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 6 deletions.
diff --git a/assets/src/insulation-2024/common/css/default.css b/assets/src/insulation-2024/common/css/default.css
@@ -991,13 +991,19 @@ table.nothwrap tr th {
   margin: 0 0.2em 0 0;
 }
 
+@font-face {
+  font-family: "FOT-UD角ゴ_ラージ Pr6N";
+  src: url("/fonts/FOT-UDKakuGo-LargePr6N.woff2") format("woff2"), url("/fonts/FOT-UDKakuGo-LargePr6N.woff") format("woff"), url("/fonts/FOT-UDKakuGo-LargePr6N.ttf") format("truetype");
+  font-weight: normal;
+  font-style: normal;
+}
 html {
   font-size: 15px;
 }
 
 body {
   text-align: left;
-  font-family: "Noto Sans JP", "游ゴシック", "YuGothic", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", "Meiryo", "ＭＳ Ｐゴシック", sans-serif;
+  font-family: "FOT-UD角ゴ_ラージ Pr6N", sans-serif;
   line-height: 1.7;
   background-color: #fff;
   color: #000;

diff --git a/assets/src/insulation-2024/common/css/default.min.css b/assets/src/insulation-2024/common/css/default.min.css
diff --git a/assets/src/insulation-2024/common/css/default.scss b/assets/src/insulation-2024/common/css/default.scss
@@ -7,13 +7,23 @@
 
 @import url('https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@400;700&family=Noto+Serif+JP&display=swap');
 
+@font-face {
+  font-family: 'FOT-UD角ゴ_ラージ Pr6N';
+  src: url('/fonts/FOT-UDKakuGo-LargePr6N.woff2') format('woff2'),
+       url('/fonts/FOT-UDKakuGo-LargePr6N.woff') format('woff'),
+       url('/fonts/FOT-UDKakuGo-LargePr6N.ttf') format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}
 
 html {
   font-size: v.$base_font_size;
 }
 body {
   text-align: left;
-  font-family: "Noto Sans JP","游ゴシック", "YuGothic", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", 'Meiryo', "ＭＳ Ｐゴシック", sans-serif;
+
+  font-family: 'FOT-UD角ゴ_ラージ Pr6N', sans-serif;
+  // font-family: "Noto Sans JP","游ゴシック", "YuGothic", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "メイリオ", 'Meiryo', "ＭＳ Ｐゴシック", sans-serif;
   // font-family: 'メイリオ', 'Meiryo','ＭＳ ゴシック','Hiragino Kaku Gothic ProN','ヒラギノ角ゴ ProN W3',sans-serif;
   line-height: 1.7;
   background-color: #fff;

diff --git a/assets/src/insulation-2024/common/css/unit_insulation.css b/assets/src/insulation-2024/common/css/unit_insulation.css
@@ -1475,4 +1475,4 @@ about*/
   #blog_link .topic_wrap .cont_wrap .blog_wrap a.link_to_blog .blog_item .blog_date {
     font-size: 13px;
   }
-}
+}
diff --git a/assets/src/insulation-2024/common/css/unit_insulation.scss b/assets/src/insulation-2024/common/css/unit_insulation.scss
@@ -1399,4 +1399,4 @@ about*/
     }
     // topic_wrap
 }
-// #blog_link
+// #blog_link
diff --git a/assets/src/insulation-2024/common/js/default.js b/assets/src/insulation-2024/common/js/default.js
@@ -7,7 +7,16 @@ $(function () {
     // var sp_mode = 560;//
     //今回はヘッダ考慮しない
     // var headerhight = $('header').height() + 50; 
-    var headerhight = 0; 
+    var headerhight = 0;
+
+    (function(d) {
+        var config = {
+        kitId: 'dfu5msm',
+        scriptTimeout: 3000,
+        async: true
+        },
+        h=d.documentElement,t=setTimeout(function(){h.className=h.className.replace(/\bwf-loading\b/g,"")+" wf-inactive";},config.scriptTimeout),tk=d.createElement("script"),f=false,s=d.getElementsByTagName("script")[0],a;h.className+=" wf-loading";tk.src='https://use.typekit.net/'+config.kitId+'.js';tk.async=true;tk.onload=tk.onreadystatechange=function(){a=this.readyState;if(f%7C%7Ca&&a!="complete"&&a!="loaded")return;f=true;clearTimeout(t);try{Typekit.load(config)}catch(e){}};s.parentNode.insertBefore(tk,s)
+    })(document);
 
     /****************/
     /*アンカーリンクがあればそこまでスクロール*/