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 PyBay/assets/js/countdown-timer.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,4 @@ customElements.define('countdown-timer', CountdownTimer);


// Optional: export for test or bundling purposes
export default CountdownTimer;
export default CountdownTimer;
144 changes: 89 additions & 55 deletions PyBay/templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,13 @@
<link rel="stylesheet" href="{{
'/static/gen/styles.css'|asseturl }}">

<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css"
integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
<!-- Bootstrap 5.3.3 CSS -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">


<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.4.2/css/fontawesome.min.css"
integrity="sha384-BY+fdrpOd3gfeRvTSMT+VUZmA728cfF9Z2G42xpaRkUGu2i3DyzpTURDo5A6CaLK" crossorigin="anonymous">
<!-- Optional theme -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap-theme.min.css"
integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">


<!-- Primary Meta Tags --> <!-- this is the default metadata which all websites can draw on -->

Expand Down Expand Up @@ -108,27 +107,24 @@
}

/* Custom Nav Link Styles */
.navbar-custom {
background-color: #4B8BBE; /* Python blue */
}
.nav-link {
color: #00749E; /* Python yellow */
color: #FCD582; /* Python yellow */
font-weight: bold;

text-decoration: underline #00749E;
text-decoration: underline #FCD582;
text-decoration-thickness: 3px;
text-underline-offset: 10px;
text-decoration-style: wavy;
text-decoration-skip-ink: none;
transition: text-decoration-color 1000ms;
}
.nav-link:hover {
color: #00749E;
color: #FCD582;
text-decoration-color: #ff914d;
border-radius: 5px;
}
.nav-link:active {
color: #00749E;
color: #FCD582;
text-decoration-color: #ff914d;

border-radius: 5px;
Expand Down Expand Up @@ -254,52 +250,87 @@
clip-path: polygon(20% 0%, 0% 20%, 11% 52%, 0% 80%, 20% 100%, 49% 86%, 80% 100%, 100% 80%, 87% 50%, 100% 20%, 80% 0%, 45% 8%);
}
}
/* Match dropdown to navbar color and theme */
.dropdown-menu {
background-color: #00749E; /* same golden yellow, slightly more opaque */
border: none;
border-radius: 0;
box-shadow: none;
padding: 0.5rem 0;
font-weight: bold;
}

/* Style the dropdown items to match nav-link styling */
.dropdown-item {
color: rgba(252, 213, 130, 0.95) ; /* Python blue text */
padding: 0.5rem 1.25rem;
text-decoration: underline #00749E;
text-decoration-thickness: 2px;
text-underline-offset: 6px;
text-decoration-style: wavy;
background-color: transparent;
transition: text-decoration-color 0.3s ease;
}

.dropdown-item:hover,
.dropdown-item:focus {
background-color: rgba(255, 145, 77, 0.2); /* a soft orange glow */
text-decoration-color: #ff914d;
}

.dropdown-item:active {
background-color: rgba(255, 145, 77, 0.3);
}

</style>
</head>

<body>
<header style="background-color: #FCD582;">
<div class="container">
<nav class="navbar navbar-expand-lg bg-body-tertiary">
<div class="container-fluid">
<a class="navbar-brand" href="{{ site.get('/')|url }}" aria-label="pybay-logo" />
<!-- Bootstrap 5.3.3 JS Bundle (includes Popper.js) -->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>

<header class="navbar-custom">
<div class="container">
<nav class="navbar navbar-expand-lg navbar-light">
<div class="container-fluid">
<a class="navbar-brand" href="{{ site.get('/')|url }}" aria-label="pybay-logo">
<img src="/pybay-logo.png" alt="PyBay Conference Logo">
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse justify-content-end" id="navbarNav">

<ul class="nav navbar-nav">
{% for child in site.get('/').children|sort(attribute="short") %}
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

