Skip to content

Commit db0e34d

Browse files
wly-Liliewly-Lilie
committed
freetacman update
1 parent 8a0cb9c commit db0e34d

File tree

8 files changed

+212
-194
lines changed

8 files changed

+212
-194
lines changed

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
Please hang tight! Will be right back soon!
2-
3-
init - FreeTacMan -wly-sub
1+
Please hang tight! Will be right back soon!

‎app/(default)/(project)/FreeTacMan/globals.css‎

Lines changed: 192 additions & 154 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,121 @@
1-
@tailwind base;
2-
@tailwind components;
3-
@tailwind utilities;
1+
@import "tailwindcss";
2+
@import "tw-animate-css";
43

5-
@layer base {
6-
:root {
7-
--o-blue: #00a0e8;
8-
--o-light-blue: #53c2f0;
9-
--o-dark-blue: #0c318f;
10-
--mgray: #76777B;
11-
--radius: 0.625rem;
12-
--background: oklch(1 0 0);
13-
--foreground: #0d0d0d;
14-
--card: oklch(1 0 0);
15-
--card-foreground: oklch(0.145 0 0);
16-
--popover: oklch(1 0 0);
17-
--popover-foreground: oklch(0.145 0 0);
18-
--primary: oklch(0.205 0 0);
19-
--primary-foreground: oklch(0.985 0 0);
20-
--secondary: oklch(0.97 0 0);
21-
--secondary-foreground: oklch(0.205 0 0);
22-
--muted: oklch(0.97 0 0);
23-
--muted-foreground: oklch(0.556 0 0);
24-
--accent: oklch(0.97 0 0);
25-
--accent-foreground: oklch(0.205 0 0);
26-
--destructive: oklch(0.577 0.245 27.325);
27-
--border: oklch(0.922 0 0);
28-
--input: oklch(0.922 0 0);
29-
--ring: oklch(0.708 0 0);
30-
--chart-1: oklch(0.646 0.222 41.116);
31-
--chart-2: oklch(0.6 0.118 184.704);
32-
--chart-3: oklch(0.398 0.07 227.392);
33-
--chart-4: oklch(0.828 0.189 84.429);
34-
--chart-5: oklch(0.769 0.188 70.08);
35-
--sidebar: oklch(0.985 0 0);
36-
--sidebar-foreground: oklch(0.145 0 0);
37-
--sidebar-primary: oklch(0.205 0 0);
38-
--sidebar-primary-foreground: oklch(0.985 0 0);
39-
--sidebar-accent: oklch(0.97 0 0);
40-
--sidebar-accent-foreground: oklch(0.205 0 0);
41-
--sidebar-border: oklch(0.922 0 0);
42-
--sidebar-ring: oklch(0.708 0 0);
43-
}
4+
@custom-variant dark (&:is(.dark *));
445

45-
.dark {
46-
--background: #0d0d0d;
47-
--foreground: oklch(0.985 0 0);
48-
--card: oklch(0.205 0 0);
49-
--card-foreground: oklch(0.985 0 0);
50-
--popover: oklch(0.205 0 0);
51-
--popover-foreground: oklch(0.985 0 0);
52-
--primary: oklch(0.922 0 0);
53-
--primary-foreground: oklch(0.205 0 0);
54-
--secondary: oklch(0.269 0 0);
55-
--secondary-foreground: oklch(0.985 0 0);
56-
--muted: oklch(0.269 0 0);
57-
--muted-foreground: oklch(0.708 0 0);
58-
--accent: oklch(0.269 0 0);
59-
--accent-foreground: oklch(0.985 0 0);
60-
--destructive: oklch(0.704 0.191 22.216);
61-
--border: oklch(1 0 0 / 10%);
62-
--input: oklch(1 0 0 / 15%);
63-
--ring: oklch(0.556 0 0);
64-
--chart-1: oklch(0.488 0.243 264.376);
65-
--chart-2: oklch(0.696 0.17 162.48);
66-
--chart-3: oklch(0.769 0.188 70.08);
67-
--chart-4: oklch(0.627 0.265 303.9);
68-
--chart-5: oklch(0.645 0.246 16.439);
69-
--sidebar: oklch(0.205 0 0);
70-
--sidebar-foreground: oklch(0.985 0 0);
71-
--sidebar-primary: oklch(0.488 0.243 264.376);
72-
--sidebar-primary-foreground: oklch(0.985 0 0);
73-
--sidebar-accent: oklch(0.269 0 0);
74-
--sidebar-accent-foreground: oklch(0.985 0 0);
75-
--sidebar-border: oklch(1 0 0 / 10%);
76-
--sidebar-ring: oklch(0.556 0 0);
77-
}
6+
@theme inline {
7+
--color-background: var(--background);
8+
--color-foreground: var(--foreground);
9+
--color-sidebar-ring: var(--sidebar-ring);
10+
--color-sidebar-border: var(--sidebar-border);
11+
--color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
12+
--color-sidebar-accent: var(--sidebar-accent);
13+
--color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
14+
--color-sidebar-primary: var(--sidebar-primary);
15+
--color-sidebar-foreground: var(--sidebar-foreground);
16+
--color-sidebar: var(--sidebar);
17+
--color-chart-5: var(--chart-5);
18+
--color-chart-4: var(--chart-4);
19+
--color-chart-3: var(--chart-3);
20+
--color-chart-2: var(--chart-2);
21+
--color-chart-1: var(--chart-1);
22+
--color-ring: var(--ring);
23+
--color-input: var(--input);
24+
--color-border: var(--border);
25+
--color-destructive: var(--destructive);
26+
--color-accent-foreground: var(--accent-foreground);
27+
--color-accent: var(--accent);
28+
--color-muted-foreground: var(--muted-foreground);
29+
--color-muted: var(--muted);
30+
--color-secondary-foreground: var(--secondary-foreground);
31+
--color-secondary: var(--secondary);
32+
--color-primary-foreground: var(--primary-foreground);
33+
--color-primary: var(--primary);
34+
--color-popover-foreground: var(--popover-foreground);
35+
--color-popover: var(--popover);
36+
--color-card-foreground: var(--card-foreground);
37+
--color-card: var(--card);
38+
--radius-sm: calc(var(--radius) - 4px);
39+
--radius-md: calc(var(--radius) - 2px);
40+
--radius-lg: var(--radius);
41+
--radius-xl: calc(var(--radius) + 4px);
42+
}
43+
44+
:root {
45+
--o-blue: #00a0e8;
46+
--o-light-blue: #53c2f0;
47+
--o-dark-blue: #0c318f;
48+
--mgray: #76777B;
49+
--radius: 0.625rem;
50+
--background: oklch(1 0 0);
51+
--foreground: #0d0d0d;
52+
--card: oklch(1 0 0);
53+
--card-foreground: oklch(0.145 0 0);
54+
--popover: oklch(1 0 0);
55+
--popover-foreground: oklch(0.145 0 0);
56+
--primary: oklch(0.205 0 0);
57+
--primary-foreground: oklch(0.985 0 0);
58+
--secondary: oklch(0.97 0 0);
59+
--secondary-foreground: oklch(0.205 0 0);
60+
--muted: oklch(0.97 0 0);
61+
--muted-foreground: oklch(0.556 0 0);
62+
--accent: oklch(0.97 0 0);
63+
--accent-foreground: oklch(0.205 0 0);
64+
--destructive: oklch(0.577 0.245 27.325);
65+
--border: oklch(0.922 0 0);
66+
--input: oklch(0.922 0 0);
67+
--ring: oklch(0.708 0 0);
68+
--chart-1: oklch(0.646 0.222 41.116);
69+
--chart-2: oklch(0.6 0.118 184.704);
70+
--chart-3: oklch(0.398 0.07 227.392);
71+
--chart-4: oklch(0.828 0.189 84.429);
72+
--chart-5: oklch(0.769 0.188 70.08);
73+
--sidebar: oklch(0.985 0 0);
74+
--sidebar-foreground: oklch(0.145 0 0);
75+
--sidebar-primary: oklch(0.205 0 0);
76+
--sidebar-primary-foreground: oklch(0.985 0 0);
77+
--sidebar-accent: oklch(0.97 0 0);
78+
--sidebar-accent-foreground: oklch(0.205 0 0);
79+
--sidebar-border: oklch(0.922 0 0);
80+
--sidebar-ring: oklch(0.708 0 0);
81+
}
82+
83+
.dark {
84+
--background: #0d0d0d;
85+
--foreground: oklch(0.985 0 0);
86+
--card: oklch(0.205 0 0);
87+
--card-foreground: oklch(0.985 0 0);
88+
--popover: oklch(0.205 0 0);
89+
--popover-foreground: oklch(0.985 0 0);
90+
--primary: oklch(0.922 0 0);
91+
--primary-foreground: oklch(0.205 0 0);
92+
--secondary: oklch(0.269 0 0);
93+
--secondary-foreground: oklch(0.985 0 0);
94+
--muted: oklch(0.269 0 0);
95+
--muted-foreground: oklch(0.708 0 0);
96+
--accent: oklch(0.269 0 0);
97+
--accent-foreground: oklch(0.985 0 0);
98+
--destructive: oklch(0.704 0.191 22.216);
99+
--border: oklch(1 0 0 / 10%);
100+
--input: oklch(1 0 0 / 15%);
101+
--ring: oklch(0.556 0 0);
102+
--chart-1: oklch(0.488 0.243 264.376);
103+
--chart-2: oklch(0.696 0.17 162.48);
104+
--chart-3: oklch(0.769 0.188 70.08);
105+
--chart-4: oklch(0.627 0.265 303.9);
106+
--chart-5: oklch(0.645 0.246 16.439);
107+
--sidebar: oklch(0.205 0 0);
108+
--sidebar-foreground: oklch(0.985 0 0);
109+
--sidebar-primary: oklch(0.488 0.243 264.376);
110+
--sidebar-primary-foreground: oklch(0.985 0 0);
111+
--sidebar-accent: oklch(0.269 0 0);
112+
--sidebar-accent-foreground: oklch(0.985 0 0);
113+
--sidebar-border: oklch(1 0 0 / 10%);
114+
--sidebar-ring: oklch(0.556 0 0);
115+
}
116+
117+
@theme {
118+
--breakpoint-3xl: 120rem;
78119
}
79120

80121
@layer base {
@@ -91,99 +132,96 @@
91132
@apply transition delay-100 duration-200;
92133
}
93134
}
135+
.animated-underline {
136+
border-bottom: 1px solid transparent;
137+
@apply transition delay-100 duration-200;
138+
}
139+
.animated-underline:hover {
140+
@apply border-b-inherit;
141+
}
142+
.loading {
143+
@apply bg-gradient-to-br from-[#FF668C] via-[#FF668C] to-[#FF668C];
144+
}
145+
.color-text-1 {
146+
width: fit-content;
147+
background-image: linear-gradient(to right, #ff668c, #ff7b00, #8e73e6);
148+
-webkit-background-clip: text;
149+
color: transparent;
150+
}
94151

95-
@layer components {
96-
.animated-underline {
97-
border-bottom: 1px solid transparent;
98-
@apply transition delay-100 duration-200;
99-
}
100-
.animated-underline:hover {
101-
@apply border-b-inherit;
102-
}
103-
.loading {
104-
@apply bg-gradient-to-br from-[#FF668C] via-[#FF668C] to-[#FF668C];
105-
}
106-
.color-text-1 {
107-
width: fit-content;
108-
background-image: linear-gradient(to right, #ff668c, #ff7b00, #8e73e6);
109-
-webkit-background-clip: text;
110-
color: transparent;
111-
}
112-
113-
.fade-in {
114-
transition: opacity 1.5s ease;
115-
}
116-
117-
.fade-out {
118-
opacity: 0;
119-
transition: opacity 1.5s ease;
120-
}
152+
.fade-in {
153+
transition: opacity 1.5s ease;
154+
}
121155

122-
.flex-dings {
123-
display: flex;
124-
flex-direction: row;
125-
align-items: center;
126-
justify-content: space-evenly;
127-
margin-bottom: 20px;
128-
}
156+
.fade-out {
157+
opacity: 0;
158+
transition: opacity 1.5s ease;
159+
}
129160

130-
svg {
131-
width: 1rem;
132-
height: 1rem;
133-
}
161+
.flex-dings {
162+
display: flex;
163+
flex-direction: row;
164+
align-items: center;
165+
justify-content: space-evenly;
166+
margin-bottom: 20px;
167+
}
134168

135-
video {
136-
transform: scale(0.8);
137-
}
169+
svg {
170+
width: 1rem;
171+
height: 1rem;
172+
}
138173

139-
button[data-slot="carousel-previous"] {
140-
left: -16px;
141-
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.5);
142-
}
174+
video {
175+
transform: scale(0.8);
176+
}
143177

144-
button[data-slot="carousel-next"] {
145-
right: -16px;
146-
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.5);
147-
}
178+
button[data-slot="carousel-previous"] {
179+
left: -16px;
180+
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.5);
181+
}
148182

149-
.video-inner {
150-
position: relative;
151-
video {
152-
width: 60%;
153-
margin: 0 auto;
154-
}
155-
.inner-m {
156-
position: absolute;
157-
bottom: 0px;
158-
left: 50%;
159-
width: 100%;
183+
button[data-slot="carousel-next"] {
184+
right: -16px;
185+
box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.5);
186+
}
160187

161-
transform: translateX(-50%);
162-
}
188+
.video-inner {
189+
position: relative;
190+
video {
191+
width: 60%;
163192
margin: 0 auto;
164193
}
194+
.inner-m {
195+
position: absolute;
196+
bottom: 0px;
197+
left: 50%;
198+
width: 100%;
165199

166-
.bd {
167-
background: #bbbbbb;
168-
height: 10px;
169-
margin: 10px 0;
200+
transform: translateX(-50%);
170201
}
171-
.carouselItem {
172-
.card {
173-
height: 540px;
174-
padding: 40px 4px !important;
175-
box-sizing: border-box;
176-
.cardContent {
202+
margin: 0 auto;
203+
}
204+
205+
.bd {
206+
background: #bbbbbb;
207+
height: 10px;
208+
margin: 10px 0;
209+
}
210+
.carouselItem {
211+
.card {
212+
height: 540px;
213+
padding: 40px 4px !important;
214+
box-sizing: border-box;
215+
.cardContent {
216+
width: 100%;
217+
height: 100%;
218+
p,
219+
video {
177220
width: 100%;
178221
height: 100%;
179-
p,
180-
video {
181-
width: 100%;
182-
height: 100%;
183-
}
184-
.bg-card {
185-
transform: scale(1);
186-
}
222+
}
223+
.bg-card {
224+
transform: scale(1);
187225
}
188226
}
189227
}

‎app/(default)/(project)/FreeTacMan/layout.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import type { Metadata } from "next";
12
import * as React from "react";
23
import Link from "next/link";
34

@@ -10,9 +11,6 @@ const inter = Inter({
1011
display: "swap",
1112
});
1213

13-
// 通过导出metadata字段合并子页面的metadata
14-
export { metadata } from "./metadata";
15-
1614
export default function RootLayout({
1715
children,
1816
}: Readonly<{

0 commit comments

Comments
 (0)