Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix homepage logo and event homepage styling #990

Merged
merged 1 commit into from
May 22, 2024
Merged

Fix homepage logo and event homepage styling #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
216 changes: 214 additions & 2 deletions static/source/css/event.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sans_font = Roboto
serif_font = 'Lora'
sans_font = 'Ergonomique'
serif_font = 'KGDropsofJupiter'
mint = #FF9400
gray = #4A4A4A

Expand Down Expand Up @@ -464,3 +464,215 @@ a, a:hover
font-size: 25px

@import "common"

/*
---------------
Custom Fonts
---------------
*/
@font-face
font-family: 'KGDropsofJupiter';
src: url('../fonts/KGDropsofJupiter.ttf');
src: local('KGDropsofJupiter'), local('KGDropsofJupiter'),
url('../fonts/KGDropsofJupiter.ttf') format('truetype');
font-weight: 300;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Light.eot');
src: local('Ergonomique Light'), local('Ergonomique-Light'),
url('../fonts/Ergonomique-Light.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Light.woff2') format('woff2'),
url('../fonts/Ergonomique-Light.woff') format('woff'),
url('../fonts/Ergonomique-Light.ttf') format('truetype');
font-weight: 300;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-ExtraLight.eot');
src: local('Ergonomique ExtraLight'), local('Ergonomique-ExtraLight'),
url('../fonts/Ergonomique-ExtraLight.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-ExtraLight.woff2') format('woff2'),
url('../fonts/Ergonomique-ExtraLight.woff') format('woff'),
url('../fonts/Ergonomique-ExtraLight.ttf') format('truetype');
font-weight: 200;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Bold.eot');
src: local('Ergonomique Bold'), local('Ergonomique-Bold'),
url('../fonts/Ergonomique-Bold.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Bold.woff2') format('woff2'),
url('../fonts/Ergonomique-Bold.woff') format('woff'),
url('../fonts/Ergonomique-Bold.ttf') format('truetype');
font-weight: bold;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Black.eot');
src: local('Ergonomique Black'), local('Ergonomique-Black'),
url('../fonts/Ergonomique-Black.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Black.woff2') format('woff2'),
url('../fonts/Ergonomique-Black.woff') format('woff'),
url('../fonts/Ergonomique-Black.ttf') format('truetype');
font-weight: 800;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-ThinItalic.eot');
src: local('Ergonomique Thin Italic'), local('Ergonomique-ThinItalic'),
url('../fonts/Ergonomique-ThinItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-ThinItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-ThinItalic.woff') format('woff'),
url('../fonts/Ergonomique-ThinItalic.ttf') format('truetype');
font-weight: 100;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Thin.eot');
src: local('Ergonomique Thin'), local('Ergonomique-Thin'),
url('../fonts/Ergonomique-Thin.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Thin.woff2') format('woff2'),
url('../fonts/Ergonomique-Thin.woff') format('woff'),
url('../fonts/Ergonomique-Thin.ttf') format('truetype');
font-weight: 100;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-LightItalic.eot');
src: local('Ergonomique Light Italic'), local('Ergonomique-LightItalic'),
url('../fonts/Ergonomique-LightItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-LightItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-LightItalic.woff') format('woff'),
url('../fonts/Ergonomique-LightItalic.ttf') format('truetype');
font-weight: 300;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Medium.eot');
src: local('Ergonomique Medium'), local('Ergonomique-Medium'),
url('../fonts/Ergonomique-Medium.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Medium.woff2') format('woff2'),
url('../fonts/Ergonomique-Medium.woff') format('woff'),
url('../fonts/Ergonomique-Medium.ttf') format('truetype');
font-weight: 500;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-MediumItalic.eot');
src: local('Ergonomique Medium Italic'), local('Ergonomique-MediumItalic'),
url('../fonts/Ergonomique-MediumItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-MediumItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-MediumItalic.woff') format('woff'),
url('../fonts/Ergonomique-MediumItalic.ttf') format('truetype');
font-weight: 500;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-SemiboldItalic.eot');
src: local('Ergonomique Semibold Italic'), local('Ergonomique-SemiboldItalic'),
url('../fonts/Ergonomique-SemiboldItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-SemiboldItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-SemiboldItalic.woff') format('woff'),
url('../fonts/Ergonomique-SemiboldItalic.ttf') format('truetype');
font-weight: 600;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-BoldItalic.eot');
src: local('Ergonomique Bold Italic'), local('Ergonomique-BoldItalic'),
url('../fonts/Ergonomique-BoldItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-BoldItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-BoldItalic.woff') format('woff'),
url('../fonts/Ergonomique-BoldItalic.ttf') format('truetype');
font-weight: bold;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Semibold.eot');
src: local('Ergonomique Semibold'), local('Ergonomique-Semibold'),
url('../fonts/Ergonomique-Semibold.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Semibold.woff2') format('woff2'),
url('../fonts/Ergonomique-Semibold.woff') format('woff'),
url('../fonts/Ergonomique-Semibold.ttf') format('truetype');
font-weight: 600;
font-style: normal;

