Merge branch 'master' of https://git.loafle.net/ucap-web/next-ucap-messenger

electron-projects/ucap-webmessenger-electron/src/app/AppWindow.ts

@@ -23,8 +23,8 @@ export class AppWindow {
   // tslint:disable-next-line: variable-name
   private _rendererReadyTime: number | null = null;
 
-  private minWidth = 1160;
-  private minHeight = 800;
+  private minWidth = 700;
+  private minHeight = 600;
 
   public constructor(private appIconPath: string) {
     const savedWindowState = windowStateKeeper({

projects/ucap-webmessenger-ui-chat/src/lib/components/message-box.component.scss

@@ -7,7 +7,7 @@ $otherBox-bg: #ffffff;
 $meBox-line: #cccccc;
 $meBox-bg: #ffffff;
 $tablet-l-width: 1024px;
-$mob-l-width: 640px;
+$tablet-s-width: 768px;
 .information-msg {
   width: 100%;
 }
@@ -56,15 +56,17 @@ $mob-l-width: 640px;
     display: Flex;
     flex-flow: row;
     margin-left: 10px;
-    max-width: 80%;
-    @media screen and (max-width: #{$mob-l-width}),
+    width: 80%;
+    @media screen and (max-width: #{$tablet-s-width}),
       (max-height: 600px) {
       flex-flow: column;
+      max-width: 80%;
+      width: unset;
     }
     .message-main {
       margin-right: 6px;
       max-width: calc(100% - 60px);
-      @media screen and (max-width: #{$mob-l-width}),
+      @media screen and (max-width: #{$tablet-s-width}),
       (max-height: 600px) {
         flex-flow: column;
         max-width: 100%;
@@ -88,7 +90,7 @@ $mob-l-width: 640px;
       color: #666666;
       word-wrap: break-word;
       white-space: nowrap;
-      @media screen and (max-width: #{$mob-l-width}), (max-height: 600px) {
+      @media screen and (max-width: #{$tablet-s-width}), (max-height: 600px) {
         flex-flow: row;
         align-self: flex-start;
         ul {
@@ -99,34 +101,41 @@ $mob-l-width: 640px;
           li {
             display: inline-flex;
             &.unread {
-              padding: 0px 6px;
               margin-left: 10px;
-              border-radius: 30px;
-              background-color: #666666;
-              color: #ffffff;
             }
           }
         }
       }
-    }
-    &.me {
-      .message-main-container {
-        display: Flex;
-        flex-flow: row;
-        margin-left: 0px;
-        margin-right: 10px;
-        @media screen and (max-width: #{$tablet-l-width}),
-          (max-height: 800px) {
-          flex-flow: column;
+      ul {
+        li {
+          &.unread {
+            padding: 0px 6px;
+            border-radius: 30px;
+            background-color: #888888;
+            color: #ffffff;
+            display: inline-flex;
+          }
         }
       }
     }
-    &.highlight {
-      .bubble {
-        color: red;
+  }
+  &.me {
+    .message-main-container {
+      display: Flex;
+      flex-flow: row-reverse;
+      margin-left: 0px;
+      margin-right: 10px;
+      @media screen and (max-width: #{$tablet-s-width}),
+          (max-height: 600px) {
+        flex-flow: column;
       }
     }
   }
+  &.highlight {
+    .bubble {
+      color: red;
+    }
+  }
 }
 .message-row.me {
   .profile-img {
@@ -137,6 +146,8 @@ $mob-l-width: 640px;
       display: none;
     }
     .message-main {
+      display: flex;
+      justify-content: flex-end;
       text-align: right;
       margin-left: 6px;
       margin-right: 0;
@@ -146,7 +157,7 @@ $mob-l-width: 640px;
     }
     .secondary-text {
       text-align: end;
-      @media screen and (max-width: #{$mob-l-width}), (max-height: 600px) {
+      @media screen and (max-width: #{$tablet-s-width}), (max-height: 600px) {
         flex-flow: column;
         align-self: flex-end;
       }

projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/schedule.component.scss

@@ -3,7 +3,7 @@
   text-align: left;
   padding: 4px;
   .event-header {
-    padding: 10px;
+    padding: 8px 10px;
     font-size: 14px;
     font-weight: 600;
     text-align: center;

projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/translation.component.scss

@@ -1,7 +1,6 @@
 .translation-main {
   flex-direction: column;
   text-align: left;
-
   .original {
     padding: 10px;
   }
@@ -9,6 +8,10 @@
     padding: 10px;
     border-top: 1px solid #dddddd;
   }
+  .sticker {
+    padding: 10px 10px 0;
+    text-align: center;
+  }
 }
 .language {
   padding: 0px 6px 4px;

projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video-conference.component.html

@@ -21,24 +21,24 @@
   </div>
   <ul class="event-info">
     <li class="event-date bg-accent-brightest">
-      <span class="text-accent-darkest">{{
+      <label class="text-accent-darkest">{{
         'chat.event.videoConferenceRegister' | translate
-      }}</span
-      >{{ message.sentMessageJson.register }}
+      }}</label
+      ><span>{{ message.sentMessageJson.register }}</span>
     </li>
     <li class="event-time bg-accent-brightest">
-      <span class="text-accent-darkest">{{
+      <label class="text-accent-darkest">{{
         'chat.event.videoConferenceAttendee' | translate
-      }}</span
-      >{{ message.sentMessageJson.attendee }}
+      }}</label
+      ><span>{{ message.sentMessageJson.attendee }}</span>
     </li>
     <li class="event-time bg-accent-brightest">
-      <span class="text-accent-darkest">{{
+      <label class="text-accent-darkest">{{
         'chat.event.videoConferenceDate' | translate
-      }}</span
-      >{{
+      }}</label
+      ><span>{{
         message.sentMessageJson.startDate | ucapDate: 'YYYY.MM.DD (ddd) a hh:mm'
-      }}
+      }}</span>
     </li>
     <li class="event-content">
       {{ message.sentMessageJson.title }}

projects/ucap-webmessenger-ui-chat/src/lib/components/message-box/video-conference.component.scss

@@ -3,7 +3,7 @@
   text-align: left;
   padding: 4px;
   .event-header {
-    padding: 10px;
+    padding: 8px 10px;
     font-size: 14px;
     font-weight: 600;
     text-align: center;
@@ -29,8 +29,15 @@
       &.event-time {
         padding: 4px 10px;
         border-bottom: 1px dotted #dddddd;
+        display: flex;
+        label {
+          margin-right: 10px;
+          flex: 0 0 auto;
+          font-size: 0.96em;
+          font-weight: 600;
+          width: 40px;
+        }
         span {
-          width: 60px;
           padding: 1px 6px;
           margin-right: 6px;
           border-radius: 100px;
@@ -39,7 +46,7 @@
           justify-content: center;
           font-size: 0.96em;
           margin-bottom: 2px;
-          color: #777777;
+          color: #444444;
         }
       }
       &.event-content {
@@ -53,11 +60,10 @@
 
   .btn-box {
     width: 100%;
-    height: 40px;
-    border-top: 1px solid #dddddd;
     display: flex;
     width: 100%;
     text-align: center;
+    padding-top: 4px;
     ul {
       width: 100%;
       li {
@@ -67,7 +73,7 @@
         text-align: center;
         align-items: center;
         font-size: 13px;
-        border-right: 1px solid #dddddd;
+        border-right: 1px solid rgb(255, 255, 255, 0.6);
         &:last-child {
           border-right: none;
         }

projects/ucap-webmessenger-ui/src/lib/components/translation-section.component.scss

@@ -49,7 +49,7 @@
 ::ng-deep .translationForm {
   position: relative;
   display: flex;
-  padding: 0 40px;
+  padding: 0 2vw;
   justify-items: flex-end;
   align-content: space-between;
   font-size: 0.9em;