Skip to content
Draft
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 css/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ body {

code {
background: inherit;
color: $brand-2024-orange;
color: $brand-2026-orange; // ???
padding: 0;
}

Expand Down
15 changes: 11 additions & 4 deletions css/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion css/_cfp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
}

.sortable-ghost-class {
background-color: $brand-2024-blue;
background-color: $brand-2026-mid-blue;
}

.lottery-tickets {
Expand Down
2 changes: 1 addition & 1 deletion css/_footer.scss
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion css/_header.scss
Original file line number Diff line number Diff line change
@@ -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;
}
Expand Down
12 changes: 6 additions & 6 deletions css/_support.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
46 changes: 26 additions & 20 deletions css/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 */
Expand Down
16 changes: 8 additions & 8 deletions css/schedule.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
}
}
.filters {
background-color: $brand-2024-pale-green;
background-color: $brand-2026-light-blue;
margin-top: 1em;

h3 {
Expand All @@ -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;
}
}
Expand All @@ -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;
}

Expand Down Expand Up @@ -93,7 +93,7 @@
margin-bottom: 1em;

&.cfp {
border: 2px solid $brand-2024-pale-green;
border: 2px solid $brand-2026-light-blue;
}

.event-synopsis {
Expand Down Expand Up @@ -131,7 +131,7 @@
}

.speaker {
color: $brand-2024-yellow;
color: $brand-2026-yellow;
font-weight: bold;
}
}
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion css/volunteer_schedule.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Binary file added images/brand/2026/emf2026-logo-black.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions images/brand/2026/emf2026-logo-black.svg
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 images/brand/2026/emf2026-logo-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
87 changes: 87 additions & 0 deletions images/brand/2026/emf2026-logo-dark.svg
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 images/brand/2026/emf2026-logo-light-clipped.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading