Skip to content

Commit 7e4ab15

Browse files
EvannnXEvannnX
committed
index_update
1 parent 9ba4438 commit 7e4ab15

7 files changed

Lines changed: 201 additions & 126 deletions

File tree

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎css/styles.css‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -986,4 +986,48 @@ nav.expanded ul li a {
986986
.member {
987987
width: 50%; /* 在小屏设备上每行显示2个成员 */
988988
}
989-
}
989+
}
990+
.award-module {
991+
display: flex;
992+
align-items: center;
993+
justify-content: space-between;
994+
padding: 1.5rem;
995+
border: 1px solid #ddd;
996+
background-color: #f9f9f9;
997+
margin-bottom: 2rem;
998+
border-radius: 10px;
999+
flex-wrap: wrap; /* 确保在小屏幕上不会溢出 */
1000+
}
1001+
1002+
.award-module img {
1003+
width: 45%;
1004+
max-width: 500px;
1005+
height: auto;
1006+
border-radius: 8px;
1007+
object-fit: cover;
1008+
box-shadow: 0 4px 10px rgba(0, 0, 0, 0.1);
1009+
margin-bottom: 1rem;
1010+
}
1011+
1012+
.award-module .event-text {
1013+
width: 50%;
1014+
padding-left: 2rem;
1015+
text-align: left;
1016+
}
1017+
1018+
@media (max-width: 768px) {
1019+
.award-module {
1020+
flex-direction: column;
1021+
align-items: center;
1022+
}
1023+
1024+
.award-module img,
1025+
.award-module .event-text {
1026+
width: 100%;
1027+
padding-left: 0;
1028+
}
1029+
1030+
.award-module .event-text {
1031+
text-align: center;
1032+
}
1033+
}

‎images/.DS_Store‎

0 Bytes
Binary file not shown.

‎images/2024_VEX_Elite_ Invitational _Competition/.DS_Store‎

6 KB
Binary file not shown.

‎images/2024_VEX_Elite_ Invitational _Competition/DSC06769.JPG‎

14.8 MB
Loading

‎images/2024_VEX_Elite_ Invitational _Competition/DSC06778.JPG‎

16.1 MB
Loading

‎index-en.html‎

