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

5 years ago · 112b83c524
parent 10a4a05599 8d923c34ac
commit 112b83c524
2 changed files with 2 additions and 2 deletions
--- a/public/react/public/css/edu-all.css
+++ b/public/react/public/css/edu-all.css
@ -15,7 +15,7 @@
    text-align: center;
    height: 60px;
    box-sizing: border-box;
-    min-width: 785px;
+    min-width: 780px;
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@ -15,7 +15,7 @@
    text-align: center;
    height: 60px;
    box-sizing: border-box;
-    min-width: 785px;
+    min-width: 780px;
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;