Merge remote-tracking branch 'upstream/development' into feature/Toky…

…o-Metro-Gov#2470-migrate-place-to-slot
kazuomatz · Mar 28, 2020 · 2e91ed9 · 2e91ed9
2 parents 0362b81 + 64b0216
commit 2e91ed9
Show file tree

Hide file tree

Showing 15 changed files with 44 additions and 34 deletions.
diff --git a/.github/workflows/ogp_builder.yml b/.github/workflows/ogp_builder.yml
@@ -61,4 +61,4 @@ jobs:
       uses: ad-m/github-push-action@master
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        ref: ${{ steps.extract_branch.outputs.branch }}
+        branch: ${{ steps.extract_branch.outputs.branch }}
diff --git a/components/ConfirmedCasesTable.vue b/components/ConfirmedCasesTable.vue
@@ -266,6 +266,7 @@ $default-boxdiff: 35px;
 
   > span {
     display: block;
+    width: 100%;
 
     @include font-size(16);
 

diff --git a/components/DevelopmentModeMark.vue b/components/DevelopmentModeMark.vue
@@ -4,7 +4,7 @@
     <a
       href="https://stopcovid19.metro.tokyo.lg.jp/"
       target="_blank"
-      rel="noopener"
+      rel="noopener noreferrer"
     >
       公開サイトへ
     </a>

diff --git a/components/MenuList.vue b/components/MenuList.vue
@@ -60,7 +60,7 @@ export default Vue.extend({
         ? {
             href: link,
             target: '_blank',
-            rel: 'noopener',
+            rel: 'noopener noreferrer',
             class: 'MenuList-Link'
           }
         : {

diff --git a/components/OpenDataLink.vue b/components/OpenDataLink.vue
@@ -1,5 +1,5 @@
 <template>
-  <a class="OpenDataLink" :href="url" target="_blank" rel="noopener">
+  <a class="OpenDataLink" :href="url" target="_blank" rel="noopener noreferrer">
     {{ $t('オープンデータを入手') }}
     <v-icon
       class="ExternalLinkIcon"

diff --git a/components/SideNavigation.vue b/components/SideNavigation.vue
@@ -51,7 +51,7 @@
           <a
             href="https://line.me/R/ti/p/%40822sysfc"
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
             class="SideNavigation-SocialLink"
           >
             <picture>
@@ -62,7 +62,7 @@
           <a
             href="https://twitter.com/tokyo_bousai"
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
             class="SideNavigation-SocialLink"
           >
             <picture>
@@ -73,7 +73,7 @@
           <a
             href="https://www.facebook.com/tochokoho"
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
             class="SideNavigation-SocialLink"
           >
             <picture>
@@ -84,7 +84,7 @@
           <a
             href="https://github.com/tokyo-metropolitan-gov/covid19"
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
             class="SideNavigation-SocialLink"
           >
             <picture>

diff --git a/components/SourceLink.vue b/components/SourceLink.vue
@@ -3,7 +3,12 @@
     <div>{{ header }}</div>
     <i18n path="出典: {source}" tag="div" :for="linkString">
       <template v-slot:source>
-        <a class="SourceLink" :href="url" target="_blank" rel="noopener">
+        <a
+          class="SourceLink"
+          :href="url"
+          target="_blank"
+          rel="noopener noreferrer"
+        >
           {{ linkString }}
           <v-icon class="ExternalLinkIcon" size="15">
             mdi-open-in-new

diff --git a/components/TestedCasesTable.vue b/components/TestedCasesTable.vue
@@ -164,6 +164,7 @@ $default-boxh: 150px;
 
   > span {
     display: block;
+    width: 100%;
 
     @include font-size(16);
 

diff --git a/components/WhatsNew.vue b/components/WhatsNew.vue
@@ -12,7 +12,7 @@
           class="WhatsNew-list-item-anchor"
           :href="item.url"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
         >
           <time
             class="WhatsNew-list-item-anchor-time px-2"

diff --git a/components/flow/FlowPcAdvisory.vue b/components/flow/FlowPcAdvisory.vue
@@ -34,7 +34,7 @@
             <a
               href="https://www.fukushihoken.metro.tokyo.lg.jp/iryo/kansen/coronasodan.html"
               target="_blank"
-              rel="noopener"
+              rel="noopener noreferrer"
             >
               <span>{{ $t('各保健所の電話番号は福祉保健局HPへ') }}</span>
               <v-icon size="18">

diff --git a/components/flow/FlowSpAdvisory.vue b/components/flow/FlowSpAdvisory.vue
@@ -18,7 +18,7 @@
           <a
             href="https://www.fukushihoken.metro.tokyo.lg.jp/iryo/kansen/coronasodan.html"
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
           >
             {{ $t('各保健所の電話番号は福祉保健局HPへ') }}
             <v-icon size="16">

diff --git a/pages/about.vue b/pages/about.vue
@@ -119,7 +119,7 @@
               )
             "
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
           >
             {{ $t('Google Analytics利用規約') }}
           </a>
@@ -128,7 +128,7 @@
           <a
             :href="$t('https://policies.google.com/privacy?hl=ja')"
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
           >
             {{ $t('Googleのプライバシーポリシー') }}
           </a>
@@ -139,7 +139,7 @@
               $t('https://support.google.com/analytics/answer/6004245?hl=ja')
             "
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
           >
             {{ $t('Google Analyticsに関する詳細情報') }}
           </a>
@@ -180,7 +180,7 @@
           <a
             href="https://portal.data.metro.tokyo.lg.jp/"
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
           >
             {{ $t('東京都オープンデータカタログサイト') }}
           </a>
@@ -200,7 +200,7 @@
             <a
               href="https://github.com/tokyo-metropolitan-gov/covid19"
               target="_blank"
-              rel="noopener"
+              rel="noopener noreferrer"
             >
               {{ $t('GitHub リポジトリ') }}
             </a>

diff --git a/pages/flow.vue b/pages/flow.vue
@@ -12,7 +12,7 @@
         <a
           href="https://www.fukushihoken.metro.tokyo.lg.jp/iryo/kansen/coronasodan.html"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           class="Flow-Card-Button"
         >
           <span class="Flow-Card-Button-Description">

diff --git a/pages/parent.vue b/pages/parent.vue
@@ -19,7 +19,7 @@
           <a
             href="https://tokyodouga.jp/lViN9C_BS-0.html"
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
             >{{ $t('【参考】感染症予防のための正しい手洗い方法（動画）') }}</a
           >
         </li>
@@ -42,7 +42,7 @@
           <a
             href="https://www.fukushihoken.metro.tokyo.lg.jp/iryo/kansen/coronasodan.html"
             target="_blank"
-            rel="noopener"
+            rel="noopener noreferrer"
             >{{ $t('「新型コロナウイルス感染症にかかる相談窓口について」') }}</a
           >
         </li>

diff --git a/pages/worker.vue b/pages/worker.vue
@@ -8,7 +8,7 @@
         <a
           href="http://www.sangyo-rodo.metro.tokyo.jp/chushou/kinyu/yuushi/yuushi/new"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           >{{ $t('新型コロナウイルス感染症に対応した制度融資') }}</a
         >
       </h3>
@@ -25,7 +25,7 @@
         <a
           href="https://www.tokyo-kosha.or.jp/topics/2003/0001.html"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           >{{ $t('新型コロナウイルスによる経営課題に関する専門家派遣') }}</a
         >
       </h3>
@@ -42,7 +42,7 @@
         <a
           href="https://www.hataraku.metro.tokyo.jp/kansensyo/index.html"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           >{{ $t('中小企業従業員融資') }}</a
         >
       </h3>
@@ -59,7 +59,7 @@
         <a
           href="https://www.hataraku.metro.tokyo.jp/kansensyo/index.html"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           >{{
             $t('新型コロナウイルス感染症に係る休業等支援事業（専門家派遣）')
           }}</a
@@ -78,7 +78,7 @@
         <a
           href="https://www.hataraku.metro.tokyo.jp/kansensyo/index.html"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           >{{ $t('新型コロナウイルス感染症対策雇用環境整備促進事業') }}</a
         >
       </h3>
@@ -95,7 +95,7 @@
         <a
           href="https://www.hataraku.metro.tokyo.jp/kansensyo/index.html"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           >{{ $t('テレワーク導入モデル体験事業') }}</a
         >
       </h3>
@@ -112,7 +112,7 @@
         <a
           href="https://www.shigotozaidan.or.jp/koyo-kankyo/joseikin/kinkyutaisaku.html"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           >{{ $t('事業継続緊急対策（テレワーク）助成金') }}</a
         >
       </h3>
@@ -126,9 +126,12 @@
     </StaticCard>
     <StaticCard>
       <h3>
-        <a href="https://tokyo-telework.jp/" target="_blank" rel="noopener">{{
-          $t('テレワークオンラインセミナー開催')
-        }}</a>
+        <a
+          href="https://tokyo-telework.jp/"
+          target="_blank"
+          rel="noopener noreferrer"
+          >{{ $t('テレワークオンラインセミナー開催') }}</a
+        >
       </h3>
       <p>
         {{
@@ -143,7 +146,7 @@
         <a
           href="http://www.sangyo-rodo.metro.tokyo.jp/attention/2020/0305_13201.html"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           >{{ $t('中小企業者等特別相談窓口') }}</a
         >
       </h3>
@@ -156,7 +159,7 @@
         <a
           href="http://www.sangyo-rodo.metro.tokyo.jp/attention/2020/0305_13201.html"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           >{{ $t('フリーランスを含む個人事業主特別相談窓口') }}</a
         >
       </h3>
@@ -171,7 +174,7 @@
         <a
           href="https://www.hataraku.metro.tokyo.lg.jp/sodan/sodan/index.html"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           >{{ $t('緊急労働相談ダイヤル') }}</a
         >
       </h3>
@@ -188,7 +191,7 @@
         <a
           href="https://smooth-biz.metro.tokyo.lg.jp/"
           target="_blank"
-          rel="noopener"
+          rel="noopener noreferrer"
           >{{
             $t('新しいワークスタイルや企業活動の東京モデル「スムーズビズ」')
           }}</a