Lines changed: 156 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,142 +1,173 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="UTF-8">
5-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6-
<title>NYU Shanghai Robotics Club</title>
7-
<link rel="stylesheet" href="css/styles.css">
4+
<meta charset="UTF-8">
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0">
6+
<title>NYU Shanghai Robotics Club</title>
7+
<link rel="stylesheet" href="css/styles.css">
88
</head>
99
<body>
10-
<header>
11-
<a href="https://shanghai.nyu.edu" class="logo">
12-
<img src="images/NYUSH logo.png" alt="Robotics Club Logo">
13-
</a>
14-
<nav>
15-
<img src="images/listbutton.png" alt="Menu" class="menu-button">
16-
<ul class="hidden">
17-
<li><a href="index-en.html">Home</a></li>
18-
<li><a href="about-en.html">About Us</a></li>
19-
<li><a href="members-en.html">Members</a></li>
20-
<li><a href="events-en.html">Events</a></li>
21-
<li><a href="contact-en.html">Contact Us</a></li>
22-
<li><a href="index-cn.html">中文</a></li>
23-
</ul>
24-
</nav>
25-
</header>
26-
<div class="video-container">
27-
<video autoplay muted loop playsinline webkit-playsinline>
28-
<source src="videos/BG.mp4" type="video/mp4">
29-
<source src="videos/BG.webm" type="video/webm">
30-
Your browser does not support the video tag.
31-
</video>
10+
<header>
11+
<a href="https://shanghai.nyu.edu" class="logo">
12+
<img src="images/NYUSH logo.png" alt="Robotics Club Logo">
13+
</a>
14+
<nav>
15+
<img src="images/listbutton.png" alt="Menu" class="menu-button">
16+
<ul class="hidden">
17+
<li><a href="index-en.html">Home</a></li>
18+
<li><a href="about-en.html">About Us</a></li>
19+
<li><a href="members-en.html">Members</a></li>
20+
<li><a href="events-en.html">Events</a></li>
21+
<li><a href="contact-en.html">Contact Us</a></li>
22+
<li><a href="index-cn.html">中文</a></li>
23+
</ul>
24+
</nav>
25+
</header>
26+
27+
<div class="video-container">
28+
<video autoplay muted loop playsinline webkit-playsinline>
29+
<source src="videos/BG.mp4" type="video/mp4">
30+
<source src="videos/BG.webm" type="video/webm">
31+
Your browser does not support the video tag.
32+
</video>
33+
</div>
34+
35+
<div class="content">
36+
<h1>Welcome to the NYU Shanghai Robotics Club</h1>
37+
<p>We are dedicated to promoting interest in robotics through education, competitions, and hands-on projects.</p>
38+
39+
<br>
40+
41+
<h2>Who We Are</h2>
42+
<p>
43+
Founded in 2024, the NYU Shanghai Robotics Club provides a platform for students to explore the world of robotics.
44+
Our mission is to foster creativity and technical skills through rich educational resources and practical projects.
45+
</p>
46+
47+
<br><br>
48+
49+
<h2>Awards</h2>
50+
51+
<!-- Second Prize -->
52+
<div class="event-module">
53+
<img src="images/vex_asia_open_award.jpg" alt="VEX Asia Open Second Prize">
54+
<div class="event-text">
55+
<h3>Second Prize – 2024-2025 VEX Asia Open Signature Event</h3>
56+
<p>
57+
From December 29th to January 1st, the NYU Shanghai Robotics Club earned an impressive second prize at the VEX Asia Open Signature Event.
58+
With over 500 teams from China, Macao, the U.S., Singapore, and the UAE, the tournament was one of Asia’s premier robotics competitions.
59+
Both NYU Shanghai teams advanced through the group stages, demonstrating exceptional skill and perseverance. Their dedication and teamwork set a powerful tone for future challenges.
60+
</p>
61+
</div>
3262
</div>
33-
<div class="content">
34-
<h1>Welcome to the NYU Shanghai Robotics Club</h1>
35-
<p>We are dedicated to promoting interest in robotics through education, competitions, and hands-on projects.</p>
36-
37-
<br>
38-
39-
<h2>Who We Are</h2>
40-
<p>Founded in 2024, the NYU Shanghai Robotics Club provides a platform for students to explore the world of robotics. Our mission is to foster creativity and technical skills through rich educational resources and practical projects.</p>
41-
42-
<br>
43-
<br>
44-
<h2>Upcoming Events</h2>
45-
<div class="event-module">
46-
<img src="images/SJTU_emblem.svg.png" alt="Shanghai Jiao Tong University VEX Elite Invitational Competition">
47-
<div class="event-text">
48-
<h3>Shanghai Jiao Tong University VEX Elite Invitational Competition</h3>
49-
<p>(Shanghai, China Dec-2024)</p>
50-
</div>
51-
</div>
52-
<div class="event-module">
53-
<img src="images/VEX_signature_sign.jpg" alt="2024-2025 VURC Asia Open Signature Event">
54-
<div class="event-text">
55-
<h3>2024-2025 VURC Asia Open Signature Event</h3>
56-
<p>(Wuxi, Jiangsu, China 29-Dec-2024 - 1-Jan-2025)</p>
57-
</div>
58-
</div>
59-
<div class="event-module">
60-
<img src="images/VEX_competition_sign.jpg" alt="The 17th VEX Asia-Pacific Robotics Championship 2025 – VURC Signature Event">
61-
<div class="event-text">
62-
<h3>The 17th VEX Asia-Pacific Robotics Championship 2025 – VURC Signature Event</h3>
63-
<p>(Hainan, China 17-Jan-2025 - 20-Jan-2025)</p>
64-
</div>
65-
</div>
6663

