Skip to content

Commit a71e328

Browse files
norkans7norkans7
committed
Adjust logo footer size
1 parent 7b21f15 commit a71e328

File tree

2 files changed

+595
-526
lines changed

2 files changed

+595
-526
lines changed

‎templates/base_admin_dashboard.html

Lines changed: 111 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,84 @@
11
{% extends "frame.html" %}
22
{% load smartmin i18n thumbnail ureport compress %}
3+
34
{% block styles %}
45
{% compress css %}
56
<link rel="stylesheet" href="{{ STATIC_URL }}css/tailwind.css">
67
{% endcompress %}
78
{% if is_rtl_org %}
89
{% compress css %}
9-
<link type="text/css"
10-
rel="stylesheet"
11-
href="{{ STATIC_URL }}css/bulma0.7.1.css">
12-
<link type="text/css"
13-
rel="stylesheet"
14-
href="{{ STATIC_URL }}css/bulma-rtl0.7.1.css">
15-
<link type="text/less"
16-
rel="stylesheet"
17-
href="{{ STATIC_URL }}less/styles.less">
10+
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}css/bulma0.7.1.css">
11+
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}css/bulma-rtl0.7.1.css">
12+
<link type="text/less" rel="stylesheet" href="{{ STATIC_URL }}less/styles.less">
1813
{% endcompress %}
1914
{% else %}
2015
{% compress css %}
2116
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}css/bulma.css">
22-
<link type="text/css"
23-
rel="stylesheet"
24-
href="{{ STATIC_URL }}css/Chart.min.css">
25-
<link type="text/less"
26-
rel="stylesheet"
27-
href="{{ STATIC_URL }}less/styles.less">
17+
<link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}css/Chart.min.css">
18+
<link type="text/less" rel="stylesheet" href="{{ STATIC_URL }}less/styles.less">
2819
{% endcompress %}
2920
{% endif %}
3021
<style type="text/css">
31-
table.list-table {
32-
font-size: 0.85rem;
33-
}
34-
35-
.row1 a, .row2 a {
36-
display: block;
37-
padding-left: 5px;
38-
39-
color: {{ org|config:'dark1_color'|default:'#439932' }};
40-
border-left: 5px solid {{ org|config:'dark1_color'|default:'#439932' }};
41-
}
42-
43-
.row1 a:hover, .row2 a:hover {
44-
background-color: #E6E7E8;
45-
color: {{ org|config:'dark1_color'|default:'#439932' }};
46-
}
47-
48-
.row1.inactive a, .row2.inactive a, {
22+
table.list-table {
23+
font-size: 0.85rem;
24+
}
25+
26+
.row1 a,
27+
.row2 a {
28+
display: block;
29+
padding-left: 5px;
30+
31+
color: {
32+
{
33+
org|config: 'dark1_color' |default:'#439932'
34+
}
35+
}
36+
37+
;
38+
39+
border-left: 5px solid {
40+
{
41+
org|config: 'dark1_color' |default:'#439932'
42+
}
43+
}
44+
45+
;
46+
}
47+
48+
.row1 a:hover,
49+
.row2 a:hover {
50+
background-color: #E6E7E8;
51+
52+
color: {
53+
{
54+
org|config: 'dark1_color' |default:'#439932'
55+
}
56+
}
57+
58+
;
59+
}
60+
61+
.row1.inactive a,
62+
.row2.inactive a,
63+
{
4964
border-left: 5px solid #bbb;
5065
padding-left: 5px;
51-
}
52-
53-
.row1.inactive a, .row2.inactive a, .row1.inactive td, .row2.inactive td {
54-
color: #ccc;
55-
}
56-
57-
.row1.inactive a:hover, .row2.inactive a:hover {
58-
color: #ccc;
59-
text-decoration: none;
60-
font-weight: normal;
61-
62-
}
66+
}
67+
68+
.row1.inactive a,
69+
.row2.inactive a,
70+
.row1.inactive td,
71+
.row2.inactive td {
72+
color: #ccc;
73+
}
74+
75+
.row1.inactive a:hover,
76+
.row2.inactive a:hover {
77+
color: #ccc;
78+
text-decoration: none;
79+
font-weight: normal;
80+
81+
}
6382
</style>
6483
{% endblock styles %}
6584
{% block body-content %}
@@ -72,13 +91,8 @@
7291
<div class="level">
7392
{% if is_rtl_org %}<div class="level-left"></div>{% endif %}
7493
<div class="{% if is_rtl_org %}level-right{% else %}level-left{% endif %}">
75-
<a href="{% url 'public.index' %}"
76-
style="justify-content: start"
77-
class="level-item has-text-black">
78-
<div style="{% if is_rtl_org %}margin-right:0;
79-
margin-left:1.25rem;
80-
{% endif %}"
81-
class="icon">
94+
<a href="{% url 'public.index' %}" style="justify-content: start" class="level-item has-text-black">
95+
<div style="{% if is_rtl_org %}margin-right:0; margin-left:1.25rem; {% endif %}" class="icon">
8296
<i class="{% if is_rtl_org %}fa-arrow-circle-right{% else %}fa-arrow-circle-left{% endif %} fas"></i>
8397
</div>
8498
{% trans "Back to Website" %}
@@ -93,17 +107,16 @@
93107
<div style="justify-content: start;" class="level-item square-logo">
94108
<div style="width:360px">
95109
{% if org|config:"has_new_brand" %}
96-
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
110+
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
97111
{% else %}
98-
{% thumbnail org.get_logo "x180" format="PNG" as im %}
99-
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
100-
{% endthumbnail %}
112+
{% thumbnail org.get_logo "x180" format="PNG" as im %}
113+
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
114+
{% endthumbnail %}
101115
{% endif %}
102116
</div>
103117
{% if org|config:"has_new_brand" %}
104-
<div class="flex-1 text-center font-bold flex-center-y mx-4 mt-4" style="font-family:'Noto Sans', sans-serif;">
105-
{{ org.name }}
106-
</div>
118+
<div class="flex-1 text-center font-bold flex-center-y mx-4 mt-4"
119+
style="font-family:'Noto Sans', sans-serif">{{ org.name }}</div>
107120
{% endif %}
108121
</div>
109122
</div>
@@ -117,19 +130,15 @@
117130
<br class="is-hidden-mobile">
118131
{{ request.user.username }}
119132
</div>
120-
<a href="{% url 'users.user_logout' %}?go=/"
121-
class="level-item button is-outlined logout-button">{% trans "Logout" %}</a>
133+
<a href="{% url 'users.user_logout' %}?go=/" class="level-item button is-outlined logout-button">{% trans "Logout" %}</a>
122134
{% else %}
123-
<a href="{% org_host_link %}{% url 'users.user_login' %}"
124-
class="level-item button is-outlined">{% trans "Login" %}</a>
135+
<a href="{% org_host_link %}{% url 'users.user_login' %}" class="level-item button is-outlined">{% trans "Login" %}</a>
125136
{% endif %}
126137
{% endblock login %}
127138
</div>
128139
{% if is_rtl_org %}
129140
<div class="level-right">
130-
<div style="justify-content: start;
131-
margin-right: 0rem"
132-
class="level-item square-logo">
141+
<div style="justify-content: start; margin-right: 0rem" class="level-item square-logo">
133142
<div style="width:360px">
134143
{% thumbnail org.get_logo "x180" format="PNG" as im %}
135144
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
@@ -271,7 +280,7 @@
271280
<li>
272281
<a href="{% url 'users.user_list' %}">
273282
<span class="icon">
274-
<img src="{{ STATIC_URL }}img/settings_icon.png" alt="" >
283+
<img src="{{ STATIC_URL }}img/settings_icon.png" alt="">
275284
</span>
276285
<span class="menu-link-title">{% trans "Users" %}</span>
277286
</a>
@@ -322,44 +331,50 @@
322331
{% block footer %}
323332
<!-- footer navbar -->
324333
<div class="md:grid md:grid-cols-3 grid grid-cols-1 gap-4 px-home mt-12 mb-3">
325-
<a href="{% url 'public.index' %}"
326-
class="md:block flex-1 text-center mb-2 hidden">
327-
<div style="max-width:360px">
328-
{% if org|config:"has_new_brand" %}
329-
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
330-
{% else %}
331-
{% thumbnail org.get_logo "x180" format="PNG" as im %}
332-
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
333-
{% endthumbnail %}
334-
{% endif %}
335-
</div>
334+
<a href="{% url 'public.index' %}" class="md:block flex-1 text-center mb-2 hidden">
335+
{% if org|config:"has_new_brand" %}
336+
<div style="max-width:220px">
337+
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo_footer.png" alt="{{ org.name }}" class="logo">
338+
</div>
339+
{% else %}
340+
<div style="max-width:360px">
341+
{% thumbnail org.get_logo "x180" format="PNG" as im %}
342+
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
343+
{% endthumbnail %}
344+
</div>
345+
{% endif %}
336346
</a>
337347
<div class="md:flex justify-center hidden">
338348
<div style="max-width:150px" class="md:block block">
339349
{% if org.language != "ar" and org.language != "ru" and org.language != "ch" and org.language != "fr" %}
340-
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_EN.png" class="md:-ml-0 -ml-2">
350+
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_EN.png" class="md:-ml-0 -ml-2" alt="">
341351
{% else %}
342-
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png" class="md:-ml-0 -ml-2">
352+
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png"
353+
class="md:-ml-0 -ml-2"
354+
alt="">
343355
{% endif %}
344356
</div>
345357
</div>
346-
<a href="{% url 'public.index' %}"
347-
class="md:hidden flex-1 text-center mb-6 inline-flex">
358+
<a href="{% url 'public.index' %}" class="md:hidden flex-1 text-center mb-6 inline-flex">
348359
<div style="width:180px">
349360
{% if org|config:"has_new_brand" %}
350361
<img src="{{ STATIC_URL }}/img/logos/UREPORT/U-Report_Logo.png" alt="{{ org.name }}" class="logo">
351362
{% else %}
352-
{% thumbnail org.get_logo "x180" format="PNG" as im %}
353-
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
354-
{% endthumbnail %}
363+
{% thumbnail org.get_logo "x180" format="PNG" as im %}
364+
<img src="{{ im.url }}" alt="{{ org.name }}" class="logo">
365+
{% endthumbnail %}
355366
{% endif %}
356367
</div>
357368
<div class="md:hidden flex flex-1 justify-end float-right">
358369
<div style="width:120px" class="md:block block">
359370
{% if org.language != "ar" and org.language != "ru" and org.language != "ch" and org.language != "fr" %}
360-
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_EN.png" class="md:-ml-0 -ml-2" alt="UNICEF logo">
371+
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_EN.png"
372+
class="md:-ml-0 -ml-2"
373+
alt="UNICEF logo">
361374
{% else %}
362-
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png" class="md:-ml-0 -ml-2" alt="UNICEF logo">
375+
<img src="{{ STATIC_URL }}/img/logos/UNICEF/UNICEF_logo_footer_{{ org.language|upper }}.png"
376+
class="md:-ml-0 -ml-2"
377+
alt="UNICEF logo">
363378
{% endif %}
364379
</div>
365380
</div>
@@ -368,40 +383,28 @@
368383
<div class="md:ml-6 font-bold text-2xl flex-center-y">
369384
<div>
370385
<a href="{% url 'public.opinions' %}"
371-
class="hover:text-gray-750 hover:border-dark1-v2024 pb-2 border-b-2 border-black">
372-
{% trans "Opinions" %}
373-
</a>
386+
class="hover:text-gray-750 hover:border-dark1-v2024 pb-2 border-b-2 border-black">{% trans "Opinions" %}</a>
374387
</div>
375388
</div>
376389
<div class="font-bold text-2xl ml-6 flex-center-y">
377390
<div>
378391
<a href="{% url 'public.stories' %}"
379-
class="hover:text-gray-750 hover:border-dark1-v2024 pb-2 border-b-2 border-black">
380-
{% trans "Stories" %}
381-
</a>
392+
class="hover:text-gray-750 hover:border-dark1-v2024 pb-2 border-b-2 border-black">{% trans "Stories" %}</a>
382393
</div>
383394
</div>
384395
</div>
385396
</div>
386397
<div class="md:grid grid-cols-2 gap-4 px-home mt-5 mb-12">
387398
<div class="text-sm font-bold">
388-
<a href="{% url 'public.about' %}"
389-
class="hover:text-gray-750 flex-initial py-menu">{% trans "About" %}</a>
390-
<a href="{% url 'public.ureporters' %}"
391-
class="md:ml-4 hover:text-gray-750 flex-initial py-menu">{% trans "Engagement" %}</a>
399+
<a href="{% url 'public.about' %}" class="hover:text-gray-750 flex-initial py-menu">{% trans "About" %}</a>
400+
<a href="{% url 'public.ureporters' %}" class="md:ml-4 hover:text-gray-750 flex-initial py-menu">{% trans "Engagement" %}</a>
392401
<a href="{% url 'public.bots' %}"
393-
class="{% if is_rtl_org %}md:mr-4{% else %}md:ml-4{% endif %} hover:text-gray-750 flex-initial py-menu">
394-
{% trans "Bots" %}
395-
</a>
402+
class="{% if is_rtl_org %}md:mr-4{% else %}md:ml-4{% endif %} hover:text-gray-750 flex-initial py-menu">{% trans "Bots" %}</a>
396403
<a href="{% url 'public.reports' %}"
397-
class="{% if is_rtl_org %}md:mr-4{% else %}md:ml-4{% endif %} hover:text-gray-750 flex-initial py-menu">
398-
{% trans "Reports" %}
399-
</a>
404+
class="{% if is_rtl_org %}md:mr-4{% else %}md:ml-4{% endif %} hover:text-gray-750 flex-initial py-menu">{% trans "Reports" %}</a>
400405
{% if org|config:"has_jobs" %}
401406
<a href="{% url 'public.jobs' %}"
402-
class="{% if is_rtl_org %}md:mr-4{% else %}md:ml-4{% endif %} hover:text-gray-750 flex-initial py-menu">
403-
{% trans "Jobs" %}
404-
</a>
407+
class="{% if is_rtl_org %}md:mr-4{% else %}md:ml-4{% endif %} hover:text-gray-750 flex-initial py-menu">{% trans "Jobs" %}</a>
405408
{% endif %}
406409
</div>
407410
<div class="md:justify-end flex text-sm font-bold">
@@ -429,14 +432,10 @@
429432
{% if show_login %}
430433
{% if request.user and request.user.is_authenticated %}
431434
<a href="{% url 'users.user_logout' %}?go=/"
432-
class="{% if is_rtl_org %}mr-4{% else %}ml-4{% endif %} hover:text-gray-750 flex-initial py-menu">
433-
{% trans "Logout" %}
434-
</a>
435+
class="{% if is_rtl_org %}mr-4{% else %}ml-4{% endif %} hover:text-gray-750 flex-initial py-menu">{% trans "Logout" %}</a>
435436
{% else %}
436437
<a href="{% org_host_link %}{% url 'users.user_login' %}"
437-
class="{% if is_rtl_org %}mr-4{% else %}ml-4{% endif %} hover:text-gray-750 flex-initial py-menu">
438-
{% trans "Login" %}
439-
</a>
438+
class="{% if is_rtl_org %}mr-4{% else %}ml-4{% endif %} hover:text-gray-750 flex-initial py-menu">{% trans "Login" %}</a>
440439
{% endif %}
441440
{% endif %}
442441
</div>

0 commit comments

Comments
 (0)