Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d03e4d0
Merge pull request #199 from MERCon2025/Tiran
TiranVitharana Aug 4, 2025
6cebe53
Refactor code structure for improved readability and maintainability
Chamindu24 Aug 6, 2025
389db92
Merge pull request #200 from Chamindu24/chamindu_3
TiranVitharana Aug 7, 2025
7a22d9e
Remove unused image overlay styles and background gradients for clean…
TiranVitharana Aug 7, 2025
2fc3a1c
Merge pull request #201 from MERCon2025/Tiran
TiranVitharana Aug 7, 2025
288f980
Add registration buttons and styles for workshop cards
Chamindu24 Aug 7, 2025
494275f
Merge pull request #202 from Chamindu24/chamindu_3
TiranVitharana Aug 7, 2025
563b568
Add keynote speaker bios and abstracts; include new workshop images
TiranVitharana Aug 7, 2025
3feeb7e
Merge pull request #203 from MERCon2025/Tiran
TiranVitharana Aug 7, 2025
860b9ca
Update keynote speaker abstracts and titles for clarity and formatting
TiranVitharana Aug 7, 2025
a80a07b
Merge pull request #204 from MERCon2025/Tiran
TiranVitharana Aug 7, 2025
34da1d1
Add Workshop 5 details and registration link to the workshops page
TiranVitharana Aug 7, 2025
cfbb6c6
Merge pull request #205 from MERCon2025/Tiran
TiranVitharana Aug 7, 2025
3b8b2c5
Add Workshop 5 details and registration link to the workshops page
TiranVitharana Aug 7, 2025
74ff5c0
Merge pull request #206 from MERCon2025/Tiran
TiranVitharana Aug 7, 2025
77fd0be
Add conference schedule and workshop details for MERCon 2025
Chamindukavya Aug 8, 2025
40cfb88
Merge pull request #207 from MERCon2025/register
TiranVitharana Aug 8, 2025
29e9284
Update MERCon 2025 conference and workshop schedules with images and …
TiranVitharana Aug 8, 2025
abd1a89
Merge pull request #208 from MERCon2025/Tiran
TiranVitharana Aug 8, 2025
0dea3c2
Add image modal functionality and styles to workshops page
Chamindu24 Aug 8, 2025
deff23f
Merge pull request #209 from Chamindu24/chamindu_3
TiranVitharana Aug 8, 2025
59784c9
Update MERCon 2025 conference and workshop schedules with images and …
TiranVitharana Aug 8, 2025
d5413e9
Add links to conference schedule in multiple pages
TiranVitharana Aug 9, 2025
f105d4c
Merge pull request #210 from MERCon2025/Tiran
TiranVitharana Aug 9, 2025
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
Binary file not shown.
Binary file not shown.
137 changes: 137 additions & 0 deletions conferenceSchedule.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="NativeCode" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="stylesheet" href="./css/footer.css" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Inter&display=swap" rel="stylesheet" />
<link rel="stylesheet" href="path/to/font-awesome/css/font-awesome.min.css" />
<script src="https://kit.fontawesome.com/a24a7503cf.js" crossorigin="anonymous"></script>
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link href="https://fonts.googleapis.com/css2?family=Mate+SC&family=Play&display=swap" rel="stylesheet" />

<!-- carousel styles and scripts -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"
integrity="sha512-iecdLmaskl7CVkqkXNQ/ZH/XLlvWZOJyj7Yy7tcenmpD1ypASozpmT/E0iPtmFIB46ZmdtAc9eNBvH0H/ZpiBw=="
crossorigin="anonymous" referrerpolicy="no-referrer" />
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.carousel.min.css" />
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.theme.default.min.css" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<link rel="icon" type="image/x-icon" href="./img/logos/UOMlogo.ico" />

<link rel="stylesheet" href="./css/style.min.css" />
<script src="https://code.jquery.com/jquery-1.10.2.js"></script>
<script src="./scripts/components.js"></script>