67-
<br>
68-
<br>
69-
<h2>Past Events</h2>
70-
<div class="event-module past-event-module">
71-
<a href="past_event_involvementfair.html" class="z-involve">
72-
<img src="images/Involvement Fair/Involvement Fair 1.JPG" alt="2024 Fall Involvement Fair">
73-
<div class="event-text">
74-
<h3>2024 Fall Involvement Fair</h3>
75-
<p>12-September 2024</p>
76-
</div>
77-
</a>
78-
</div>
79-
80-
<br>
81-
<br>
82-
<h2>Join Us</h2>
83-
<p>Interested in joining the NYU Shanghai Robotics Club? Learn more about how to join and get involved in our exciting projects and competitions.</p>
64+
<!-- Promising Award -->
65+
<div class="event-module award-module">
66+
<img src="images/2024_VEX_Elite_Invitational_Competition/DSC06769.JPG" alt="2024 VEX Elite Invitational Promising Award">
67+
<div class="event-text">
68+
<h3>Promising Award – VEX Elite Invitational</h3>
69+
<p>
70+
On December 22, 2024, the NYU Shanghai Robotics Club received the Promising Award at the VEX Elite Invitational Competition.
71+
As the first major event of the season, the competition featured 29 teams from 17 leading universities, including Shanghai Jiao Tong University, Xi’an Jiaotong University, Tongji University, and Harbin Institute of Technology (Shenzhen).<br><br>
72+
The teams showcased their creativity and technical skill throughout the event. This recognition highlights the Robotics Club’s dedication to innovation and collaboration in competitive robotics.
73+
</p>
74+
</div>
75+
</div>
8476

85-
<br>
77+
<br><br>
8678

87-
<h2>Contact Us</h2>
88-
<p>If you have any questions or would like to learn more, please contact us through our social media channels.</p>
79+
<h2>Upcoming Events</h2>
80+
<div class="event-module">
81+
<img src="images/SJTU_emblem.svg.png" alt="Shanghai Jiao Tong University VEX Elite Invitational Competition">
82+
<div class="event-text">
83+
<h3>Shanghai Jiao Tong University VEX Elite Invitational Competition</h3>
84+
<p>(Shanghai, China Dec-2024)</p>
85+
</div>
86+
</div>
87+
<div class="event-module">
88+
<img src="images/VEX_signature_sign.jpg" alt="2024-2025 VURC Asia Open Signature Event">
89+
<div class="event-text">
90+
<h3>2024-2025 VURC Asia Open Signature Event</h3>
91+
<p>(Wuxi, Jiangsu, China 29-Dec-2024 - 1-Jan-2025)</p>
92+
</div>
93+
</div>
94+
<div class="event-module">
95+
<img src="images/VEX_competition_sign.jpg" alt="The 17th VEX Asia-Pacific Robotics Championship 2025 – VURC Signature Event">
96+
<div class="event-text">
97+
<h3>The 17th VEX Asia-Pacific Robotics Championship 2025 – VURC Signature Event</h3>
98+
<p>(Hainan, China 17-Jan-2025 - 20-Jan-2025)</p>
99+
</div>
89100
</div>
90-
<footer>
91-
<div class="social-media">
92-
<a href="https://www.linkedin.com/company/robotics-club-at-nyu-shanghai">
93-
<img src="images/Linkedin.png" alt="LinkedIn">
94-
</a>
95-
<a href="https://www.instagram.com/nyush_robotics_club/">
96-
<img src="images/Instagram.jpg" alt="Instagram">
97-
</a>
98-
<a href="wechat-code.html">
99-
<img src="images/WeChat.PNG" alt="WeChat">
100-
</a>
101+
102+
<br><br>
103+
104+
<h2>Past Events</h2>
105+
<div class="event-module past-event-module">
106+
<a href="past_event_involvementfair.html" class="z-involve">
107+
<img src="images/Involvement Fair/Involvement Fair 1.JPG" alt="2024 Fall Involvement Fair">
108+
<div class="event-text">
109+
<h3>2024 Fall Involvement Fair</h3>
110+
<p>12-September 2024</p>
101111
</div>
102-
<p>&copy; 2024 NYU Shanghai Robotics Club</p>
103-
<a href="login-en.html" class="admin-login">Admin Login</a>
104-
</footer>
105-
<script>
106-
// test
107-
// Function to check and update menu styles based on window size
108-
function updateMenuStyles() {
109-
const nav = document.querySelector('nav');
110-
const navUl = document.querySelector('nav ul');
111-
const menuButton = document.querySelector('.menu-button');
112-
113-
if (window.innerWidth > 768) {
114-
navUl.classList.remove('hidden');
115-
document.querySelectorAll('nav ul li a').forEach(link => {
116-
link.style.fontSize = '1rem'; // 大屏时字体大小
117-
});
118-
nav.classList.remove('expanded'); // 确保大屏时菜单不处于展开状态
119-
} else {
120-
if (!nav.classList.contains('expanded')) {
121-
navUl.classList.add('hidden');
122-
}
123-
document.querySelectorAll('nav ul li a').forEach(link => {
124-
link.style.fontSize = '0.8rem'; // 小屏时字体大小
125-
});
126-
}
127-
}
112+
</a>
113+
</div>
128114

