apply to new changes

jplag · Nov 30, 2023 · aa5baa2 · aa5baa2
1 parent 00b5ff3
commit aa5baa2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/report-viewer/src/components/TextInformation.vue b/report-viewer/src/components/TextInformation.vue
@@ -2,7 +2,7 @@
   A container displaying simple text information
 -->
 <template>
-  <div class="flex-auto">
+  <div class="flex-auto print:flex-none">
     <ToolTipComponent direction="bottom">
       <template #default>
         {{ label }}:

diff --git a/report-viewer/src/components/fileDisplaying/FilesContainer.vue b/report-viewer/src/components/fileDisplaying/FilesContainer.vue
@@ -8,7 +8,7 @@
         Files of
         {{ fileOwnerDisplayName }}:
       </h3>
-      <Button @click="collapseAll()" class="space-x-2"
+      <Button @click="collapseAll()" class="space-x-2 print:hidden"
         ><FontAwesomeIcon :icon="['fas', 'compress-alt']" />
         <p>Collapse All</p></Button
       >

diff --git a/report-viewer/src/components/fileDisplaying/MatchList.vue b/report-viewer/src/components/fileDisplaying/MatchList.vue
@@ -28,6 +28,7 @@
       />
     </div>
   </div>
+
   <div class="hidden print:block">
     <table>
       <tr>
@@ -40,7 +41,7 @@
       <tr
         v-for="[index, match] in matches?.entries()"
         v-bind:key="index"
-        :style="{ background: match.color }"
+        :style="{ background: getMatchColor(0.3, match.colorIndex) }"
         class="print-excact"
       >
         <td class="px-2">{{ getFileName(match.firstFile) }}</td>

diff --git a/report-viewer/src/views/OverviewView.vue b/report-viewer/src/views/OverviewView.vue
@@ -6,7 +6,9 @@
     <div class="relative left-0 right-0 top-0 flex space-x-5 p-5 pb-0">
       <Container class="flex-grow">
         <h2>JPlag Report</h2>
-        <div class="flex flex-row items-center space-x-5 print:flex-col">
+        <div
+          class="flex flex-row items-center space-x-5 print:flex-col print:items-start print:space-x-0"
+        >
           <TextInformation label="Submission Directory">{{ submissionPathValue }}</TextInformation>
           <TextInformation label="Total Submissions">{{
             store().getSubmissionIds.length
@@ -68,15 +70,15 @@
       class="relative bottom-0 left-0 right-0 flex flex-grow space-x-5 p-5 pt-5 print:flex-col print:space-x-0 print:space-y-5"
     >
       <Container
-        class="flex max-h-0 min-h-full flex-1 flex-col print:max-h-none print:min-h-0 print:flex-none"
+        class="flex max-h-0 min-h-full flex-1 flex-col print:max-h-none print:min-h-fit print:flex-none"
       >
         <h2>Distribution of Comparisons:</h2>
         <DistributionDiagram
           :distribution="overview.distribution[store().uiState.distributionChartConfig.metric]"
           :x-scale="store().uiState.distributionChartConfig.xScale"
-          class="h-2/3 w-full"
+          class="h-2/3 w-full print:h-fit print:w-fit"
         />
-        <div class="flex flex-grow flex-col space-y-1">
+        <div class="flex flex-grow flex-col space-y-1 print:grow-0">
           <h3 class="text-lg underline">Options:</h3>
           <ScrollableComponent class="h-fit flex-grow">
             <MetricSelector