Merge pull request #503 from KoukiNAGATA/nagata/front/sender-type2

textareaの高さ合わせた

app/front/assets/scss/index.scss

@@ -359,6 +359,7 @@
     width: 100%;
     margin-top: 0.3em;
     & > .sender-badge {
+      min-height: 20px;
       font-size: 75%;
       color: white;
       padding: 0.15em 0.5em;
@@ -377,6 +378,12 @@
   .admin {
     background-color: $text-gray;
   }
+  .none {
+    background-color: white;
+  }
+  .normaltext {
+    min-height: 80px !important;
+  }
   & > .textarea {
     padding: 0.5em 1em;
     border: none;
@@ -572,14 +579,17 @@
     color: $text-gray;
   }
 
+  .badgecomment {
+    padding: 0.75em 0.8em 0.35em !important;
+  }
   & > .comment,
   .reaction {
     position: relative;
     width: 100%;
     min-height: 5rem;
     flex-grow: 1;
     flex-shrink: 0;
-    padding: 0.75em 0.8em 0.35em;
+    padding: 0em 0.8em 0.35em;
     border: 1px solid $placeholder-gray;
     background: white;
     border-radius: 5px;

app/front/components/Message.vue

@@ -9,6 +9,8 @@
         admin: message.iconId == 0,
         question: message.type == 'question',
         answer: message.type == 'answer',
+        badgecomment:
+          message.senderType === 'admin' || message.senderType === 'speaker',
       }"
     >
       <!-- バッジ -->

app/front/components/TextArea.vue

@@ -15,9 +15,10 @@
     </div>
     <div v-if="selectedChatItem === null" class="sender-badge-wrapper">
       <span v-if="isAdmin" class="sender-badge admin"> from 運営 </span>
-      <span v-if="isSpeaker" class="sender-badge speaker">
+      <span v-else-if="isSpeaker" class="sender-badge speaker">
         from スピーカー
       </span>
+      <!--span v-else class="sender-badge none"></span-->
     </div>
     <!--div class="input-area__fixed-phrases">
       <fixed-phrase text="8888888888" />
@@ -28,6 +29,7 @@
       v-model="text"
       :disabled="disabled"
       class="textarea"
+      :class="{ normaltext: isAdmin === false && isSpeaker === false }"
       contenteditable
       :placeholder="placeholder"
     />