Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

5 years ago · c862d9cc7f
parent b4eb273367 aaa6a43c70
commit c862d9cc7f
2 changed files with 3 additions and 2 deletions
--- a/app/views/admins/competition_settings/index.html.erb
+++ b/app/views/admins/competition_settings/index.html.erb
@ -486,4 +486,5 @@
      </div>
    </div>
  </div>
+  <div style="margin-bottom: 8.5rem;"></div>
 <% end %>
--- a/public/react/src/modules/competition/comcss/competition.css
+++ b/public/react/src/modules/competition/comcss/competition.css
@ -221,13 +221,13 @@
 .registbut111 p {
    width: 100%;
    height: 100%;
-    line-height: 41px;
+    line-height: 38px;
 }

 .registbut222 p {
    width: 100%;
    height: 100%;
-    line-height: 41px;
+    line-height: 38px;

 }