Merge branch 'master' into hunicus/block-health-faq

2023-02-01 00:19:28 +09:00
parent ff3af3a159 e1c0f0a529
commit 7ce67f7ca5
3 changed files with 15 additions and 4 deletions
--- a/frontend/src/app/components/block/block.component.scss
+++ b/frontend/src/app/components/block/block.component.scss
@@ -232,3 +232,15 @@ h1 {
    margin-right: 1em;
  }
 }
+<<<<<<< hunicus/block-health-faq
+=======
+
+.beta {
+  font-size: 10px;
+  margin: 5p;
+  padding: 5p;
+  position: absolute;
+  top: 11px;
+  margin-left: 10px;
+}
+>>>>>>> master