Merge pull request #16 from uclouvain/feature/OSIS-9091

[OSIS-9091] osis-comment migration BS5
uclouvain · May 6, 2024 · 6df2a38 · 6df2a38
2 parents c82b81c + 6dc18ee
commit 6df2a38
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/frontend/CommentThread.vue b/frontend/CommentThread.vue
@@ -26,16 +26,16 @@
 
 <template>
   <div
-      class="comment-thread panel"
-      :class="`panel-${panelClass}`"
+      class="comment-thread panel border border-primary mb-4 rounded-top d-flex flex-column"
+      :class="`panel-${panelClass} card-${panelClass}`"
   >
-    <div class="panel-heading clearfix">
+    <div class="panel-heading clearfix bg-primary text-white">
       {{ headerTitle || $t('thread.title') }}
       <template v-if="total != null">
         ({{ total }})
       </template>
       <button
-          class="btn btn-default btn-sm pull-right"
+          class="btn btn-default p-2 px-3 btn-sm pull-right float-end"
           @click="changeSort()"
       >
         {{ $t('thread.sort') }}
@@ -51,7 +51,7 @@
     />
     <div
         v-else-if="error"
-        class="panel-body text-danger"
+        class="panel-body card-body pb-0 text-danger"
     >
       {{ error }}
     </div>
@@ -66,7 +66,7 @@
     />
     <div
         v-if="nextPage || previousPage || createUrl"
-        class="panel-body"
+        class="panel-body card-body pb-3"
     >
       <button
           v-if="previousPage"
@@ -87,7 +87,7 @@
       <template v-if="createUrl">
         <button
             v-if="!isAdding"
-            class="btn btn-sm btn-primary pull-right"
+            class="btn btn-sm p-2 btn-primary pull-right float-end fs-7"
             @click="isAdding = !isAdding"
         >
           <i class="fas fa-plus" />

diff --git a/frontend/components/CommentEditor.vue b/frontend/components/CommentEditor.vue
@@ -36,15 +36,15 @@
         v-model="value"
         :config="richTextConfig"
     />
-    <div class="text-right btn-actions">
+    <div class="text-right text-end btn-actions">
       <button
-          class="btn btn-sm btn-primary"
+          class="btn btn-sm p-2 btn-primary fs-7"
           @click="$emit('submit', value)"
       >
         {{ $t('entry.save_comment') }}
       </button>
       <button
-          class="btn btn-sm btn-default"
+          class="btn btn-sm p-2 btn-default fs-7"
           @click="$emit('cancel')"
       >
         {{ $t('entry.cancel_edit') }}

diff --git a/frontend/components/CommentEntry.vue b/frontend/components/CommentEntry.vue
@@ -25,7 +25,7 @@
   -->
 
 <template>
-  <div class="panel-body clearfix">
+  <div class="panel-body card-body pb-0 clearfix">
     <div class="comment-authoring">
       <strong>{{ entry.author || $t('entry.anonymous') }}</strong>
       {{
@@ -36,27 +36,27 @@
       }}
     </div>
     <template v-if="!isEditing">
-      <div class="pull-right comment-actions">
+      <div class="pull-right float-end comment-actions">
         <button
             v-if="typeof entry.links.edit === 'string'"
             class="btn btn-sm btn-primary"
             :title="$t('entry.edit_comment')"
             @click="isEditing = true"
         >
-          <i class="fas fa-pencil" />
+          <i class="fas fa-pencil fs-6" />
         </button>
         <button
             v-if="typeof entry.links.delete === 'string'"
             class="btn btn-sm btn-danger"
             :title="$t('entry.delete_comment')"
             @click="$emit('delete', entry.links.delete)"
         >
-          <i class="fas fa-times" />
+          <i class="fas fa-times fs-6" />
         </button>
       </div>
       <div
           v-if="!richTextConfig"
-          class="comment-content"
+          class="comment-content pb-0"
       >
         <!-- eslint-disable vue/no-v-html -->
         <p v-html="entry.comment.replace(/\n/g, '<br/>')" />