Merge branches 'dev_aliyun' and 'topic_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js

@@ -548,7 +548,7 @@ class ExerciseReviewAndAnswer extends Component{
           }
           .setRadioStyle .ant-radio,.setRadioStyle .ant-checkbox{
             height:16px;
-            margin-top:4px;
+            margin-top:5px;
           }
           .standardAnswer.editormd-html-preview,.answerStyle.editormd-html-preview{
             width:100%!important

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

@@ -49,7 +49,7 @@ class single extends Component{
                   <Radio className="df lineh-25 setRadioStyle" value={item.choice_id}>
                     <span className="fl mr3 lineh-25">{prefix}</span>
                     <MarkdownToHtml content={item.choice_text} selector={'single_' + (this.props.index + 1) + (key + 1)}
-                      className="flex1" style={{display:"inline-block", 'margin-top': '-1px'}}                      
+                      className="flex1" style={{display:"inline-block"}}                      
                     ></MarkdownToHtml>
                   </Radio>
                 </p>

public/react/src/modules/paths/ShixunPaths.css

@@ -76,7 +76,7 @@
   width: 100%;
 }
 .squareCard .squareImg img:hover{
-  transform: scale(1.2);
+  transform: scale(1.05);
 }
 
 /* card info */