Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/buttons/reverse_colors_button.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const ReverseColorsButton = ({
return (
<button
className={`
w-fit py-3 px-6 rounded-full break-words
w-fit py-3 px-6 rounded-full wrap-break-word
bg-transparent border ${borderColor}
${textColor} ${hoverTextColor} ${hoverBg}
transition-colors duration-200
Expand Down
14 changes: 7 additions & 7 deletions src/components/buttons/slider_button.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,24 +44,24 @@ const SliderButton = ({
<>
<Icon
icon="mdi:loading"
className={`${textSize} animate-spin flex-shrink-0`}
className={`${textSize} animate-spin shrink-0`}
/>
<span className={textSize}>{loadingText}</span>
</>
) : (
<>
{icon && (
<Icon icon={icon} className={`${textSize} flex-shrink-0`} />
)}
<span className={`${textSize} break-words`}>{text}</span>
{icon && <Icon icon={icon} className={`${textSize} shrink-0`} />}
<span className={`${textSize} wrap-break-word`}>{text}</span>
</>
)}
</div>

{/* 懸停狀態 */}
<div className="h-12 flex items-center justify-center text-btnbg gap-2">
{icon && <Icon icon={icon} className={`${textSize} flex-shrink-0`} />}
<span className={`${textSize} break-words`}>{displayHoverText}</span>
{icon && <Icon icon={icon} className={`${textSize} shrink-0`} />}
<span className={`${textSize} wrap-break-word`}>
{displayHoverText}
</span>
</div>
</div>
</button>
Expand Down
8 changes: 5 additions & 3 deletions src/components/navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,17 +140,19 @@ export default Navbar;
const JoinUsButton = ({ fullWidth = false }) => (
<button
className={`relative overflow-hidden text-white text-base font-semibold ${fullWidth ? "w-full" : "w-fit"} px-10 py-2.5 rounded-full transition-all duration-300 active:scale-95
bg-gradient-to-b from-[#5a6fa0] to-[#445484]
bg-linear-to-b from-[#5a6fa0] to-btnbg
border border-white/25
shadow-[inset_0_1px_0_rgba(255,255,255,0.28),0_4px_14px_rgba(68,84,132,0.45)]
hover:shadow-[inset_0_1px_0_rgba(255,255,255,0.38),0_6px_20px_rgba(68,84,132,0.60)]
hover:from-[#6a80b4] hover:to-[#5264a0]`}
onClick={() => {
// 修改JoinUs的入社連結,需同時修改index.js
window.open("https://forms.gle/QWK8jUoNz6sNeYtn7", "_blank");
// window.open("https://forms.gle/QWK8jUoNz6sNeYtn7", "_blank");
window.open("https://iosappcompetition-2026.onrender.com", "_blank");
}}
>
Join Us
{/* {{ Join Us }} */}
競賽報名
</button>
);

Expand Down
12 changes: 9 additions & 3 deletions src/pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,21 @@ const IndexPage = (props) => {
<button
className="overflow-hidden group h-12 px-6 border border-btnbg rounded-xs"
onClick={() => {
window.open("https://forms.gle/QWK8jUoNz6sNeYtn7", "_blank");
// window.open("https://forms.gle/QWK8jUoNz6sNeYtn7", "_blank");
window.open(
"https://iosappcompetition-2026.onrender.com",
"_blank",
);
}}
>
<div className="transition duration-200 group-hover:-translate-y-12">
<div className="h-12 flex items-center justify-center text-btnbg wrap-break-word">
Join Us
{/* {{ Join Us }} */}
競賽報名
</div>
<div className="h-12 flex items-center justify-center text-btnbg wrap-break-word">
Welcome
{/* {{ Welcome }} */}
Go
</div>
</div>
</button>
Expand Down
6 changes: 3 additions & 3 deletions src/templates/member_page.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const MemberPage = (props) => {
<div className="flex justify-items-center">
<p className="my-8 m-auto">
<a
className="w-fit py-3 px-6 rounded-full break-words bg-transparent border border-gray-700 hover:bg-btnbg text-gray-800 hover:text-white"
className="w-fit py-3 px-6 rounded-full wrap-break-word bg-transparent border border-gray-700 hover:bg-btnbg text-gray-800 hover:text-white"
href="/members"
>
<nobr>返回歷屆幹部</nobr>
Expand Down Expand Up @@ -97,7 +97,7 @@ const MemberCard = (props) => {
<h3 className="text-2xl font-bold py-4">
{member.position + " " + member.name}
</h3>
<hr className="border-1 border-iosbgblue" />
<hr className="border border-iosbgblue" />

{/* description 介紹*/}
<p className="my-4">{member.description}</p>
Expand All @@ -113,7 +113,7 @@ const MemberCard = (props) => {
rel="noopener noreferrer"
className="w-full"
>
<div className="flex gap-3 items-center w-fit py-1 px-5 rounded-full break-words bg-transparent border border-gray-700 hover:bg-btnbg text-gray-800 hover:text-white break-normal">
<div className="flex gap-3 items-center w-fit py-1 px-5 rounded-full wrap-break-word bg-transparent border border-gray-700 hover:bg-btnbg text-gray-800 hover:text-white break-normal">
{createMemberLinkIcon(link.icon_type)}
{link.text}
</div>
Expand Down
Loading