Merge pull request #764 from mitre/fixFormatting

mitre · Jan 14, 2021 · 6fde6b5 · 6fde6b5
2 parents 57206db + 6e6346c
commit 6fde6b5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/apps/frontend/src/components/cards/controltable/ControlRowCol.vue b/apps/frontend/src/components/cards/controltable/ControlRowCol.vue
@@ -23,8 +23,8 @@
       <v-divider />
       <!-- HTML is sanitized with sanitize-html -->
       <!-- eslint-disable vue/no-v-html -->
-      <pre
-        class="pa-2 mono text-justify"
+      <div
+        class="pa-2 mono pre-formatted"
         v-html="sanitize_html(result.code_desc.trim())"
       />
       <!-- eslint-enable vue/no-v-html -->
@@ -34,7 +34,7 @@
       <v-divider />
       <!-- eslint-disable vue/no-v-html -->
       <div
-        class="pa-2 mono text-justify"
+        class="pa-2 mono pre-formatted"
         v-html="sanitize_html(result.message.trim())"
       />
       <!-- eslint-enable vue/no-v-html -->
@@ -71,4 +71,8 @@ export default class ControlRowCol extends mixins(HtmlSanitizeMixin) {
 button.unclickable-button {
   pointer-events: none;
 }
+
+.pre-formatted {
+  white-space: pre-wrap;
+}
 </style>
diff --git a/apps/frontend/src/components/cards/controltable/ControlRowDetails.vue b/apps/frontend/src/components/cards/controltable/ControlRowDetails.vue
@@ -36,10 +36,7 @@
                   <v-col cols="12" :class="detail.class">
                     <h3>{{ detail.name }}:</h3>
                     <!-- eslint-disable vue/no-v-html -->
-                    <h4
-                      class="mono preserve-whitespace"
-                      v-html="sanitize_html(detail.value)"
-                    />
+                    <h4 class="mono" v-html="sanitize_html(detail.value)" />
                     <!-- eslint-enable vue/no-v-html -->
                   </v-col>
                   <v-divider />