🔥 Remove dupe headings

KIRAKIRA-DOUGA · May 10, 2024 · bb138cc · bb138cc
1 parent ce07f8b
commit bb138cc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 27 deletions.
diff --git a/pages/history.vue b/pages/history.vue
@@ -4,9 +4,6 @@
 
 <template>
 	<div class="container">
-		<ShadingIcon icon="history" position="right top" />
-		<HeadingGroup :name="t.history" englishName="History" />
-
 		<div class="wrapper">
 			<div class="line"></div>
 			<section>
@@ -48,19 +45,15 @@
 	$line-size: 6px;
 	$ball-size: 24px;
 
-	header {
-		margin-bottom: 1rem;
-	}
-
 	.container {
 		position: relative;
 	}
 
 	.line {
-		@include oval;
+		@include oval(top);
 		position: absolute;
-		top: 100px;
-		bottom: -$line-size;
+		top: 38px;
+		bottom: 0;
 		width: $line-size;
 		background-color: c(accent);
 
@@ -118,9 +111,9 @@
 				&.today::after {
 					@include square(100%);
 					@include circle;
+					content: "";
 					display: block;
 					background-color: c(accent);
-					content: "";
 					scale: 0.5;
 				}
 			}

diff --git a/pages/search.vue b/pages/search.vue
@@ -107,9 +107,6 @@
 
 <template>
 	<div class="container">
-		<ShadingIcon icon="search" position="right top" />
-		<HeadingGroup :name="t.search" englishName="Search" />
-
 		<div class="card-container">
 			<div class="center">
 				<ThumbGrid :view>
@@ -167,10 +164,6 @@
 </template>
 
 <style scoped lang="scss">
-	header {
-		margin-bottom: 1rem;
-	}
-
 	.card-container {
 		display: flex;
 		gap: 16px;

diff --git a/pages/upload.vue b/pages/upload.vue
@@ -83,8 +83,8 @@
 
 <template>
 	<div class="container" :class="{ 'no-scroll': !showEditor }">
-		<ShadingIcon icon="upload" position="right top" />
-		<HeadingGroup :name="t.upload" englishName="Upload" :class="{ clickable: showEditor }" @click="cancelUpdate" />
+		<!-- TODO: 临时 SoftButton，之后请在 UploadEditor 的 Submit 按钮左边放一个取消。 -->
+		<SoftButton icon="close" v-if="showEditor" @click="cancelUpdate" />
 		<input
 			ref="fileInput"
 			hidden
@@ -128,11 +128,7 @@
 	.container {
 		display: flex;
 		flex-direction: column;
-		height: 100dvh;
-	}
-
-	.clickable {
-		cursor: pointer !important;
+		height: calc(100dvh - $banner-height);
 	}
 
 	@property --rotation {
@@ -224,13 +220,13 @@
 		}
 
 		50% {
-			scale: 1;
 			translate: 0;
+			scale: 1;
 		}
 
 		100% {
-			scale: 1;
 			translate: 0 calc((-100% - $box-height) / 2);
+			scale: 1;
 		}
 	}
 </style>