From 6799fa31833b3112c0a5d854f760a41d31dd112f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 26 Jul 2019 20:42:23 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/update.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/update.html b/public/update.html
index 2be5462a..cc8b8cce 100644
--- a/public/update.html
+++ b/public/update.html
@@ -56,7 +56,7 @@ If you continue to experience problems please contact your Trustie administrator
             温馨提示:为了给大家提供更优质的服务
         </p>
         <p class="font-18">
-            平台拟于<span style="color: red">2019年7月22日10:40--2019年7月22号11:00</span>进行全面升级，带来不便，敬请谅解！
+            平台拟于<span style="color: red">2019年7月26日22:00--2019年7月26号23:30</span>进行全面升级，带来不便，敬请谅解！
         </p>
     </div>user_tidings.html.erb
 </body>

From 6b95c9ced891d3d96e7c52dd3ae0422919904170 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Fri, 26 Jul 2019 21:46:01 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=8F=90=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/update.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/update.html b/public/update.html
index 2be5462a..3023eda8 100644
--- a/public/update.html
+++ b/public/update.html
@@ -53,10 +53,10 @@ If you continue to experience problems please contact your Trustie administrator
     <div class="edu-txt-center">
         <img src="http://testbdweb.educoder.net/images/warn/update.jpeg" >
         <p class="font-18 mt20">
-            温馨提示:为了给大家提供更优质的服务
+            温馨提示:因第三方云服务升级，为了给大家提供更优质的服务
         </p>
         <p class="font-18">
-            平台拟于<span style="color: red">2019年7月22日10:40--2019年7月22号11:00</span>进行全面升级，带来不便，敬请谅解！
+            平台拟于<span style="color: red">2019年7月26日22:00--2019年7月26号11:30</span>进行全面升级，带来不便，敬请谅解！
         </p>
     </div>user_tidings.html.erb
 </body>

From 717e646ddfedd78c3496007ccee1edde25634caf Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Fri, 26 Jul 2019 21:54:10 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=A4=A7=E8=B5=9B=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/update.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/update.html b/public/update.html
index 3023eda8..d900d445 100644
--- a/public/update.html
+++ b/public/update.html
@@ -58,6 +58,6 @@ If you continue to experience problems please contact your Trustie administrator
         <p class="font-18">
             平台拟于<span style="color: red">2019年7月26日22:00--2019年7月26号11:30</span>进行全面升级，带来不便，敬请谅解！
         </p>
-    </div>user_tidings.html.erb
+    </div>
 </body>
 </html>

From 40dc4e32974c3e3cd4547b1f5f3ab966023c86f8 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 26 Jul 2019 22:10:18 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/update.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/update.html b/public/update.html
index cc8b8cce..f7fbf5a4 100644
--- a/public/update.html
+++ b/public/update.html
@@ -58,6 +58,6 @@ If you continue to experience problems please contact your Trustie administrator
         <p class="font-18">
             平台拟于<span style="color: red">2019年7月26日22:00--2019年7月26号23:30</span>进行全面升级，带来不便，敬请谅解！
         </p>
-    </div>user_tidings.html.erb
+    </div>
 </body>
 </html>

From b05e8ce00183e844bb96d1d651ac714110760995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 27 Jul 2019 16:34:00 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/NewHeader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 4ab7ae81..b62ab515 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -435,7 +435,7 @@ class NewHeader extends Component {
 			    </span>*/}
                 <div style={{display:isLogin===true?'block':'none'}}>
                     <div className="fr edu-menu-panel" style={{height:'60px'}}>
-                            <a href={`/users/${current_user.login}`} className="fl ml15">
+                            <a href={`/users/${current_user.login}`} className="fl">
                                 <img alt="头像" className="radius mt13" height="34" id="nh_user_logo" nhname="avatar_image"
                                         src={`/images/${current_user.image_url}`} width="34">
                                 </img>
@@ -456,7 +456,7 @@ class NewHeader extends Component {
 
 
                 <div style={{display:isLogin===false?'block':'none'}}>
-                    <span className="font-15 fr mt15 ml15">
+                    <span className="font-15 fr mt15">
                         <a href="/login" className="mr5 color-white">登录</a>
                         <em className="vertical-line"></em>
                         <a href="/user_join" className="mr5 color-white">注册</a>

From a30cb41e63d920e3b44d63e32115eb7a780e4999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 27 Jul 2019 16:46:22 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/educoder/edu-all.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 823d4a49..373ec3bd 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -24,7 +24,7 @@
 .nav-img{position: absolute;top:2px;right: -8px;display: none}
 
 .head-right{box-sizing: border-box;height: 60px; background: #24292D; }
-.head-right i{margin-top:12px;float: right;margin-right: 15px;margin-left: 15px;}
+.head-right i{margin-top:12px;float: right;margin-right: 12px;margin-left: 15px;}
 /* tpm*/
 .educontent .icon { padding-left: 0px !important;    padding-top: 0px !important;   padding-bottom: 0px !important;}
 em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}