Merge pull request DjangoGirls#1002 from amakarudze/layout

Fix grids and CSS for events and stories
amakarudze · May 23, 2024 · 1b60d32 · 1b60d32
2 parents 043f984 + 623453a
commit 1b60d32
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 35 deletions.
diff --git a/static/source/css/global.styl b/static/source/css/global.styl
@@ -277,7 +277,7 @@ span.highlighted-number
         padding: 0
         background: url('../img/global/krakow.png') no-repeat
         background-size: cover
-        width: calc(33% - 30px)
+        width: 90%
         height: 210px
         text-align: center
         color: white

diff --git a/templates/admin/organize/eventapplication/change_form.html b/templates/admin/organize/eventapplication/change_form.html
@@ -7,6 +7,7 @@
 {% endblock %}
 
 {% block object-tools %}
+  {% if original %}
     <div class="row mb-3">
         <h4 class="italic-title">{% trans "Triaging" %}</h4>
         <div class="box save-box">
@@ -30,5 +31,6 @@ <h4 class="italic-title">{% trans "Triaging" %}</h4>
           {% endif %}
         </div>
     </div>
+    {% endif %}
     {{ block.super }}
 {% endblock %}
diff --git a/templates/core/events.html b/templates/core/events.html
@@ -14,12 +14,13 @@ <h2>
                 </div>
             </div>
 
-            <div class="row">
-                {% for event in future_events %}
-                    {% include 'includes/_event.html' with event=event %}
-                    {% if forloop.counter|divisibleby:3 %}</div><div class="row">{% endif %}
-                {% endfor %}
-            </div>
+            {% for event in future_events %}
+                {% if forloop.first %}<div class="row">{% endif %}
+                <div class="col event">
+                    {% include 'includes/_event.html' with event=event %}</div>
+                {% if forloop.counter|divisibleby:3 %}</div><div class="row">{% endif %}
+                {% if forloop.last %}</div>{% endif %}
+            {% endfor %} 
 
             <section id="organize">
                 {% include 'includes/_no_event.html' %}
@@ -31,12 +32,13 @@ <h2>{% trans "Past events" %}</h2>
                 </div>
             </div>
 
-            <div class="row">
                 {% for event in past_events %}
-                    {% include 'includes/_event.html' with event=event %}
+                    {% if forloop.first %}<div class="row">{% endif %}
+                    <div class="col event">
+                        {% include 'includes/_event.html' with event=event %}</div>
                     {% if forloop.counter|divisibleby:3 %}</div><div class="row">{% endif %}
-                {% endfor %}
-            </div>
+                    {% if forloop.last %}</div>{% endif %}
+                {% endfor %} 
         </section>
     </div>
 {% endblock %}
diff --git a/templates/core/index.html b/templates/core/index.html
@@ -97,12 +97,13 @@ <h2>
 
             <div class="upcoming-events">
                 <div class="row-container">
-                    <div class="row">
                     {% for event in future_events %}
-                        {% include 'includes/_event.html' with event=event %}
+                      {% if forloop.first %}<div class="row">{% endif %}
+                      <div class="col event">
+                        {% include 'includes/_event.html' with event=event %}</div>
                         {% if forloop.counter|divisibleby:3 %}</div><div class="row">{% endif %}
-                    {% endfor %}
-                    </div>
+                          {% if forloop.last %}</div>{% endif %}
+                    {% endfor %}    
                 </div>
                 <div class="show-more"><a href="javascript:;">
                     {% blocktrans %}Show all {{ future_events_count }} upcoming events{% endblocktrans %} »
@@ -116,12 +117,13 @@ <h2>
                     <h2>{% trans "Badass Django Ladies" %}</h2>
                     <p>{% trans "Each week we try to introduce one badass lady who uses Python or Django and highlight her work:" %}</p>
 
-                    <div class="row">
                     {% for story in stories %}
-                        {% include 'includes/_story.html' with story=story %}
+                    {% if forloop.first %}<div class="row">{% endif %}
+                      <div class="col story">
+                        {% include 'includes/_story.html' with story=story %}</div>
+                      {% if forloop.counter|divisibleby:2 %}</div><div class="row">{% endif %}
+                      {% if forloop.last %}</div>{% endif %}
                     {% endfor %}
-                    </div>
-
                     <p><a href="{% url 'story:stories' %}">{% trans "Read all Django Stories" %} »</a></p>
                 </div>
                 <div class="col-md-6">

diff --git a/templates/event/menu.html b/templates/event/menu.html
@@ -1,22 +1,16 @@
 {% load core_tags i18n static %}
 
-<div class="navbar navbar-default" role="navigation">
+<div class="navbar navbar-expand-lg navbar-default" role="navigation">
   <div class="container">
-    <div class="navbar-header">
-      <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>
-        <span class="icon-bar"></span>
-      </button>
-      <div class="navbar-brand" href="/">
-          <a href="/"><img src="{% static 'img/logo.png' %}" width="200" alt="Django Girls" /></a>
-      </div>
-    </div>
-    <div class="navbar-collapse collapse">
-      <ul class="nav navbar-nav">
+    <a class="navbar-brand" href="/"><img src="{% static 'img/logo.png' %}" width="200" alt="Django Girls" /></a>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent">{% trans "Toggle navigation" %}
+      <span class="navbar-toggler-icon"></span>
+    </button>
+
+    <div class="navbar-collapse collapse" id="navbarSupportedContent">
+      <ul class="navbar-nav ms-auto mb-2 mb-lg-0">
         {% for item in menu %}
-        <li><a href="{% build_menu_item_url item.url event.page_url %}">{{ item.title }}</a></li>
+        <li class="nav-item px-2"><a href="{% build_menu_item_url item.url event.page_url %}">{{ item.title }}</a></li>
         {% endfor %}
       </ul>
     </div><!--/.nav-collapse -->

diff --git a/templates/global/menu.html b/templates/global/menu.html
@@ -3,7 +3,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>
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false">{% trans "Toggle navigation" %}
         <span class="navbar-toggler-icon"></span>
         </button>
         <div class="collapse navbar-collapse" id="navbarSupportedContent">