Skip to content

Commit

Permalink
Switch to use new header logo
Browse files Browse the repository at this point in the history
  • Loading branch information
norkans7 committed Jan 5, 2024
1 parent b585ea1 commit a22d6c0
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 2 deletions.
Binary file added static/img/U-Report_Logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions templates/base_admin_dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,19 @@
<div class="level-left">
<div style="justify-content: start;" class="level-item square-logo">
<div style="width:360px">
{% if org|config:"has_new_brand" %}
<img src="{{ STATIC_URL }}/img/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
{% else %}
{% thumbnail org.get_logo "x180" format="PNG" as im %}
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
{% endthumbnail %}
{% endif %}
</div>
{% if org|config:"has_new_brand" %}
<div class="flex-1 text-center font-bold text-2xl flex-center-y mx-4 mt-8" style="font-family:'Noto Sans', sans-serif;">
{{ org.name }}
</div>
{% endif %}
</div>
</div>
{% endif %}
Expand Down
38 changes: 36 additions & 2 deletions templates/public_base.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@
{% endthumbnail %}
{% endblock meta-extra %}
<!-- Google fonts we use -->
<link href="https://fonts.googleapis.com/css?family=Livvic:300,400,700|Montserrat:300,400,700&display=swap"
rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Livvic:wght@300;400;700&family=Montserrat:wght@300;400;700&family=Noto+Sans:ital,wght@0,400;0,700;1,400&display=swap" rel="stylesheet">
<!-- Font awesome icons -->
<link rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.13.0/css/all.min.css">
Expand Down Expand Up @@ -595,6 +594,40 @@
</div>
</ul>
<!-- header menu -->
{% if org|config:"has_new_brand" %}
<div class="md:flex max-w-page mx-auto justify-around mt-5 mb-12 hidden border-b pb-6">
<a href="{% url 'public.index' %}" class="flex-initial text-center">
<div style="width:360px">
<img src="{{ STATIC_URL }}/img/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
</div>
</a>
<div class="flex-1 text-center font-bold text-2xl flex-center-y" style="font-family:'Noto Sans', sans-serif;">
<a href="{% url 'public.index' %}" class="flex-initial text-center">
{{ org.name }}
</a>
</div>
<div class="md:flex flex-1">
<div class="flex-1 text-center font-bold text-2xl flex-center-y">
<div>
<a href="{% url 'public.opinions' %}"
class="hover:text-gray-750 hover:border-dark1 pb-2 border-b-2 border-black">
{% trans "Opinions" %}
</a>
</div>
</div>

<div class="flex-1 text-center font-bold text-2xl flex-center-y">
<div>
<a href="{% url 'public.stories' %}"
class="hover:text-gray-750 hover:border-dark1 pb-2 border-b-2 border-black">
{% trans "Stories" %}
</a>
</div>
</div>
</div>
</div>

{% else %}
<div class="md:flex max-w-page mx-auto justify-around mt-5 mb-12 px-home hidden border-b pb-6">
<div class="flex-1 text-center font-bold text-2xl flex-center-y">
<div>
Expand All @@ -620,6 +653,7 @@
</div>
</div>
</div>
{% endif %}
</div>
<!-- mobile header -->
<div class="md:hidden block">
Expand Down

0 comments on commit a22d6c0

Please sign in to comment.