<div class="collapse navbar-collapse justify-content-end" id="navbarNav">
<ul class="navbar-nav ms-auto">
{% for child in site.get('/').children|sort(attribute="short") %}
{% if child.children %}
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="{{ child|url }}" role="button" data-bs-toggle="dropdown"
aria-expanded="false">
{{ child.short }}
</a>
<ul class="dropdown-menu">
{% for grandchild in child.children %}
<li><a class="dropdown-item" href="{{ grandchild|url }}">{{ grandchild.short }}</a></li>
{% endfor %}
</ul>
</li>
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" role="button" data-bs-toggle="dropdown" aria-expanded="false">
{{ child.short }}
</a>
<ul class="dropdown-menu">
{% for grandchild in child.children %}
<li><a class="dropdown-item" href="{{ grandchild|url }}">{{ grandchild.short }}</a></li>
{% endfor %}
</ul>
</li>
{% else %}
{% if child._id not in ['coming-soon', 'schedule'] %}
<li class="nav-item">
<a href="{{ child|url }}" class="nav-link">{{ child.short }}</a>
</li>
{% endif %}
{% if child._id not in ['coming-soon', 'schedule'] %}
<li class="nav-item">
<a href="{{ child|url }}" class="nav-link">{{ child.short }}</a>
</li>
{% endif %}
{% endif %}
{% endfor %}
</ul>
{% endfor %}
</ul>
</div>

</div>
</div>
</nav>
</div>
</header>

</nav>
</div>
</header>
<div class="body-wrapper">
{% block outerbody %}
<div class="container">
Expand Down Expand Up @@ -336,13 +367,9 @@

</footer>

<!-- Latest compiled and minified JavaScript -->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
crossorigin="anonymous"></script>

<script src="https://kit.fontawesome.com/f4feb5c95e.js" crossorigin="anonymous"></script>
<script type=text/javascript src="{{
'/static/gen/app.js'|asseturl }}" charset="utf-8"></script>
<script type=text/javascript src="{{ '/static/gen/app.js'|asseturl }}" charset="utf-8"></script>

<script>
const targetDate = new Date('2024-09-21T00:00:00');
Expand Down Expand Up @@ -378,4 +405,11 @@
const countdownInterval = setInterval(updateCountdown, 1000);
updateCountdown();
</script>
<script>
if (typeof bootstrap?.Dropdown === "function") {
console.log("Bootstrap Dropdown is loaded ✅");
} else {
console.warn("Bootstrap Dropdown is NOT loaded ❌");
}
</script>
</body>
Binary file added PyBay/webpack/images/waves.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions PyBay/webpack/images/waves.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions PyBay/webpack/js/main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// @ts-check

import "bootstrap";

import '../../assets/js/countdown-timer.js';
36 changes: 32 additions & 4 deletions PyBay/webpack/scss/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ $code-bg: #f8eff3;

body {
padding: 0;
background: lighten($gray, 20) url(../images/mesh.png);
// background: lighten($gray, 20) url(../images/mesh.png);
background-size: 256px 256px;
}

Expand Down Expand Up @@ -707,7 +707,7 @@ div.showcase {
display: block;
padding: 10px;
margin: 15px 0;
background: lighten($gray, 20) url(../images/mesh.png);
// background: lighten($gray, 20) url(../images/mesh.png);
background-size: 256px 256px;
text-decoration: none;
border-radius: 3px;
Expand Down Expand Up @@ -1062,13 +1062,14 @@ iframe[src*="player.vimeo.com"]{
}

.navbar-brand {
padding: 0px; /* firefox bug fix */
padding: 8px; /* firefox bug fix */
}
.navbar-brand>img {
height: auto; /* height: 100% was causing logo image distortion on Safari and mobile devices */
padding: 15px; /* firefox bug fix */
padding: 8px; /* firefox bug fix */
width: auto;
max-width: 240px;
max-height: 120px;
}

.icon-bar {
Expand Down Expand Up @@ -1105,3 +1106,30 @@ countdown-timer .label {
font-size: 0.8rem;
color: #666;
}
header.navbar-custom {
background: linear-gradient(135deg, #4BBEDC, hsl(195, 100%, 28%)) !important;
background-blend-mode: overlay;
background-size: cover;
background-repeat: no-repeat;
background-position: bottom;
z-index: 1055;
position: relative;
img {
background: url('../images/waves.png') repeat-x;
animation: wave-scroll 5s linear infinite;
background-size: cover;
width: 100%;
border-radius: 5px;
box-shadow: 0 0 6px fade-out($gray, 0.8);
}
@keyframes wave-scroll {
from {
background-position-x: 0;
}
to {
background-position-x: 1000px;
}
}
}

// background-image: url(../images/waves.png), ;