From 376a0121c53b62d6a1aee9f18070486fd6a2f69c Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 1 Nov 2019 18:48:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B-=E8=B6=85=E7=BA=A7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../javascripts/admins/competition_settings/index.js | 12 ++++++------
 .../stylesheets/admins/competition_settings.scss     | 12 ++++++------
 app/views/admins/competition_settings/index.html.erb | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/admins/competition_settings/index.js b/app/assets/javascripts/admins/competition_settings/index.js
index 1b0dc65b0..ec004063c 100644
--- a/app/assets/javascripts/admins/competition_settings/index.js
+++ b/app/assets/javascripts/admins/competition_settings/index.js
@@ -486,8 +486,8 @@ $(document).on('turbolinks:load', function(){
                     '                      <div class="col-6 no_padding ">\n' +
                     '                        <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
                     '                      </div></div>\n' +
-                    '                      <div class="row col-4"><span class="col-3 text-right mt-2 no_padding">成绩来源:</span>\n' +
-                    '                      <div class="col-7 no_padding ">\n' +
+                    '                      <div class="row col-3"><span class="col-4 text-right mt-2 no_padding">成绩来源:</span>\n' +
+                    '                      <div class="col-6 no_padding ">\n' +
                     '                        <select class="form-control" name="stage[][score_source]">\n' +
                     '                          <option value="0">经验值</option>\n' +
                     '                          <option value="1">预测准确率</option>\n' +
@@ -562,8 +562,8 @@ $(document).on('turbolinks:load', function(){
                 '                      <div class="col-6 no_padding ">\n' +
                 '                        <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
                 '                      </div></div>\n' +
-                '                      <div class="row col-4"><span class="col-3 mr10 text-right mt-2 no_padding">成绩来源:</span>\n' +
-                '                      <div class="col-7 no_padding ">\n' +
+                '                      <div class="row col-3"><span class="col-4 mr10 text-right mt-2 no_padding">成绩来源:</span>\n' +
+                '                      <div class="col-6 no_padding ">\n' +
                 '                        <select class="form-control" name="stage[][score_source]">\n' +
                 '                          <option value="0">经验值</option>\n' +
                 '                          <option value="1">预测准确率</option>\n' +
@@ -764,8 +764,8 @@ function addNewTab(competition_id) {
             '                      <div class="col-6 no_padding ">\n' +
             '                        <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
             '                      </div></div>\n' +
-            '                      <div class="row col-4"><span class="col-3 text-right mt-2 no_padding mr10">成绩来源:</span>\n' +
-            '                      <div class="col-7 no_padding ">\n' +
+            '                      <div class="row col-3"><span class="col-4 text-right mt-2 no_padding mr10">成绩来源:</span>\n' +
+            '                      <div class="col-6 no_padding ">\n' +
             '                        <select class="form-control" name="stage[][score_source]">\n' +
             '                          <option value="0">经验值</option>\n' +
             '                          <option value="1">预测准确率</option>\n' +
diff --git a/app/assets/stylesheets/admins/competition_settings.scss b/app/assets/stylesheets/admins/competition_settings.scss
index 481a2d9b0..695f8393e 100644
--- a/app/assets/stylesheets/admins/competition_settings.scss
+++ b/app/assets/stylesheets/admins/competition_settings.scss
@@ -101,16 +101,16 @@
       max-width: 25%;
     }
     .task_Input_div:nth-child(3n){
-      flex: 0 0 33.3%;
-      max-width: 33.3%;
-    }
-    .task_Input_div:nth-child(3n) > span.col-4{
       flex: 0 0 25%;
       max-width: 25%;
     }
+    .task_Input_div:nth-child(3n) > span.col-4{
+      flex: 0 0 33.3%;
+      max-width: 33.3%;
+    }
     .task_Input_div:nth-child(3n) > div.col-6{
-      flex: 0 0 58.3%;
-      max-width: 58.3%;
+      flex: 0 0 50%;
+      max-width: 50%;
     }
   }
 }
\ No newline at end of file
diff --git a/app/views/admins/competition_settings/index.html.erb b/app/views/admins/competition_settings/index.html.erb
index 9d929f024..8547c5a8b 100644
--- a/app/views/admins/competition_settings/index.html.erb
+++ b/app/views/admins/competition_settings/index.html.erb
@@ -395,9 +395,9 @@
                               <input type="number" class="form-control task_all" value="<%= section.entry %>" onchange="change_total(this)" name="stage[][entry]"/>
                             </div>
                           </div>
-                          <div class="row col-4">
-                            <span class="col-3 text-right mt-2 no_padding mr10">成绩来源:</span>
-                            <div class="col-7 no_padding">
+                          <div class="row col-3">
+                            <span class="col-4 text-right mt-2 no_padding mr10">成绩来源:</span>
+                            <div class="col-6 no_padding">
                               <select class="form-control" name="stage[][score_source]">
                                 <option value="0" <%= section.score_source == 0 ? "selected='selected'" : "" %>>经验值</option>
                                 <option value="1" <%= section.score_source == 1 ? "selected='selected'" : "" %>>预测准确率</option>
@@ -465,9 +465,9 @@
                           <input type="number" class="form-control task_all" onchange="change_total(this)" value="3" name="stage[][entry]"/>
                         </div>
                       </div>
-                      <div class="row col-4">
-                        <span class="col-3 text-right mt-2 no_padding mr10">成绩来源:</span>
-                        <div class="col-7 no_padding">
+                      <div class="row col-3">
+                        <span class="col-4 text-right mt-2 no_padding mr10">成绩来源:</span>
+                        <div class="col-6 no_padding">
                           <select class="form-control" name="stage[][score_source]">
                             <option value="0">经验值</option>
                             <option value="1">预测准确率</option>