Merge branches 'develop' and 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

app/views/competitions/_competitions_name.html.erb

@@ -14,13 +14,13 @@
         <div class="login_reg pr login_regs">
             <div style="position: relative;">
 
-                <a href="javascript:void(0)" onclick="competitionfun();" id="closeIcon" style="position: absolute;right: 0px;top: 36px;">
+                <a href="javascript:void(0)" onclick="competitionfun();" id="closeIcon" style="position: absolute;right: -20px;top: 36px;">
                   <i class="iconfont icon-shanchudiao"></i>
                 </a>
 
-                <img src="/images/educoder/competitionslog.png" height="600px" width="600px" />
+                <img src="/images/educoder/competitionslog.png" height="580px" width="637px" />
 
-                <a style="position: absolute;left:39%; bottom:18px;" onclick="setcompetitionfun();" >
+                <a style="position: absolute;left:43%; bottom:18px;" onclick="setcompetitionfun();" >
                   <img height="40px" width="150px" src="/images/educoder/applys.png" />
                 </a>
 

public/react/src/modules/tpm/NewHeader.js

@@ -320,14 +320,14 @@ class NewHeader extends Component {
 							<div style={{position: "relative"}} >
 
 								<a onClick={()=>this.competitionfun()} id="closeIcon"
-									 style={{position: "absolute",right: "0px",top: "36px"}}
+									 style={{position: "absolute",right: "-20px",top: "36px"}}
 								>
 									<i className="iconfont icon-shanchudiao"></i>
 								</a>
 
-								<img src={"/images/educoder/competitionslog.png"} height="600px" width="600px"/>
+								<img src={"/images/educoder/competitionslog.png"} height="580px" width="637px"/>
 
-								<a style={{position: "absolute",left:"39%", bottom:"18px"}} onClick={()=>this.setcompetitionfun()}>
+								<a style={{position: "absolute",left:"43%", bottom:"18px"}} onClick={()=>this.setcompetitionfun()}>
 									<img height="40px" width="150px" src={"/images/educoder/applys.png"}/>
 								</a>