@font-face
font-family: 'Ergonomique Ultra';
src: url('../fonts/Ergonomique-Ultra.eot');
src: local('Ergonomique Ultra'), local('Ergonomique-Ultra'),
url('../fonts/Ergonomique-Ultra.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Ultra.woff2') format('woff2'),
url('../fonts/Ergonomique-Ultra.woff') format('woff'),
url('../fonts/Ergonomique-Ultra.ttf') format('truetype');
font-weight: 900;
font-style: normal;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-BlackItalic.eot');
src: local('Ergonomique Black Italic'), local('Ergonomique-BlackItalic'),
url('../fonts/Ergonomique-BlackItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-BlackItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-BlackItalic.woff') format('woff'),
url('../fonts/Ergonomique-BlackItalic.ttf') format('truetype');
font-weight: 800;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Italic.eot');
src: local('Ergonomique Italic'), local('Ergonomique-Italic'),
url('../fonts/Ergonomique-Italic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Italic.woff2') format('woff2'),
url('../fonts/Ergonomique-Italic.woff') format('woff'),
url('../fonts/Ergonomique-Italic.ttf') format('truetype');
font-weight: normal;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-ExtraLightItalic.eot');
src: local('Ergonomique ExtraLight Italic'), local('Ergonomique-ExtraLightItalic'),
url('../fonts/Ergonomique-ExtraLightItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-ExtraLightItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-ExtraLightItalic.woff') format('woff'),
url('../fonts/Ergonomique-ExtraLightItalic.ttf') format('truetype');
font-weight: 200;
font-style: italic;

@font-face
font-family: 'Ergonomique';
src: url('../fonts/Ergonomique-Regular.eot');
src: local('Ergonomique Regular'), local('Ergonomique-Regular'),
url('../fonts/Ergonomique-Regular.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-Regular.woff2') format('woff2'),
url('../fonts/Ergonomique-Regular.woff') format('woff'),
url('../fonts/Ergonomique-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;

@font-face
font-family: 'Ergonomique Ultra';
src: url('../fonts/Ergonomique-UltraItalic.eot');
src: local('Ergonomique Ultra Italic'), local('Ergonomique-UltraItalic'),
url('../fonts/Ergonomique-UltraItalic.eot?#iefix') format('embedded-opentype'),
url('../fonts/Ergonomique-UltraItalic.woff2') format('woff2'),
url('../fonts/Ergonomique-UltraItalic.woff') format('woff'),
url('../fonts/Ergonomique-UltraItalic.ttf') format('truetype');
font-weight: 900;
font-style: italic;

4 changes: 1 addition & 3 deletions templates/event/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@
<meta property="og:title" content="{{ event.page_title }} on {{ event.date }}" />
<meta property="og:description" content="{{ event.page_description }}" />

<link rel="stylesheet" href="//brick.a.ssl.fastly.net/Lora:400,700,400i,700i/Roboto:300,400,300i,400i">
<link rel="stylesheet" type="text/css" href="{% static_rev 'css/event.css' %}">
<script type="text/javascript" src="{% static 'vendor/js/jquery.min.js' %}"></script>
<script type="text/javascript" src="{% static 'vendor/js/bootstrap.min.js' %}"></script>
<script type="text/javascript" src="{% static 'vendor/js/bootstrap.bundle.min.js' %}"></script>
<script type="text/javascript" src="{% static_rev 'js/event.js' %}"></script>

{% if event.page_main_color %}
Expand Down
2 changes: 1 addition & 1 deletion templates/global/menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<nav class="navbar navbar-expand-lg navbar-light bg-white" role="navigation">
<div class="container">
<a class="navbar-brand logo" href="{% url 'core:index' %}"><img src="{% static 'img/global/logo+.png' %}" alt="Django Girls" /></a>
<a class="navbar-brand logo" href="{% url 'core:index' %}"><img src="{% static 'img/global/logo.png' %}" alt="Django Girls" /></a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
Expand Down
Loading