Merge pull request '移除神必谷歌字体' (#5) from uNagi/carrotskin:main into main

Reviewed-on: #5
This commit was merged in pull request #5.
This commit is contained in:
2026-01-19 21:23:40 +08:00
3 changed files with 54 additions and 48 deletions

View File

@@ -1,4 +1,3 @@
@import url('https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap');
@import "tailwindcss";
/* @tailwind base;
@tailwind components;
@@ -7,7 +6,8 @@
:root {
--background: #ffffff;
--foreground: #171717;
--navbar-height: 64px; /* 与pt-16对应 */
--navbar-height: 64px;
/* 与pt-16对应 */
--primary-orange: #f97316;
--primary-orange-dark: #ea580c;
--transition-fast: 150ms cubic-bezier(0.4, 0, 0.2, 1);
@@ -25,7 +25,7 @@
body {
color: var(--foreground);
background: var(--background);
font-family: 'Inter', Arial, Helvetica, sans-serif;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif;
scroll-behavior: smooth;
}
@@ -159,6 +159,7 @@ body {
/* 现代布局解决方案 */
@layer utilities {
/* 全屏减去navbar高度 */
.h-screen-nav {
height: calc(100vh - var(--navbar-height));
@@ -259,18 +260,23 @@ body {
0% {
background-position: 0% 50%;
}
50% {
background-position: 100% 50%;
}
100% {
background-position: 0% 50%;
}
}
@keyframes float {
0%, 100% {
0%,
100% {
transform: translateY(0px);
}
50% {
transform: translateY(-10px);
}
@@ -280,6 +286,7 @@ body {
0% {
background-position: -200% 0;
}
100% {
background-position: 200% 0;
}
@@ -290,6 +297,7 @@ body {
transform: translateY(30px);
opacity: 0;
}
to {
transform: translateY(0);
opacity: 1;
@@ -301,6 +309,7 @@ body {
transform: translateY(-30px);
opacity: 0;
}
to {
transform: translateY(0);
opacity: 1;
@@ -312,6 +321,7 @@ body {
transform: translateX(-30px);
opacity: 0;
}
to {
transform: translateX(0);
opacity: 1;
@@ -323,6 +333,7 @@ body {
transform: translateX(30px);
opacity: 0;
}
to {
transform: translateX(0);
opacity: 1;
@@ -334,6 +345,7 @@ body {
transform: scale(0.9);
opacity: 0;
}
to {
transform: scale(1);
opacity: 1;
@@ -345,6 +357,7 @@ body {
transform: scale(1);
opacity: 1;
}
to {
transform: scale(0.9);
opacity: 0;
@@ -378,23 +391,19 @@ body {
/* 加载状态样式 */
.loading-shimmer {
background: linear-gradient(
90deg,
#f0f0f0 0%,
#e0e0e0 50%,
#f0f0f0 100%
);
background: linear-gradient(90deg,
#f0f0f0 0%,
#e0e0e0 50%,
#f0f0f0 100%);
background-size: 200% 100%;
animation: shimmer 1.5s infinite;
}
.dark .loading-shimmer {
background: linear-gradient(
90deg,
#374151 0%,
#4b5563 50%,
#374151 100%
);
background: linear-gradient(90deg,
#374151 0%,
#4b5563 50%,
#374151 100%);
background-size: 200% 100%;
animation: shimmer 1.5s infinite;
}
@@ -426,7 +435,10 @@ body {
/* 响应式动效 */
@media (prefers-reduced-motion: reduce) {
*, *::before, *::after {
*,
*::before,
*::after {
animation-duration: 0.01ms !important;
animation-iteration-count: 1 !important;
transition-duration: 0.01ms !important;
@@ -435,6 +447,7 @@ body {
/* 触摸设备优化 */
@media (hover: none) and (pointer: coarse) {
.btn-carrot:hover,
.btn-carrot-outline:hover,
.card-minecraft:hover {

View File

@@ -1,5 +1,4 @@
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import "./globals.css";
import Navbar from "@/components/Navbar";
import { AuthProvider } from "@/contexts/AuthContext";
@@ -9,12 +8,6 @@ import { ErrorNotificationContainer } from "@/components/ErrorNotification";
import ScrollToTop from "@/components/ScrollToTop";
import PageTransition from "@/components/PageTransition";
const inter = Inter({
subsets: ["latin"],
weight: ['100', '200', '300', '400', '500', '600', '700', '800', '900'],
display: 'swap',
});
export const metadata: Metadata = {
title: "CarrotSkin - 现代化Minecraft Yggdrasil皮肤站",
description: "新一代Minecraft Yggdrasil皮肤站为创作者打造的现代化皮肤管理平台",
@@ -34,7 +27,7 @@ export default function RootLayout({
}>) {
return (
<html lang="zh-CN">
<body className={inter.className}>
<body>
<AuthProvider>
<Navbar />
<PageTransition>

View File

@@ -32,7 +32,7 @@ const config: Config = {
},
fontFamily: {
'minecraft': ['Minecraft', 'monospace'],
'sans': ['Inter', 'system-ui', 'sans-serif'],
'sans': ['-apple-system', 'BlinkMacSystemFont', 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', 'Helvetica', 'Arial', 'sans-serif'],
},
animation: {
'float': 'float 3s ease-in-out infinite',