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

public/react/src/modules/courses/exercise/question/Progques.js

@@ -85,6 +85,10 @@ class Progques extends Component{
             min-height:35px;
             box-sizing:border-box;
           }
+          
+           .emptyPanel .ql-editor p{
+							overflow: unset !important;
+					}
           .emptyPanel .quill_editor_for_react_area{
           width: 100% !important;
           }

public/react/src/modules/courses/exercise/question/multiple.js

@@ -51,6 +51,8 @@ class Multiple extends Component{
 						`
 						.multiple .ql-editor p{
 							line-height: 25px !important;
+							overflow: unset !important;
+
 							}
 						`
 					}

public/react/src/modules/courses/exercise/question/single.js

@@ -47,6 +47,7 @@ class single extends Component{
 						`
 						.single .ql-editor p{
 							line-height: 25px !important;
+							overflow: unset !important;
 							}
 						`
 					}