Merge remote-tracking branch 'origin/dev' into dev

frontend/saas-web/app/Application.scss

@@ -407,4 +407,58 @@ div::-webkit-scrollbar-track {
     font-family: font-saas;
     color: #5AC6F8;
   }
+}
+
+/** toast **/
+
+.x-toast-success{
+  border-color: #adeaa4 !important;
+  border-radius: 4px !important;
+  .x-window-body{
+      background: #f3ffef !important;
+      border-color: #f3ffef !important;
+  }
+  .x-autocontainer-innerCt{
+      word-wrap: break-word;
+      color: #3ec12a;
+      padding: 4px 30px 4px 46px !important;
+  }
+  .x-autocontainer-innerCt::before{
+      margin-left: -19px;
+      margin-top: 1px;
+      content: ' ';
+      width: 16px;
+      position: absolute;
+      display: block;
+      height: 16px;
+      background: url(../../../../resources/images/default/toast_over.png) 0 0 no-repeat; 
+      background-size: 16px 16px;
+      background-position: center;
+  }
+}
+
+.x-toast-error{
+  border-color: #f39d70 !important;
+  border-radius: 4px !important;
+  .x-window-body{
+      background: #fdefcd !important;
+      border-color: #fdefcd !important;
+  }
+  .x-autocontainer-innerCt{
+      word-wrap: break-word;
+      color: #ea800e;
+      padding: 4px 30px 4px 46px !important;
+  }
+  .x-autocontainer-innerCt::before{
+      margin-left: -19px;
+      margin-top: 1px;
+      content: ' ';
+      width: 16px;
+      position: absolute;
+      display: block;
+      height: 16px;
+      background: url(../../../../resources/images/default/toast_close.png) 0 0 no-repeat; 
+      background-size: 16px 16px;
+      background-position: center;
+  }
 }

frontend/saas-web/app/view/main/Main.scss

@@ -324,56 +324,6 @@ body > .x-mask {
     white-space: nowrap;
 }
 
-.x-toast-success{
-    border-color: #adeaa4 !important;
-    border-radius: 4px !important;
-    .x-window-body{
-        background: #f3ffef !important;
-        border-color: #f3ffef !important;
-    }
-    .x-autocontainer-innerCt{
-        color: #3ec12a;
-        padding: 4px 30px 4px 46px !important;
-    }
-    .x-autocontainer-innerCt::before{
-        margin-left: -19px;
-        margin-top: 1px;
-        content: ' ';
-        width: 16px;
-        position: absolute;
-        display: block;
-        height: 16px;
-        background: url(../../../../resources/images/default/toast_over.png) 0 0 no-repeat; 
-        background-size: 16px 16px;
-        background-position: center;
-    }
-}
-
-.x-toast-error{
-    border-color: #f39d70 !important;
-    border-radius: 4px !important;
-    .x-window-body{
-        background: #fdefcd !important;
-        border-color: #fdefcd !important;
-    }
-    .x-autocontainer-innerCt{
-        color: #ea800e;
-        padding: 4px 30px 4px 46px !important;
-    }
-    .x-autocontainer-innerCt::before{
-        margin-left: -19px;
-        margin-top: 1px;
-        content: ' ';
-        width: 16px;
-        position: absolute;
-        display: block;
-        height: 16px;
-        background: url(../../../../resources/images/default/toast_close.png) 0 0 no-repeat; 
-        background-size: 16px 16px;
-        background-position: center;
-    }
-}
-
 .x-main-master,
 .x-main-master.x-btn-menu-active,
 .x-main-master.x-btn-pressed {