Merge remote-tracking branch 'origin/master'

public/react/src/modules/page/main/CodeEvaluateView.js

@@ -159,7 +159,7 @@ class CodeEvaluateView extends Component {
 			let headIconClass = '';
 			let _headLockIconClass = '';
 
-			if (item.is_public === 0) {
+			if (item.is_public == 0) {
 				if (game.test_sets_view === true || power === 1){
 					_headLockIconClass = 'fas fa-unlock-alt'
 				} else {
@@ -175,7 +175,7 @@ class CodeEvaluateView extends Component {
 		
 			testSetsComponentArray.push(
 				<div className="-task-ces-top clearfix" onClick={ this.onTestSetHeaderClick.bind(this, index) }
-						style={{cursor:'pointer'}} key={index+'-0'}>
+						style={{cursor:'pointer', 'margin-top':index == 0 ? '4px' : ''}} key={index+'-0'}>
 					<p className="clearfix">
 						<i className={`fa ${ 'fa-caret-right'} mr8 font-16`}
 						style={isExpanded ? {transform: 'rotate(90deg)'} : {}}></i>

public/react/src/modules/page/main/LeftView.js

@@ -283,6 +283,9 @@ class LeftView extends Component {
 													color: #CDCDCD;
 													flex: 0 0 45px;
 												}
+												.markdown-body ol, .markdown-body ul {
+													padding-left: 2.5em;
+												}
 											`}</style>
 
 											<div className="multiLevelAnswer">
@@ -293,7 +296,7 @@ class LeftView extends Component {
 															<div className="name">{item.name}</div>
 															<div className="status">已解锁</div>
 														</div>
-														<div className="contents" dangerouslySetInnerHTML={{__html: markdownToHTML(item.contents)}}>
+														<div className="contents markdown-body" dangerouslySetInnerHTML={{__html: markdownToHTML(item.contents)}}>
 														</div>
 													</div>
 												})}