Merge pull request #78 from Kyutech-C3/develop

v0.2.1
Kyutech-C3 · Nov 30, 2022 · 6fde226 · 6fde226
2 parents 5d57c97 + fc15c08
commit 6fde226
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 16 deletions.
diff --git a/assets/css/theme.css b/assets/css/theme.css
@@ -14,6 +14,6 @@
   --base-light-text-color: #ffffff;
   --hover-base-text-color: #4b5563;
   --light-bg-color: #9ca3af;
-  --base-button-color: #fed7aa;
-  --hover-base-button-color: #fdba74;
+  --base-button-color: #aac6fe;
+  --hover-base-button-color: #74a6fd;
 }
diff --git a/components/commons/TagSelecter.vue b/components/commons/TagSelecter.vue
@@ -80,7 +80,7 @@
             px-5
             py-0.5
           "
-          :class="{ 'bg-orange-300': selectingSuggest === index }"
+          :class="{ 'bg-hover-base-button-color': selectingSuggest === index }"
           @click="suggestSelectByClick(index)"
         >
           <span>{{ suggestTag.name }}</span>

diff --git a/components/works/form/FormSubmitButton.vue b/components/works/form/FormSubmitButton.vue
@@ -3,8 +3,8 @@
     <button
       class="
         rounded-tl-lg rounded-bl-lg
-        border-2 border-yellow-500
-        text-yellow-500
+        border-2 border-hover-base-button-color
+        text-hover-base-button-color
         transition-colors
         px-4
         py-2.5
@@ -21,8 +21,8 @@
     <div
       class="
         rounded-tr-lg rounded-br-lg
-        border-2 border-yellow-500
-        bg-yellow-500
+        border-2 border-hover-base-button-color
+        bg-hover-base-button-color
         text-gray-100
         transition-colors
         px-2
@@ -45,7 +45,7 @@
           bg-white
           px-5
           py-2
-          border-2 border-yellow-500
+          border-2 border-hover-base-button-color
         "
       >
         <ul class="z-10 relative w-max">
@@ -147,7 +147,7 @@ export default class FormSubmitButton extends Vue {
 }
 .balloon:after {
   bottom: -20px;
-  border-top: 10px solid #f59e0b;
+  border-top: 10px solid var(--hover-base-button-color);
   border-right: 10px solid transparent;
   border-left: 10px solid transparent;
   border-bottom: 10px solid transparent;

diff --git a/layouts/default.vue b/layouts/default.vue
@@ -1,9 +1,9 @@
 <template>
   <div
     class="overflow-x-hidden"
-    :class="[getFullscreen ? 'overflow-y-hidden svh-full' : 'vh-full']"
+    :class="{ 'overflow-y-hidden svh-full': getFullscreen }"
   >
-    <div class="h-full bg-bg-color w-[100vw] fixed top-0 left-0 -z-10">
+    <div class="vh-full bg-bg-color w-[100vw] fixed top-0 left-0 -z-10">
       <!-- container log (:particlesLoaded="particlesLoaded") -->
       <Particles
         v-if="useCustomTheme"

diff --git a/pages/index.vue b/pages/index.vue
@@ -99,7 +99,7 @@ export default class Index extends Vue {
   @Watch('scrollY')
   handleBottom() {
     if (this.workList) {
-      this.bottom = Math.floor(this.workList.scrollHeight * 0.9)
+      this.bottom = Math.floor(this.workList.clientHeight)
     }
     if (this.bottom <= this.scrollY) {
       if (!this.nextContentLoadProcessing && !this.isWorksEmpty) {
@@ -124,7 +124,7 @@ export default class Index extends Vue {
   }
 
   handleScroll() {
-    this.scrollY = window.scrollY
+    this.scrollY = window.scrollY + window.innerHeight - 450
   }
 
   async getNextContent() {

diff --git a/pages/works/_id/index.vue b/pages/works/_id/index.vue
@@ -43,7 +43,7 @@
           top-[150px]
           right-0
           w-44
-          bg-orange-200
+          bg-base-button-color
           z-50
           overflow-hidden
           text-gray-500
@@ -52,7 +52,14 @@
         "
       >
         <div
-          class="flex cursor-pointer z-50 py-5 px-5 hover:bg-orange-300"
+          class="
+            flex
+            cursor-pointer
+            z-50
+            py-5
+            px-5
+            hover:bg-hover-base-button-color
+          "
           @click="deleteCheckStatus = !deleteCheckStatus"
         >
           <font-awesome-icon
@@ -86,7 +93,7 @@
             z-50
             py-5
             px-5
-            hover:bg-orange-300
+            hover:bg-hover-base-button-color
             border-t-[0.5px] border-gray-400
           "
           @click="visibilityChangeStatus = !visibilityChangeStatus"