diff --git a/css/_base.scss b/css/_base.scss
index cc62df6ab..c0da6af9a 100644
--- a/css/_base.scss
+++ b/css/_base.scss
@@ -22,7 +22,7 @@ body {
code {
background: inherit;
- color: $brand-2024-orange;
+ color: $brand-2026-orange; // ???
padding: 0;
}
diff --git a/css/_buttons.scss b/css/_buttons.scss
index b7ac12c50..820bf8d30 100644
--- a/css/_buttons.scss
+++ b/css/_buttons.scss
@@ -2,17 +2,24 @@
@use "./_variables.scss" as *;
.btn-primary {
- background-color: color.adjust($brand-2024-blue, $lightness: -20%);
- border: 1px solid color.adjust($brand-2024-blue, $lightness: -40%);
+ background-color: color.adjust($brand-2026-orange, $lightness: -10%);
+ border: 1px solid color.adjust($brand-2026-orange, $lightness: -40%);
+}
+
+.nav-pills > li.active > a,
+.nav-pills > li.active > a:hover,
+.nav-pills > li.active > a:focus {
+ background-color: color.adjust($brand-2026-orange, $lightness: -10%);
}
.btn-primary:hover,
.btn-primary:focus,
.btn-primary:active,
+.btn-primary:active:hover,
.btn-primary.active,
.open > .dropdown-toggle.btn-primary {
- background-color: color.adjust($brand-2024-blue, $lightness: -30%);
- border: 1px solid color.adjust($brand-2024-blue, $lightness: -50%);
+ background-color: color.adjust($brand-2026-orange, $lightness: -30%);
+ border: 1px solid color.adjust($brand-2026-orange, $lightness: -50%);
}
.btn-default {
diff --git a/css/_cfp.scss b/css/_cfp.scss
index 783a9faff..ecde1a1fa 100644
--- a/css/_cfp.scss
+++ b/css/_cfp.scss
@@ -55,7 +55,7 @@
}
.sortable-ghost-class {
- background-color: $brand-2024-blue;
+ background-color: $brand-2026-mid-blue;
}
.lottery-tickets {
diff --git a/css/_footer.scss b/css/_footer.scss
index a8267007e..14f025b9b 100644
--- a/css/_footer.scss
+++ b/css/_footer.scss
@@ -1,7 +1,7 @@
@use "./_variables.scss" as *;
footer {
- background: url("../images/brand/2024/header-2.png") left bottom/60%;
+ background: $brand-2026-tiling 0 -630px / 100%;
overflow: hidden;
padding: 10px 15px 0px 15px;
border-top: 1px solid #272827;
diff --git a/css/_header.scss b/css/_header.scss
index 6faba8c71..88ff72739 100644
--- a/css/_header.scss
+++ b/css/_header.scss
@@ -1,7 +1,7 @@
@use "./_variables.scss" as *;
header {
- background: url("../images/brand/2024/header-2.png") left top/60%;
+ background: $brand-2026-tiling 0 -90px / 100%;
background-color: $main-background;
padding: 10px 15px 0px 15px;
}
diff --git a/css/_support.scss b/css/_support.scss
index 6e391052d..75b502361 100644
--- a/css/_support.scss
+++ b/css/_support.scss
@@ -57,20 +57,20 @@
}
.support-option--volunteer > .panel-heading {
- background-color: $brand-2024-pale-green;
- border-color: $brand-2024-pale-green;
+ background-color: $brand-2026-green;
+ border-color: $brand-2026-green;
color: $highlight-background-text;
}
.support-option--sponsor > .panel-heading {
- background-color: $brand-2024-blue;
- border-color: $brand-2024-blue;
+ background-color: $brand-2026-mid-blue;
+ border-color: $brand-2026-mid-blue;
color: $highlight-background-text;
}
.support-option--art > .panel-heading {
- background-color: $brand-2024-pink;
- border-color: $brand-2024-pink;
+ background-color: $brand-2026-coral;
+ border-color: $brand-2026-coral;
color: #fff;
}
}
diff --git a/css/_variables.scss b/css/_variables.scss
index d330dac86..a66b0b4e3 100644
--- a/css/_variables.scss
+++ b/css/_variables.scss
@@ -10,27 +10,33 @@ $header-collapse-width: 500px;
$header-font-stack: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
$body-font-stack: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-$brand-2024-pale-green: #afc944;
-$brand-2024-mid-green: #528329;
-$brand-2024-dark-green: #213018;
-$brand-2024-yellow: #f9e200;
-$brand-2024-orange: #f77f02;
-$brand-2024-pink: #f55089;
-$brand-2024-blue: #2eadd9;
-
-$desaturated-yellow: color.adjust($brand-2024-yellow, $lightness: -10%);
+$brand-2026-orange: #f77f02;
+$brand-2026-coral: #f5515e;
+$brand-2026-yellow: #f9e200;
+$brand-2026-green: #2ae28c;
+$brand-2026-light-blue: #2eadd9;
+$brand-2026-mid-blue: #005d96;
+$brand-2026-dark-blue: #000730;
+
+$brand-2026-tiling: image-set(
+ url("../images/brand/2026/tiling.jxl") type("image/jxl"),
+ url("../images/brand/2026/tiling.avif") type("image/avif"),
+ url("../images/brand/2026/tiling.jpg") type("image/jpeg")
+);
+
+$desaturated-yellow: color.adjust($brand-2026-yellow, $lightness: -10%);
$body-background: #272827;
$body-background-shadow: #060606;
-$main-background: $brand-2024-dark-green;
+$main-background: #0f0f0f;
$main-background-text: #d8d8d8;
$main-background-header: #ffffff;
-$content-well-background: $brand-2024-mid-green;
+$content-well-background: $brand-2026-mid-blue;
$main-link: $main-background-text;
-$main-link-hover: $brand-2024-blue;
+$main-link-hover: $brand-2026-orange;
/* Styles for "highlight" elements (wells and panels) */
$highlight-background: #cfccc0;
@@ -40,27 +46,27 @@ $highlight-2-background: #d6c8a0;
$highlight-2-border: #bfaa7f;
$highlight-2-background-hover: $desaturated-yellow;
-$highlight-3-background: $brand-2024-pale-green;
-$highlight-3-border: $brand-2024-mid-green;
+$highlight-3-background: $brand-2026-light-blue;
+$highlight-3-border: $brand-2026-mid-blue;
$highlight-3-background-hover: $desaturated-yellow;
$schedule-text: #d5d6da;
-$schedule-block: $brand-2024-mid-green;
+$schedule-block: $brand-2026-mid-blue;
-$form-element: color.adjust($brand-2024-yellow, $lightness: +45%);
+$form-element: color.adjust($brand-2026-yellow, $lightness: +45%);
/* Alert/button element colours */
-$success-background: $brand-2024-mid-green;
+$success-background: $brand-2026-green;
$success-text: #fff;
-$info-background: color.adjust($brand-2024-blue, $lightness: -15%);
+$info-background: $brand-2026-dark-blue;
$info-text: #fff;
-$warning-background: color.adjust($brand-2024-orange, $lightness: -20%);
+$warning-background: color.adjust($brand-2026-orange, $lightness: -20%);
$warning-text: #fff;
-$danger-background: color.adjust($brand-2024-pink, $lightness: -40%);
+$danger-background: color.adjust($brand-2026-coral, $lightness: -40%);
$danger-text: #fff;
/* Borders */
diff --git a/css/schedule.scss b/css/schedule.scss
index 11d376c86..02411bfa0 100644
--- a/css/schedule.scss
+++ b/css/schedule.scss
@@ -8,7 +8,7 @@
}
}
.filters {
- background-color: $brand-2024-pale-green;
+ background-color: $brand-2026-light-blue;
margin-top: 1em;
h3 {
@@ -20,12 +20,12 @@
.panel-title {
display: flex;
justify-content: space-between;
- background-color: $brand-2024-pale-green;
+ background-color: $brand-2026-light-blue;
border: none;
}
.panel-heading {
- background-color: $brand-2024-pale-green;
+ background-color: $brand-2026-light-blue;
border: none;
}
}
@@ -34,7 +34,7 @@
border-bottom: 2px solid #fff;
padding-bottom: 2px;
position: sticky;
- background: $brand-2024-dark-green;
+ background: $brand-2026-dark-blue;
top: 0;
}
@@ -93,7 +93,7 @@
margin-bottom: 1em;
&.cfp {
- border: 2px solid $brand-2024-pale-green;
+ border: 2px solid $brand-2026-light-blue;
}
.event-synopsis {
@@ -131,7 +131,7 @@
}
.speaker {
- color: $brand-2024-yellow;
+ color: $brand-2026-yellow;
font-weight: bold;
}
}
@@ -150,14 +150,14 @@
}
.btn-warning {
- background-color: $brand-2024-yellow;
+ background-color: $brand-2026-yellow;
color: #151735;
font-weight: bold;
border: none;
}
.btn-warning:active {
- background-color: $brand-2024-yellow;
+ background-color: $brand-2026-yellow;
color: #151735;
font-weight: bold;
border: none;
diff --git a/css/volunteer_schedule.scss b/css/volunteer_schedule.scss
index 3e13cf40d..fb18a1796 100644
--- a/css/volunteer_schedule.scss
+++ b/css/volunteer_schedule.scss
@@ -43,7 +43,7 @@ table.shifts-table tbody td.mobile-only {
.overtime {
font-weight: bold;
- color: $brand-2024-pink;
+ color: $brand-2026-coral;
}
ul.shift-status {
diff --git a/images/brand/2026/emf2026-logo-black.png b/images/brand/2026/emf2026-logo-black.png
new file mode 100644
index 000000000..e65a3a572
Binary files /dev/null and b/images/brand/2026/emf2026-logo-black.png differ
diff --git a/images/brand/2026/emf2026-logo-black.svg b/images/brand/2026/emf2026-logo-black.svg
new file mode 100644
index 000000000..8a16fbb1c
--- /dev/null
+++ b/images/brand/2026/emf2026-logo-black.svg
@@ -0,0 +1,15 @@
+
+
\ No newline at end of file
diff --git a/images/brand/2026/emf2026-logo-dark.png b/images/brand/2026/emf2026-logo-dark.png
new file mode 100644
index 000000000..410c0b4a1
Binary files /dev/null and b/images/brand/2026/emf2026-logo-dark.png differ
diff --git a/images/brand/2026/emf2026-logo-dark.svg b/images/brand/2026/emf2026-logo-dark.svg
new file mode 100644
index 000000000..829b8e182
--- /dev/null
+++ b/images/brand/2026/emf2026-logo-dark.svg
@@ -0,0 +1,87 @@
+
+
\ No newline at end of file
diff --git a/images/brand/2026/emf2026-logo-light-clipped.png b/images/brand/2026/emf2026-logo-light-clipped.png
new file mode 100644
index 000000000..96be094f2
Binary files /dev/null and b/images/brand/2026/emf2026-logo-light-clipped.png differ
diff --git a/images/brand/2026/emf2026-logo-light-clipped.svg b/images/brand/2026/emf2026-logo-light-clipped.svg
new file mode 100644
index 000000000..e3ceff74b
--- /dev/null
+++ b/images/brand/2026/emf2026-logo-light-clipped.svg
@@ -0,0 +1,179 @@
+
+
diff --git a/images/brand/2026/emf2026-logo-light.png b/images/brand/2026/emf2026-logo-light.png
new file mode 100644
index 000000000..b863fe755
Binary files /dev/null and b/images/brand/2026/emf2026-logo-light.png differ
diff --git a/images/brand/2026/emf2026-logo-light.svg b/images/brand/2026/emf2026-logo-light.svg
new file mode 100644
index 000000000..1b7e11761
--- /dev/null
+++ b/images/brand/2026/emf2026-logo-light.svg
@@ -0,0 +1,78 @@
+
+
\ No newline at end of file
diff --git a/images/brand/2026/emf2026-logo-white.png b/images/brand/2026/emf2026-logo-white.png
new file mode 100644
index 000000000..79f14d618
Binary files /dev/null and b/images/brand/2026/emf2026-logo-white.png differ
diff --git a/images/brand/2026/emf2026-logo-white.svg b/images/brand/2026/emf2026-logo-white.svg
new file mode 100644
index 000000000..717473a8b
--- /dev/null
+++ b/images/brand/2026/emf2026-logo-white.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/images/brand/2026/emf2026-logomark-black.png b/images/brand/2026/emf2026-logomark-black.png
new file mode 100644
index 000000000..f49d650e5
Binary files /dev/null and b/images/brand/2026/emf2026-logomark-black.png differ
diff --git a/images/brand/2026/emf2026-logomark-black.svg b/images/brand/2026/emf2026-logomark-black.svg
new file mode 100644
index 000000000..f9d20dce4
--- /dev/null
+++ b/images/brand/2026/emf2026-logomark-black.svg
@@ -0,0 +1,52 @@
+
+
\ No newline at end of file
diff --git a/images/brand/2026/emf2026-logomark-dark-twocolour.png b/images/brand/2026/emf2026-logomark-dark-twocolour.png
new file mode 100644
index 000000000..9c31913de
Binary files /dev/null and b/images/brand/2026/emf2026-logomark-dark-twocolour.png differ
diff --git a/images/brand/2026/emf2026-logomark-dark-twocolour.svg b/images/brand/2026/emf2026-logomark-dark-twocolour.svg
new file mode 100644
index 000000000..bc9d54949
--- /dev/null
+++ b/images/brand/2026/emf2026-logomark-dark-twocolour.svg
@@ -0,0 +1,56 @@
+
+
\ No newline at end of file
diff --git a/images/brand/2026/emf2026-logomark-dark.png b/images/brand/2026/emf2026-logomark-dark.png
new file mode 100644
index 000000000..c4d63ae4c
Binary files /dev/null and b/images/brand/2026/emf2026-logomark-dark.png differ
diff --git a/images/brand/2026/emf2026-logomark-dark.svg b/images/brand/2026/emf2026-logomark-dark.svg
new file mode 100644
index 000000000..52c377f8e
--- /dev/null
+++ b/images/brand/2026/emf2026-logomark-dark.svg
@@ -0,0 +1,150 @@
+
+
\ No newline at end of file
diff --git a/images/brand/2026/emf2026-logomark-light-twocolour.png b/images/brand/2026/emf2026-logomark-light-twocolour.png
new file mode 100644
index 000000000..e9c6333c1
Binary files /dev/null and b/images/brand/2026/emf2026-logomark-light-twocolour.png differ
diff --git a/images/brand/2026/emf2026-logomark-light-twocolour.svg b/images/brand/2026/emf2026-logomark-light-twocolour.svg
new file mode 100644
index 000000000..5d4dcc526
--- /dev/null
+++ b/images/brand/2026/emf2026-logomark-light-twocolour.svg
@@ -0,0 +1,60 @@
+
+
\ No newline at end of file
diff --git a/images/brand/2026/emf2026-logomark-light.png b/images/brand/2026/emf2026-logomark-light.png
new file mode 100644
index 000000000..bc7bf7a31
Binary files /dev/null and b/images/brand/2026/emf2026-logomark-light.png differ
diff --git a/images/brand/2026/emf2026-logomark-light.svg b/images/brand/2026/emf2026-logomark-light.svg
new file mode 100644
index 000000000..88ad914fe
--- /dev/null
+++ b/images/brand/2026/emf2026-logomark-light.svg
@@ -0,0 +1,135 @@
+
+
\ No newline at end of file
diff --git a/images/brand/2026/emf2026-logomark-white.png b/images/brand/2026/emf2026-logomark-white.png
new file mode 100644
index 000000000..6f6c2e63f
Binary files /dev/null and b/images/brand/2026/emf2026-logomark-white.png differ
diff --git a/images/brand/2026/emf2026-logomark-white.svg b/images/brand/2026/emf2026-logomark-white.svg
new file mode 100644
index 000000000..1bde898cc
--- /dev/null
+++ b/images/brand/2026/emf2026-logomark-white.svg
@@ -0,0 +1,56 @@
+
+
\ No newline at end of file
diff --git a/images/brand/2026/hero-black.avif b/images/brand/2026/hero-black.avif
new file mode 100644
index 000000000..883b5fd04
Binary files /dev/null and b/images/brand/2026/hero-black.avif differ
diff --git a/images/brand/2026/hero-black.jpg b/images/brand/2026/hero-black.jpg
new file mode 100644
index 000000000..ea8ed07c7
Binary files /dev/null and b/images/brand/2026/hero-black.jpg differ
diff --git a/images/brand/2026/hero-black.jxl b/images/brand/2026/hero-black.jxl
new file mode 100644
index 000000000..32f076e9a
Binary files /dev/null and b/images/brand/2026/hero-black.jxl differ
diff --git a/images/brand/2026/hero-colourless.avif b/images/brand/2026/hero-colourless.avif
new file mode 100644
index 000000000..724846ec4
Binary files /dev/null and b/images/brand/2026/hero-colourless.avif differ
diff --git a/images/brand/2026/hero-colourless.jpg b/images/brand/2026/hero-colourless.jpg
new file mode 100644
index 000000000..37110316a
Binary files /dev/null and b/images/brand/2026/hero-colourless.jpg differ
diff --git a/images/brand/2026/hero-colourless.jxl b/images/brand/2026/hero-colourless.jxl
new file mode 100644
index 000000000..8059cf7a1
Binary files /dev/null and b/images/brand/2026/hero-colourless.jxl differ
diff --git a/images/brand/2026/tiling.avif b/images/brand/2026/tiling.avif
new file mode 100644
index 000000000..1cc345fcc
Binary files /dev/null and b/images/brand/2026/tiling.avif differ
diff --git a/images/brand/2026/tiling.jpg b/images/brand/2026/tiling.jpg
new file mode 100644
index 000000000..0796ead2d
Binary files /dev/null and b/images/brand/2026/tiling.jpg differ
diff --git a/images/brand/2026/tiling.jxl b/images/brand/2026/tiling.jxl
new file mode 100644
index 000000000..224b21868
Binary files /dev/null and b/images/brand/2026/tiling.jxl differ
diff --git a/templates/_nav.html b/templates/_nav.html
index 6b1c6da4d..dc40bbf6f 100644
--- a/templates/_nav.html
+++ b/templates/_nav.html
@@ -1,6 +1,6 @@