From a61e96c6580ba1fe432f29029fd063a35403c248 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, 29 Jun 2019 16:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A2=98=E7=9B=AE=E5=A4=9A?=
 =?UTF-8?q?=E8=A1=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_exercise_student.html.erb        | 4 ++--
 app/views/exercise/_exercise_student_result.html.erb | 4 ++--
 app/views/exercise/_show_MC.html.erb                 | 2 +-
 app/views/exercise/_show_MCQ.html.erb                | 2 +-
 app/views/exercise/student_exercise_list.html.erb    | 4 ++--
 public/stylesheets/educoder/edu-all.css              | 5 +++++
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/views/exercise/_exercise_student.html.erb b/app/views/exercise/_exercise_student.html.erb
index a63191db..6b5ecd5e 100644
--- a/app/views/exercise/_exercise_student.html.erb
+++ b/app/views/exercise/_exercise_student.html.erb
@@ -203,7 +203,7 @@
                 <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                   <div class="fl">
                     <%= convert_to_char((index + 1).to_s) %>
-                  </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                  </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                 </label>
               </li>
           <% end %>
@@ -250,7 +250,7 @@
                 <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                   <div class="fl">
                     <%= convert_to_char((index + 1).to_s) %>
-                  </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                  </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                 </label>
               </li>
             <% end %>
diff --git a/app/views/exercise/_exercise_student_result.html.erb b/app/views/exercise/_exercise_student_result.html.erb
index 8b6f7ab6..7b78e5fc 100644
--- a/app/views/exercise/_exercise_student_result.html.erb
+++ b/app/views/exercise/_exercise_student_result.html.erb
@@ -156,7 +156,7 @@
                 <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                   <div class="fl">
                     <%= convert_to_char((index + 1).to_s) %>
-                  </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                  </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                 </label>
               </li>
             <% end %>
@@ -175,7 +175,7 @@
                 <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                   <div class="fl">
                     <%= convert_to_char((index + 1).to_s) %>
-                  </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                  </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                 </label>
               </li>
             <% end %>
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index 1f74be73..64b1f128 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -23,7 +23,7 @@
           <label class="fl color-grey3" for="sx_<%= exercise_choice.id %>">
             <div class="fl">
               <%= convert_to_char((index+1).to_s)%>
-            </div><pre class="fl ml10"><%= exercise_choice.choice_text%></pre>
+            </div><xmp class="fl ml10"><%= exercise_choice.choice_text%></xmp>
           </label>
         </li>
     <% end %>
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index 57c36496..4e336e91 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -23,7 +23,7 @@
           <label class="fl color-grey3" for="dx_<%= exercise_choice.id %>">
             <div class="fl">
               <%= convert_to_char((index+1).to_s)%>
-            </div><pre class="fl ml10"><%= exercise_choice.choice_text%></pre>
+            </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text%></xmp>
           </label>
         </li>
     <% end %>
diff --git a/app/views/exercise/student_exercise_list.html.erb b/app/views/exercise/student_exercise_list.html.erb
index e6eddc40..6ca89738 100644
--- a/app/views/exercise/student_exercise_list.html.erb
+++ b/app/views/exercise/student_exercise_list.html.erb
@@ -271,7 +271,7 @@
                       <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                         <div class="fl">
                           <%= convert_to_char((index + 1).to_s) %>
-                        </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                        </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                       </label>
                     </div>
                   <% end %>
@@ -288,7 +288,7 @@
                       <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
                         <div class="fl">
                           <%= convert_to_char((index + 1).to_s) %>
-                        </div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
+                        </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
                       </label>
                     </div>
                   <% end %>
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 398cf669..b4500008 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -3414,4 +3414,9 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
 }
 .changebtn{
     width: 127px;font-size: 16px;height: 40px; line-height: 40px;
+}
+
+.xmplist{
+    margin-top:0px !important;
+    margin-bottom:0px !important;
 }
\ No newline at end of file