Skip to content

Commit

Permalink
Merge pull request #593 from tokyo-metropolitan-gov/staging
Browse files Browse the repository at this point in the history
グラフに注釈を追加しました
  • Loading branch information
mikkame authored Mar 6, 2020
2 parents de7720b + 35ee2f0 commit d080b5a
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion components/MetroBarChart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
margin-top: 10px;
margin-bottom: 0 !important;
font-size: 12px;
color: #808080;
color: $gray-3;
}
}
</style>
Expand Down
12 changes: 12 additions & 0 deletions components/SvgCard.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<template>
<data-view class="SvgCard" :title="title" :date="date">
<template v-slot:button>
<p class="Graph-Desc">
(注)都内において疑い例または患者の濃厚接触者として検査を行ったものについて掲載<br />
(チャーター機帰国者、クルーズ船乗客等は含まれていない。)
</p>
</template>
<slot />
</data-view>
</template>
Expand All @@ -9,6 +15,12 @@
::v-deep svg {
width: 100%;
}
.Graph-Desc {
margin-top: 10px;
margin-bottom: 0;
font-size: 12px;
color: $gray-3;
}
}
</style>

Expand Down
11 changes: 11 additions & 0 deletions components/TimeStackedBarChart.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<template>
<data-view :title="title" :date="date">
<template v-slot:button>
<p class="Graph-Desc">
(注)同一の対象者について複数の検体を調査する場合あり
</p>
<data-selector v-model="dataKind" />
</template>
<bar :chart-data="displayData" :options="options" :height="240" />
Expand Down Expand Up @@ -182,3 +185,11 @@ export default {
}
}
</script>

<style lang="scss" scoped>
.Graph-Desc {
margin: 10px 0;
font-size: 12px;
color: $gray-3;
}
</style>

0 comments on commit d080b5a

Please sign in to comment.