Merge pull request #993 from amakarudze/new-layout

Fix fonts issue for events base
DjangoGirls · May 22, 2024 · db6af92 · db6af92
2 parents 6fc686c + d40c4aa
commit db6af92
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/static/source/css/event.styl b/static/source/css/event.styl
@@ -166,15 +166,13 @@ a, a:hover
             font-size: 60px
             color: white
             line-height: 60px
-            font-style: italic
             margin-bottom: 20px
 
         h2
             font-family: serif_font
             font-size: 40px
             color: #E7E7E7
             line-height: 40px
-            font-style: italic
 
 #newsletter
     .facebook

diff --git a/templates/event/base.html b/templates/event/base.html
@@ -28,9 +28,10 @@
   <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/bootstrap.bundle.min.js' %}"></script>
   <script type="text/javascript" src="{% static 'vendor/js/jquery.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 %}

diff --git a/templates/event/menu.html b/templates/event/menu.html
@@ -1,9 +1,9 @@
 {% load core_tags i18n static %}
 
-<div class="navbar navbar-default" role="navigation">
+<div class="navbar navbar-expand-lg navbar-light bg-white" role="navigation">
   <div class="container">
     <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+      <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-bs-target=".navbar-collapse">
         <span class="sr-only">{% trans "Toggle navigation" %}</span>
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>