From 11274585f687a32b85692cf3c7979a688c8d5592 Mon Sep 17 00:00:00 2001
From: BOTAlex <zhentao2004@gmail.com>
Date: Wed, 28 May 2025 20:29:57 +0200
Subject: [PATCH] sync

---
 src/routes/zhen/cv/CompsRev3/Education.svelte | 83 +++++++++----------
 .../zhen/cv/CompsRev3/IconAndText2.svelte     | 68 +++++++--------
 src/routes/zhen/cv/rev3/+page.svelte          |  2 +-
 3 files changed, 73 insertions(+), 80 deletions(-)

diff --git a/src/routes/zhen/cv/CompsRev3/Education.svelte b/src/routes/zhen/cv/CompsRev3/Education.svelte
index e3cbc89..fbe79a9 100644
--- a/src/routes/zhen/cv/CompsRev3/Education.svelte
+++ b/src/routes/zhen/cv/CompsRev3/Education.svelte
@@ -1,56 +1,47 @@
 <script>
-    import placeholder from "$lib/zhen/cv-comps/400x400.png"
-    import DTU_Logo from "$lib/zhen/cv-comps/DTU_Logo.png"
-    import NextLogo from "$lib/zhen/cv-comps/nextKbhLogo.png"
-    import SasLogo from "$lib/zhen/cv-comps/SASLogo.png"
-    import EmphasysLogo from "$lib/zhen/cv-comps/EmphasysLogo.png"
+  import placeholder from "$lib/zhen/cv-comps/400x400.png";
+  import DTU_Logo from "$lib/zhen/cv-comps/DTU_Logo.png";
+  import NextLogo from "$lib/zhen/cv-comps/nextKbhLogo.png";
+  import SasLogo from "$lib/zhen/cv-comps/SASLogo.png";
+  import EmphasysLogo from "$lib/zhen/cv-comps/EmphasysLogo.png";
 
-    import IconAndText2 from "./IconAndText2.svelte"
+  import IconAndText2 from "./IconAndText2.svelte";
 </script>
 
 <div class="container">
-    <div>
-        <b style="text-align:left;">
-            Education
-        </b>
-    </div>
-    <div class="imagesContainer flex justify-center p-2 gap-4" id="balls">
-        <IconAndText2 logo={DTU_Logo}>
-            <b>DTU</b><br/>
-            <p style="font-size: 0.6rem;">
-                Artificial intelligence
-            </p>
-        </IconAndText2>
-        <IconAndText2 logo={NextLogo}>
-            <b>Next</b><br/>
-            <p style="font-size: 0.6rem;">
-                Computer science
-            </p>
-        </IconAndText2>
-        <IconAndText2 logo={SasLogo}>
-            <b>Master class</b><br/>
-            <p style="font-size: 0.6rem;">
-                SAS Programming
-            </p>
-        </IconAndText2>
-        <IconAndText2 logo={EmphasysLogo}>
-            <b>Emphasys center</b><br/>
-            <p style="font-size: 0.6rem;">
-                VR development
-            </p>
-        </IconAndText2>
-    </div>
+  <div>
+    <b style="text-align:left;"> Education </b>
+  </div>
+  <div class="imagesContainer flex justify-center p-2 gap-4" id="balls">
+    <IconAndText2 logo={DTU_Logo}>
+      <b>DTU</b><br />
+      <p style="font-size: 0.5rem;">Artificial intelligence</p>
+    </IconAndText2>
+    <IconAndText2 logo={NextLogo}>
+      <b>Next</b><br />
+      <p style="font-size: 0.5rem;">Computer science</p>
+    </IconAndText2>
+    <IconAndText2 logo={SasLogo}>
+      <b>Master class</b><br />
+      <p style="font-size: 0.5rem;">SAS Programming</p>
+    </IconAndText2>
+    <IconAndText2 logo={EmphasysLogo}>
+      <b>Emphasys center</b><br />
+      <p style="font-size: 0.5rem;">VR development</p>
+    </IconAndText2>
+  </div>
 </div>
 
 <style lang="scss">
-    .container{
-        display: grid;
-        place-items: center;
-        width: 90%;
+  .container {
+    display: grid;
+    place-items: center;
+    width: 90%;
 
-        > div:first-child {
-            border-bottom: black 1mm solid;
-            width: 100%;
-        }
+    > div:first-child {
+      border-bottom: black 1mm solid;
+      width: 100%;
     }
-</style>
\ No newline at end of file
+  }
+</style>
+
diff --git a/src/routes/zhen/cv/CompsRev3/IconAndText2.svelte b/src/routes/zhen/cv/CompsRev3/IconAndText2.svelte
index 5c6fad3..f390cea 100644
--- a/src/routes/zhen/cv/CompsRev3/IconAndText2.svelte
+++ b/src/routes/zhen/cv/CompsRev3/IconAndText2.svelte
@@ -1,44 +1,46 @@
 <script lang="ts">
-    export let logo:string;
-    export let logoWidths: string = "35%";
-    
-    export let fontSize: string = "3mm";
-    export let lineHeight: string = "3.1mm";
+  export let logo: string;
+  export let logoWidths: string = "35%";
 
-    import { onMount } from "svelte";
-    onMount(() => {
-        imageCaption = logo.split(/(\\|\/)/g).pop();
-    });
+  export let fontSize: string = "3mm";
+  export let lineHeight: string = "3.1mm";
 
-    let imageCaption: undefined | string; // Not a high piority, you get the file name and thats it
+  import { onMount } from "svelte";
+  onMount(() => {
+    imageCaption = logo.split(/(\\|\/)/g).pop();
+  });
+
+  let imageCaption: undefined | string; // Not a high piority, you get the file name and thats it
 </script>
 
-<div class="container">
-    <img src={logo} alt="{imageCaption}" width="{logoWidths}"/>
-    <div style="line-height: {lineHeight};">
-        <span style="font-size: {fontSize};">
-            <slot/>
-        </span>
-    </div>
+<div class="container flex">
+  <img
+    src={logo}
+    class="mr-2 w-6 h-6 object-contain"
+    alt={imageCaption}
+    width={logoWidths}
+  />
+  <div style="line-height: {lineHeight};">
+    <span class="inline" style="font-size: {fontSize};">
+      <slot />
+    </span>
+  </div>
 </div>
 
 <style lang="scss">
-    .container {
-        width: 100%;
+  .container {
+    width: 100%;
 
-        & > div {
-            margin-top: 2mm;
-            padding-left: 2mm;
-            padding-bottom: 1mm;
+    & > div {
+      text-align: start;
 
-            text-align: start;
-
-            border-left: 0.5mm solid black;
-        }
-
-        & > img {
-            border-radius: 2.5mm;
-            filter: drop-shadow(1mm 1mm 1mm #0000009d);
-        }
+      border-left: 0.5mm solid black;
     }
-</style>
\ No newline at end of file
+
+    & > img {
+      border-radius: 2.5mm;
+      filter: drop-shadow(1mm 1mm 1mm #0000009d);
+    }
+  }
+</style>
+
diff --git a/src/routes/zhen/cv/rev3/+page.svelte b/src/routes/zhen/cv/rev3/+page.svelte
index 61eb93e..2003492 100644
--- a/src/routes/zhen/cv/rev3/+page.svelte
+++ b/src/routes/zhen/cv/rev3/+page.svelte
@@ -206,7 +206,7 @@
         padding-bottom: 30mm;
 
         // Disable interactivity for padding
-        pointer-events: none;
+        // pointer-events: none;
       }
     }
   }