Merge pull request stopcovid19-okayama#394 from tokyo-metropolitan-go…

…v/development

release ver. 1.0.5

.github/workflows/develop.yml

@@ -1,9 +1,9 @@
-name: staging deploy
+name: development deploy
 
 on:
   push:
     branches:
-      - staging
+      - development
 
 jobs:
   deploy:
@@ -34,3 +34,4 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./dist
+          publish_branch: dev-pages

.github/workflows/staging.yml

@@ -0,0 +1,36 @@
+name: staging deploy
+
+on:
+  push:
+    branches:
+      - staging
+
+jobs:
+  deploy:
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '10.x'
+
+      - name: Cache dependencies
+        uses: actions/cache@v1
+        with:
+          path: ~/.cache/yarn
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - run: yarn install --frozen-lockfile
+      - run: yarn run test
+      - run: yarn run generate --fail-on-page-error
+      - run: "echo \"User-agent: *\nDisallow *\" > ./dist/robots.txt"
+
+      - name: deploy
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./dist

README.md

@@ -35,11 +35,16 @@ $ yarn dev
 
 `staging` ブランチがアップデートされると、自動的に `gh-pages` ブランチにHTML類がbuildされます。そして、ステージングサイト https://stg-covid19-tokyo.netlify.com/ が更新されます。
 
+`development` ブランチがアップデートされると、自動的に `dev-pages` ブランチにHTML類がbuildされます。そして、開発用サイト https://dev-covid19-tokyo.netlify.com/ が更新されます。
+
 
 If `master` branch is updated, the script will build html files to `production` branch.
-`Netlify` will also update the production site https://stopcovid19.metro.tokyo.lg.jp/ .
+It will also update the production site https://stopcovid19.metro.tokyo.lg.jp/ .
 
 If `staging` branch is updated, the script will build html files to `gh-pages` branch.
-`Netlify` will also update the staging site https://stg-covid19-tokyo.netlify.com/ .
+It will also update the staging site https://stg-covid19-tokyo.netlify.com/ .
+
+If `development` branch is updated, the script will build html files to `dev-pages` branch.
+It will also update the development site https://dev-covid19-tokyo.netlify.com/ .
 
 

components/DataView.vue

@@ -32,7 +32,6 @@ export default class DataView extends Vue {
 .DataView {
   &-DataInfo {
     &-summary {
-      font-weight: 600;
       color: $gray-2;
       font-family: Hiragino Sans;
       font-style: normal;
@@ -58,6 +57,7 @@ export default class DataView extends Vue {
   @include card-container();
   height: 100%;
   &-content {
+    height: auto !important;
     .v-toolbar__content {
       align-items: start;
     }
@@ -69,7 +69,6 @@ export default class DataView extends Vue {
   &-TitleContainer {
     padding: 14px 0 8px;
     color: $gray-2;
-    font-weight: 600;
   }
   &-Title {
     @include card-h2();
@@ -88,7 +87,7 @@ export default class DataView extends Vue {
   }
 }
 .v-toolbar__content {
-  height: 80px !important;
+  height: auto !important;
 }
 .v-toolbar__title {
   white-space: inherit !important;

components/DataViewBasicInfoPanel.vue

@@ -60,7 +60,7 @@
   }
 }
 .v-toolbar__content {
-  height: 80px !important;
+  height: auto !important;
 }
 </style>