<link rel="stylesheet" type="text/css" href="./css/feestable.css">
<link rel="stylesheet" type="text/css" href="./css/authors.css">


<title>Mercon 2025</title>
</head>

<body class="custom-page">
<header class="bg-secondary"></header>
<section class="mainProgram">


<script src="./scripts/countdown.js"></script>
<div class="tinted-registration">
<div style="text-align: center; padding: 20px;">



<section>

<h2 style="text-align:center;">MERCon 2025 - Conference Schedule</h2>
<br>
<br>
<img src="./img/Session details.png" alt="Session details" style="max-width:100%; height:auto;">
<br>
<br>
<img src="./img/conference-schedule.png" alt="Conference Schedule" style="max-width:100%; height:auto;">
<br>
<p style="text-align:center; margin-top:10px;">
<a href="./assets/pdf/MERCon 2025 Session Details and Conference Schedule-Webteam.pdf" download
class="register_button">Download PDF</a>
</p>
<br><br><br>

<h2 style="text-align:center;">MERCon 2025 - Workshop Schedule</h2>
<br>
<br>
<img src="./img/Workshop schedule.png" alt="Workshop Schedule" style="max-width:100%; height:auto;">
<br>
<p style="text-align:center; margin-top:10px;">
<a href="./assets/pdf/MERCon 2025 Workshop Schedule-Webteam.pdf" download class="register_button">Download
PDF</a>
</p>


</section>

<style>

</style>



</div>
</div>
</section>

<footer class="mercon-footer">
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">

<div class="mercon-container">
<div class="mercon-footer-section">
<h3>Contact Us</h3>
<p>Email: <a href="mailto:mercon@uom.lk">mercon@uom.lk</a></p>
<p>Phone: <a href="https://wa.me/94112650301">+94112650301</a></p>
<p>Engineering Research Unit,<br> Faculty of Engineering,<br> University of Moratuwa,<br> Sri Lanka</p>
</div>

<div class="mercon-footer-section mercon-middle-section">
<h3>Quick Links</h3>
<ul>
<li><a href="./index.html">Home</a></li>
<li><a href="./program.html">Program</a></li>
<li><a href="./registration.html">Registration</a></li>
<li><a href="./call-for-papers.html">Call For Papers</a></li>
<li><a href="./workshops_updated.html">Workshops</a></li>
<li><a href="./special_sessions.html">Special Sessions</a></li>
<li><a href="./author-instructions.html">Author Instructions</a></li>
</ul>
</div>

<div class="mercon-footer-section">
<h3>Follow Us</h3>
<div class="mercon-social-icons">
<a href="https://www.facebook.com/pg/erumercon"><i class="fab fa-facebook"></i></a>
<a href="https://twitter.com/merconeru"><i class="fab fa-twitter"></i></a>
<a href="https://www.linkedin.com/showcase/erumercon"><i class="fab fa-linkedin"></i></a>
</div>
<div class="mercon-footer-logo">
<img src="./img/logo2025.png" alt="Mercon2025">
</div>
</div>
</div>

<div class="mercon-footer-bottom">
<p>&copy; 2025 NativeCode All rights reserved.</p>
</div>
</footer>

<script src="./scripts/navColorChange.js"></script>
<script src="./scripts/navbar.js"></script>
</body>

</html>
Binary file added img/Session details.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/Workshop Schedule.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/conference-schedule.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/keynote-speakers/Jason Mars 2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/workshop/workshop1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/workshop/workshop2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/workshop/workshop3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/workshop/workshop4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/workshop/workshop5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<!-- <li><a href="./program.html">Program</a></li> -->
<!-- <li><a href="./uc.html">Travel Information</a></li> -->
<li><a href="./registration.html">Registration</a></li>
<li><a href="./conferenceSchedule.html">Program</a></li>

</ul>
</li>
Expand Down
Loading