129-
// Update menu styles on window resize
130-
window.addEventListener('resize', updateMenuStyles);
115+
<br><br>
131116

132-
// Initial call to set the correct styles
133-
updateMenuStyles();
117+
<h2>Join Us</h2>
118+
<p>Interested in joining the NYU Shanghai Robotics Club? Learn more about how to join and get involved in our exciting projects and competitions.</p>
134119

135-
// Toggle menu on button click
136-
document.querySelector('.menu-button').addEventListener('click', function() {
137-
document.querySelector('nav').classList.toggle('expanded');
138-
document.querySelector('nav ul').classList.toggle('hidden');
120+
<br>
121+
122+
<h2>Contact Us</h2>
123+
<p>If you have any questions or would like to learn more, please contact us through our social media channels.</p>
124+
</div>
125+
126+
<footer>
127+
<div class="social-media">
128+
<a href="https://www.linkedin.com/company/robotics-club-at-nyu-shanghai">
129+
<img src="images/Linkedin.png" alt="LinkedIn">
130+
</a>
131+
<a href="https://www.instagram.com/nyush_robotics_club/">
132+
<img src="images/Instagram.jpg" alt="Instagram">
133+
</a>
134+
<a href="wechat-code.html">
135+
<img src="images/WeChat.PNG" alt="WeChat">
136+
</a>
137+
</div>
138+
<p>&copy; 2024 NYU Shanghai Robotics Club</p>
139+
<a href="login-en.html" class="admin-login">Admin Login</a>
140+
</footer>
141+
142+
<script>
143+
function updateMenuStyles() {
144+
const nav = document.querySelector('nav');
145+
const navUl = document.querySelector('nav ul');
146+
const menuButton = document.querySelector('.menu-button');
147+
148+
if (window.innerWidth > 768) {
149+
navUl.classList.remove('hidden');
150+
document.querySelectorAll('nav ul li a').forEach(link => {
151+
link.style.fontSize = '1rem';
152+
});
153+
nav.classList.remove('expanded');
154+
} else {
155+
if (!nav.classList.contains('expanded')) {
156+
navUl.classList.add('hidden');
157+
}
158+
document.querySelectorAll('nav ul li a').forEach(link => {
159+
link.style.fontSize = '0.8rem';
139160
});
140-
</script>
161+
}
162+
}
163+
164+
window.addEventListener('resize', updateMenuStyles);
165+
updateMenuStyles();
166+
167+
document.querySelector('.menu-button').addEventListener('click', function () {
168+
document.querySelector('nav').classList.toggle('expanded');
169+
document.querySelector('nav ul').classList.toggle('hidden');
170+
});
171+
</script>
141172
</body>
142173
</html>

0 commit comments

Comments
 (0)