Skip to content

Commit 1397edc

Browse files
authored
Merge pull request #15 from arch-linux-gui/dev
Dev to Main push
2 parents 5ee50c2 + d094572 commit 1397edc

28 files changed

+414
-301
lines changed

app/JoinUs/JobCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default function JobCard({ id, title, location, skills }: JobCardProps) {
1717
{skills.map((skill, index) => (
1818
<span
1919
key={index}
20-
className="m-1 px-3 py-1 bg-blue-100 text-blue-800 text-sm font-semibold rounded-full"
20+
className="m-1 px-3 py-1 bg-orange-200 text-orange-800 text-sm font-semibold rounded-full"
2121
>
2222
{skill}
2323
</span>

app/JoinUs/[jobId]/jobContent.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ export default function JobContent({ jobId }) {
4545
{job.skills.map((skill, index) => (
4646
<span
4747
key={index}
48-
className="px-3 py-1 m-1 text-sm font-semibold text-blue-800 bg-blue-100 rounded-full"
48+
className="px-3 py-1 m-1 text-sm font-semibold text-orange-800 bg-orange-100 rounded-full"
4949
>
5050
{skill}
5151
</span>
5252
))}
5353
</div>
5454
<button
5555
onClick={handleApplyClick}
56-
className="inline-block mt-4 px-12 py-3 bg-[#6a45d1] font-bold text-white rounded-full hover:bg-[#7554d1] transition duration-300"
56+
className="inline-block mt-4 px-12 py-3 bg-[#F97316] font-bold text-white rounded-full hover:bg-[#ec9a60] transition duration-300"
5757
>
5858
Apply
5959
</button>
@@ -111,7 +111,7 @@ export default function JobContent({ jobId }) {
111111
<a
112112
href={`mailto:[email protected]?subject=Application%20For%20${job.title}%20Role`}
113113
target="_blank"
114-
className="text-[#6a45d1] underline hover:text-[#7554d1] transition duration-300"
114+
className="text-[#F97316] underline hover:text-[#ec9a60] transition duration-300"
115115
>
116116
117117
</a>{" "}

app/about/aboutus.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ const AboutPage = () => {
7575
<div className="flex-1 mb-12 lg:mb-0">
7676
<div className="flex justify-center items-center h-full">
7777
<Image
78-
src="/alg-logo.png"
78+
src="https://github.com/arch-linux-gui/artwork/blob/dev/logo.png?raw=true"
7979
alt="Arka Linux GUI Logo"
8080
width={400}
8181
height={400}
@@ -132,7 +132,7 @@ const AboutPage = () => {
132132
<div className="flex flex-col h-full justify-between">
133133
<div>
134134
<Image
135-
src={member.image || "/alg-logo.png"}
135+
src={member.image || "https://github.com/arch-linux-gui/artwork/blob/dev/logo.png?raw=true"}
136136
alt={member.name}
137137
width={150}
138138
height={150}

app/donate/Donates.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export default function EnhancedDonationPage() {
5252
<div className="container mx-auto px-4 py-32 max-w-4xl">
5353
<div className="flex items-center justify-center mb-8">
5454
<Image
55-
src="/alg-logo.png"
55+
src="https://github.com/arch-linux-gui/artwork/blob/dev/logo.png?raw=true"
5656
alt="Arka Linux GUI Logo"
5757
width={100}
5858
height={100}

app/downloads/Flavours.tsx

Lines changed: 32 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ const DesktopEnvironment: React.FC<DesktopEnvironmentProps> = ({
9696

9797
const toggleDropdown = () => setDropdownVisible(!dropdownVisible);
9898

99-
const isoLinks = isThemed ? themedIso[name] : pureIso[name];
99+
const isoLinks = !isThemed ? themedIso[name] : pureIso[name];
100100

101101
const contentSection = (
102102
<div className="flex flex-col justify-center p-3 rounded-lg md:p-6">
@@ -108,6 +108,7 @@ const DesktopEnvironment: React.FC<DesktopEnvironmentProps> = ({
108108
alt={title}
109109
width={500}
110110
height={300}
111+
priority={true}
111112
className="mx-auto rounded-lg"
112113
/>
113114
</div>
@@ -116,7 +117,7 @@ const DesktopEnvironment: React.FC<DesktopEnvironmentProps> = ({
116117
<button
117118
onClick={() => setIsThemed(!isThemed)}
118119
className={`${
119-
!isThemed ? "bg-[#6a45d1]" : "bg-gray-400"
120+
!isThemed ? "bg-[#F97316]" : "bg-gray-400"
120121
} w-14 h-8 rounded-full relative`}
121122
>
122123
<span
@@ -130,7 +131,7 @@ const DesktopEnvironment: React.FC<DesktopEnvironmentProps> = ({
130131
<div className="relative flex justify-center mt-6">
131132
<button
132133
onClick={toggleDropdown}
133-
className="py-3 px-12 bg-[#6a45d1] text-white opacity-90 hover:opacity-100 rounded-full transition-all"
134+
className="py-3 px-12 bg-[#F97316] text-white opacity-90 hover:opacity-100 rounded-full transition-all"
134135
>
135136
Download
136137
</button>
@@ -163,6 +164,7 @@ const DesktopEnvironment: React.FC<DesktopEnvironmentProps> = ({
163164
alt={title}
164165
width={900}
165166
height={800}
167+
priority={true}
166168
className="mx-auto rounded-lg"
167169
/>
168170
</div>
@@ -188,30 +190,33 @@ const DesktopEnvironment: React.FC<DesktopEnvironmentProps> = ({
188190
export default function Flavours() {
189191
return (
190192
<section className="bg-gradient-to-br from-orange-50 to-orange-100 dark:from-[#0b0b10] dark:to-[#09090B] pt-4 md:pt-0 px-4 sm:px-12 md:px-20 md:pb-12 lg:px-28">
191-
<DesktopEnvironment
192-
name="kde"
193-
title="KDE Plasma"
194-
description="The Plasma Themed Edition (also known as the Flagship) of Arka Linux GUI helps you install Vanilla Arch Linux with the KDE Plasma Desktop Environment. It is pre-configured and ready to use. It comes with all the necessary software and settings to help users get started quickly."
195-
pureImage="/plasma-pure.png"
196-
themedImage="/plasma.png"
197-
isReversed={false}
198-
/>
199-
<DesktopEnvironment
200-
name="gnome"
201-
title="GNOME"
202-
description="The GNOME Edition of Arka Linux GUI helps you install Vanilla Arch Linux with the GNOME Desktop Environment. It is pre-configured and ready to use. It comes with all the necessary software and settings to help users get started quickly."
203-
pureImage="/gnome-pure.png"
204-
themedImage="/gnome.jpg"
205-
isReversed={true}
206-
/>
207-
<DesktopEnvironment
208-
name="xfce"
209-
title="XFCE"
210-
description="The XFCE Edition of Arka Linux GUI helps you install Vanilla Arch Linux with the XFCE Desktop Environment. It is pre-configured and ready to use. It comes with all the necessary software and settings to help users get started quickly."
211-
pureImage="/xfce-pure.png"
212-
themedImage="/xfce.png"
213-
isReversed={false}
214-
/>
193+
{/* Don't know why now its working correctly but when pureImage & themedImage places are changed it works inversely, need to fix! */}
194+
<div className="flex flex-col space-y-6">
195+
<DesktopEnvironment
196+
name="kde"
197+
title="KDE Plasma"
198+
description="The Plasma Themed Edition (also known as the Flagship) of Arka Linux GUI helps you install Vanilla Arch Linux with the KDE Plasma Desktop Environment. It is pre-configured and ready to use. It comes with all the necessary software and settings to help users get started quickly."
199+
pureImage="https://github.com/arch-linux-gui/artwork/blob/dev/desktop-screenshots/desktop-ss/themed/plasma.png?raw=true"
200+
themedImage="https://github.com/arch-linux-gui/artwork/blob/dev/desktop-screenshots/desktop-ss/pure/plasma-pure.png?raw=true"
201+
isReversed={false}
202+
/>
203+
<DesktopEnvironment
204+
name="gnome"
205+
title="GNOME"
206+
description="The GNOME Edition of Arka Linux GUI helps you install Vanilla Arch Linux with the GNOME Desktop Environment. It is pre-configured and ready to use. It comes with all the necessary software and settings to help users get started quickly."
207+
pureImage="https://github.com/arch-linux-gui/artwork/blob/dev/desktop-screenshots/desktop-ss/themed/gnome.png?raw=true"
208+
themedImage="https://github.com/arch-linux-gui/artwork/blob/dev/desktop-screenshots/desktop-ss/pure/gnome.png?raw=true"
209+
isReversed={true}
210+
/>
211+
<DesktopEnvironment
212+
name="xfce"
213+
title="XFCE"
214+
description="The XFCE Edition of Arka Linux GUI helps you install Vanilla Arch Linux with the XFCE Desktop Environment. It is pre-configured and ready to use. It comes with all the necessary software and settings to help users get started quickly."
215+
pureImage="https://github.com/arch-linux-gui/artwork/blob/dev/desktop-screenshots/desktop-ss/themed/xfce-themed.png?raw=true"
216+
themedImage="https://github.com/arch-linux-gui/artwork/blob/dev/desktop-screenshots/desktop-ss/pure/xfce-pure.png?raw=true"
217+
isReversed={false}
218+
/>
219+
</div>
215220
</section>
216221
);
217222
}

app/globals.css

Lines changed: 97 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -15,56 +15,106 @@ body {
1515
@layer base {
1616
:root {
1717
--background: 0 0% 100%;
18-
--foreground: 240 10% 3.9%;
18+
--foreground: 0 0% 14.902%;
1919
--card: 0 0% 100%;
20-
--card-foreground: 240 10% 3.9%;
20+
--card-foreground: 0 0% 14.902%;
2121
--popover: 0 0% 100%;
22-
--popover-foreground: 240 10% 3.9%;
23-
--primary: 240 5.9% 10%;
24-
--primary-foreground: 0 0% 98%;
25-
--secondary: 240 4.8% 95.9%;
26-
--secondary-foreground: 240 5.9% 10%;
27-
--muted: 240 4.8% 95.9%;
28-
--muted-foreground: 240 3.8% 46.1%;
29-
--accent: 240 4.8% 95.9%;
30-
--accent-foreground: 240 5.9% 10%;
31-
--destructive: 0 84.2% 60.2%;
32-
--destructive-foreground: 0 0% 98%;
33-
--border: 240 5.9% 90%;
34-
--input: 240 5.9% 90%;
35-
--ring: 240 10% 3.9%;
36-
--chart-1: 12 76% 61%;
37-
--chart-2: 173 58% 39%;
38-
--chart-3: 197 37% 24%;
39-
--chart-4: 43 74% 66%;
40-
--chart-5: 27 87% 67%;
41-
--radius: 0.5rem;
22+
--popover-foreground: 0 0% 14.902%;
23+
--primary: 37.6923 92.126% 50.1961%;
24+
--primary-foreground: 0 0% 0%;
25+
--secondary: 220 14.2857% 95.8824%;
26+
--secondary-foreground: 215 13.7931% 34.1176%;
27+
--muted: 210 20% 98.0392%;
28+
--muted-foreground: 220 8.9362% 46.0784%;
29+
--accent: 48 100% 96.0784%;
30+
--accent-foreground: 22.7273 82.5% 31.3725%;
31+
--destructive: 0 84.2365% 60.1961%;
32+
--destructive-foreground: 0 0% 100%;
33+
--border: 220 13.0435% 90.9804%;
34+
--input: 220 13.0435% 90.9804%;
35+
--ring: 37.6923 92.126% 50.1961%;
36+
--chart-1: 37.6923 92.126% 50.1961%;
37+
--chart-2: 32.1327 94.6188% 43.7255%;
38+
--chart-3: 25.9649 90.4762% 37.0588%;
39+
--chart-4: 22.7273 82.5% 31.3725%;
40+
--chart-5: 21.7143 77.7778% 26.4706%;
41+
--sidebar: 210 20% 98.0392%;
42+
--sidebar-foreground: 0 0% 14.902%;
43+
--sidebar-primary: 37.6923 92.126% 50.1961%;
44+
--sidebar-primary-foreground: 0 0% 100%;
45+
--sidebar-accent: 48 100% 96.0784%;
46+
--sidebar-accent-foreground: 22.7273 82.5% 31.3725%;
47+
--sidebar-border: 220 13.0435% 90.9804%;
48+
--sidebar-ring: 37.6923 92.126% 50.1961%;
49+
--font-sans: Inter, sans-serif;
50+
--font-serif: Source Serif 4, serif;
51+
--font-mono: JetBrains Mono, monospace;
52+
--radius: 0.7rem;
53+
--shadow-2xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.05);
54+
--shadow-xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.05);
55+
--shadow-sm: 0px 4px 8px -1px hsl(0 0% 0% / 0.1),
56+
0px 1px 2px -2px hsl(0 0% 0% / 0.1);
57+
--shadow: 0px 4px 8px -1px hsl(0 0% 0% / 0.1),
58+
0px 1px 2px -2px hsl(0 0% 0% / 0.1);
59+
--shadow-md: 0px 4px 8px -1px hsl(0 0% 0% / 0.1),
60+
0px 2px 4px -2px hsl(0 0% 0% / 0.1);
61+
--shadow-lg: 0px 4px 8px -1px hsl(0 0% 0% / 0.1),
62+
0px 4px 6px -2px hsl(0 0% 0% / 0.1);
63+
--shadow-xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.1),
64+
0px 8px 10px -2px hsl(0 0% 0% / 0.1);
65+
--shadow-2xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.25);
4266
}
67+
4368
.dark {
44-
--background: 240 10% 3.9%;
45-
--foreground: 0 0% 98%;
46-
--card: 240 10% 3.9%;
47-
--card-foreground: 0 0% 98%;
48-
--popover: 240 10% 3.9%;
49-
--popover-foreground: 0 0% 98%;
50-
--primary: 0 0% 98%;
51-
--primary-foreground: 240 5.9% 10%;
52-
--secondary: 240 3.7% 15.9%;
53-
--secondary-foreground: 0 0% 98%;
54-
--muted: 240 3.7% 15.9%;
55-
--muted-foreground: 240 5% 64.9%;
56-
--accent: 240 3.7% 15.9%;
57-
--accent-foreground: 0 0% 98%;
58-
--destructive: 0 62.8% 30.6%;
59-
--destructive-foreground: 0 0% 98%;
60-
--border: 240 3.7% 15.9%;
61-
--input: 240 3.7% 15.9%;
62-
--ring: 240 4.9% 83.9%;
63-
--chart-1: 220 70% 50%;
64-
--chart-2: 160 60% 45%;
65-
--chart-3: 30 80% 55%;
66-
--chart-4: 280 65% 60%;
67-
--chart-5: 340 75% 55%;
69+
--background: 0 0% 9.0196%;
70+
--foreground: 0 0% 89.8039%;
71+
--card: 0 0% 14.902%;
72+
--card-foreground: 0 0% 89.8039%;
73+
--popover: 0 0% 14.902%;
74+
--popover-foreground: 0 0% 89.8039%;
75+
--primary: 37.6923 92.126% 50.1961%;
76+
--primary-foreground: 0 0% 0%;
77+
--secondary: 0 0% 14.902%;
78+
--secondary-foreground: 0 0% 89.8039%;
79+
--muted: 0 0% 14.902%;
80+
--muted-foreground: 0 0% 63.9216%;
81+
--accent: 22.7273 82.5% 31.3725%;
82+
--accent-foreground: 48 96.6387% 76.6667%;
83+
--destructive: 0 84.2365% 60.1961%;
84+
--destructive-foreground: 0 0% 100%;
85+
--border: 0 0% 25.098%;
86+
--input: 0 0% 25.098%;
87+
--ring: 37.6923 92.126% 50.1961%;
88+
--chart-1: 43.2558 96.4126% 56.2745%;
89+
--chart-2: 32.1327 94.6188% 43.7255%;
90+
--chart-3: 22.7273 82.5% 31.3725%;
91+
--chart-4: 25.9649 90.4762% 37.0588%;
92+
--chart-5: 22.7273 82.5% 31.3725%;
93+
--sidebar: 0 0% 5.8824%;
94+
--sidebar-foreground: 0 0% 89.8039%;
95+
--sidebar-primary: 37.6923 92.126% 50.1961%;
96+
--sidebar-primary-foreground: 0 0% 100%;
97+
--sidebar-accent: 22.7273 82.5% 31.3725%;
98+
--sidebar-accent-foreground: 48 96.6387% 76.6667%;
99+
--sidebar-border: 0 0% 25.098%;
100+
--sidebar-ring: 37.6923 92.126% 50.1961%;
101+
--font-sans: Inter, sans-serif;
102+
--font-serif: Source Serif 4, serif;
103+
--font-mono: JetBrains Mono, monospace;
104+
--radius: 0.7rem;
105+
--shadow-2xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.05);
106+
--shadow-xs: 0px 4px 8px -1px hsl(0 0% 0% / 0.05);
107+
--shadow-sm: 0px 4px 8px -1px hsl(0 0% 0% / 0.1),
108+
0px 1px 2px -2px hsl(0 0% 0% / 0.1);
109+
--shadow: 0px 4px 8px -1px hsl(0 0% 0% / 0.1),
110+
0px 1px 2px -2px hsl(0 0% 0% / 0.1);
111+
--shadow-md: 0px 4px 8px -1px hsl(0 0% 0% / 0.1),
112+
0px 2px 4px -2px hsl(0 0% 0% / 0.1);
113+
--shadow-lg: 0px 4px 8px -1px hsl(0 0% 0% / 0.1),
114+
0px 4px 6px -2px hsl(0 0% 0% / 0.1);
115+
--shadow-xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.1),
116+
0px 8px 10px -2px hsl(0 0% 0% / 0.1);
117+
--shadow-2xl: 0px 4px 8px -1px hsl(0 0% 0% / 0.25);
68118
}
69119
}
70120

@@ -132,7 +182,7 @@ body {
132182

133183
.loader {
134184
border: 8px solid #f3f3f3;
135-
border-top: 5px solid #6a45d1;
185+
border-top: 5px solid #d09031;
136186
border-radius: 50%;
137187
width: 50px;
138188
height: 50px;

0 commit comments

Comments
 (0)