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

src/main/webapp/resources/view/vendor/forstore/vendor_material.html

@@ -1127,7 +1127,10 @@
 	}
 	.edit-contents .content .title span:last-child {
 		float: left;
-		width: 65px;
+		width: 75px;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
 	}
 	.edit-contents .content p.noBreak{
 		color: #f15601;

src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -743,6 +743,10 @@
     }
     .edit-form td div span.marginL5{
         margin-left: 5px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        width: 100%;
     }
     .filter i {
         font-size: 16px;