Merge branch 'xjhdraft' into 'main'

hardware,engineering

See merge request !159

app.vue

@@ -51,6 +51,49 @@ axios.get('https://2023.igem.wiki/peking/education')
   text-shadow: none;
 }
 
+::-moz-scrollbar {
+
+  width: 5px;
+
+  height: 5px;
+
+  background: #fefefd;
+  border-radius: 10px;
+  
+}
+
+
+
+::-moz-scrollbar-track {
+
+  background: #fefdfd;
+border-radius: 10px;
+}
+
+
+
+::-moz-scrollbar-thumb {
+
+  background: rgb(139 0 18);
+  border-radius: 10px;
+}
+
+
+
+::-moz-scrollbar-thumb:hover {
+
+  background: rgb(139 0 18);
+
+}
+
+
+
+::-moz-scrollbar:hover {
+
+  width: 10px;
+  height: 10px;
+
+}
 
  /* 滚动条样式 */
 

components/collabsider.vue

@@ -87,6 +87,16 @@
   </script>
   
   <style scoped>
+  @font-face {
+    font-family: 'saf-regular';
+    src: url('https://static.igem.wiki/teams/4713/wiki/fonts/saf-regular.ttf'); 
+    font-weight: normal;
+    font-style: normal;
+  }
+  
+  *{
+    font-family: 'saf-regular';
+  }
   div#myDiv ul li a.active {
     color: #8B0012;
   }

components/descriptionSider.vue

@@ -58,6 +58,16 @@ function setActive(link,li) {
 </script>
 
 <style scoped>
+@font-face {
+  font-family: 'saf-regular';
+  src: url('https://static.igem.wiki/teams/4713/wiki/fonts/saf-regular.ttf'); 
+  font-weight: normal;
+  font-style: normal;
+}
+
+*{
+  font-family: 'saf-regular';
+}
 div#myDiv ul li a.active {
     color: #8B0012;
   }

components/header.vue

@@ -186,8 +186,8 @@ function addActive(n: number) {
 <style scoped>
 
 @font-face {
-  font-family: 'kalam-bold';
-  src: url('https://static.igem.wiki/teams/4713/wiki/fonts/kalam-bold.ttf'); 
+  font-family: 'saf-regular';
+  src: url('https://static.igem.wiki/teams/4713/wiki/fonts/saf-regular.ttf'); 
   font-weight: normal;
   font-style: normal;
 }
@@ -210,7 +210,7 @@ function addActive(n: number) {
 
 #mainList {
   counter-reset: li;
-  font-family: 'kalam-bold';
+  font-family: 'saf-regular';
 }
 
 #mainList li::before {
@@ -251,7 +251,7 @@ ul#subList {
 #subList li {
   cursor: pointer;
   width: fit-content;
-  font-family: 'kalam-bold';
+  font-family: 'saf-regular';
 }
 
 #mainList li h1 {

components/hpsider.vue

@@ -89,6 +89,16 @@ onMounted(() => {
 </script>
 
 <style scoped>
+@font-face {
+  font-family: 'saf-regular';
+  src: url('https://static.igem.wiki/teams/4713/wiki/fonts/saf-regular.ttf'); 
+  font-weight: normal;
+  font-style: normal;
+}
+
+*{
+  font-family: 'saf-regular';
+}
 div#myDiv ul li a.active {
   color: #8B0012;
 }

components/mapSider.vue

@@ -102,6 +102,16 @@
   </script>
   
   <style scoped>
+  @font-face {
+    font-family: 'saf-regular';
+    src: url('https://static.igem.wiki/teams/4713/wiki/fonts/saf-regular.ttf'); 
+    font-weight: normal;
+    font-style: normal;
+  }
+  
+  *{
+    font-family: 'saf-regular';
+  }
   div#myDiv ul li a.active {
     color: #8B0012;
   }

components/sider.vue

 <template>
   <div id="myDiv"
-    class="transition-all duration-500 font-medium scale-50 lg:scale-100 mt-[32px] mr-3 lg:mr-[16px] mb-[0px] ml-[4vw] uppercase sticky top-[40%] min-w-[220px] max-w-[350px] ">
+    class=" transition-all duration-500 font-medium scale-50 lg:scale-100 mt-[32px] mr-3 lg:mr-[16px] mb-[0px] ml-[4vw] uppercase sticky top-[40%] min-w-[220px] max-w-[350px] ">
     <h1 class="font-light">{{ page?.title }}</h1>
 
-    <ul class="font-extralight">
+    <ul class="overflow-scroll h-[300px]  font-extralight">
       <li @mouseenter="toggleMouse(index)" v-for="(e, index) in toc?.links">
         <div class=" flex cursor-pointer items-center mt-6">
           <div
@@ -23,9 +23,9 @@
           </li>
 
         </ul>
-      </li><img alt="sider" src="https://static.igem.wiki/teams/4713/wiki/sider2.png" />
+      </li>
     </ul>
-
+    <img alt="sider" src="https://static.igem.wiki/teams/4713/wiki/sider2.png" />
   </div>
 </template>
 <script setup lang="js">
@@ -90,6 +90,85 @@ onMounted(() => {
 </script>
 
 <style scoped>
+
+@font-face {
+  font-family: 'saf-regular';
+  src: url('https://static.igem.wiki/teams/4713/wiki/fonts/saf-regular.ttf'); 
+  font-weight: normal;
+  font-style: normal;
+}
+
+*{
+  font-family: 'saf-regular';
+}
+
+::-webkit-scrollbar {
+
+  width: 5px;
+
+  height: 5px;
+
+  background: rgb(250,251,240);
+  border-radius: 10px;
+  
+}
+
+::-moz-scrollbar {
+
+  width: 5px;
+
+  height: 5px;
+
+  background: rgb(250,251,240);
+  border-radius: 10px;
+  
+}
+
+::-webkit-scrollbar-track {
+
+  background: rgb(250,251,240);
+border-radius: 10px;
+}
+
+
+
+::-webkit-scrollbar-thumb {
+
+  background: rgb(139 0 18);
+  border-radius: 10px;
+}
+
+
+
+::-webkit-scrollbar {
+
+  width: 5px;
+
+  height: 5px;
+
+  background: rgb(250,251,240);
+  border-radius: 10px;
+  
+}
+
+
+
+::-moz-scrollbar-track {
+
+  background: rgb(250,251,240);
+border-radius: 10px;
+}
+
+
+
+::-moz-scrollbar-thumb {
+
+  background: rgb(139 0 18);
+  border-radius: 10px;
+}
+
+
+
 div#myDiv ul li a.active {
   color: #8B0012;
 }