Skip to content

Commit 7ab4cab

Browse files
tudoramarieitudoramariei
committed
Update CSS
- labels & some design issues
1 parent b8c2a5a commit 7ab4cab

File tree

6 files changed

+93
-62
lines changed

6 files changed

+93
-62
lines changed

‎backend/static_extras/css/main.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backend/static_extras/css/main.less

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,14 @@ footer {
313313
}
314314
}
315315

316+
.subtle-link {
317+
color: @secondary-color;
318+
319+
&:hover {
320+
color: @link-color;
321+
}
322+
}
323+
316324
.deadline {
317325
background-color: @brand-primary;
318326
color: #000;

‎backend/templates/v1/all-ngos.html

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,59 @@
1-
21
{% extends "base.html" %}
32

43
{% block assets %}
5-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/easy-autocomplete/1.3.5/easy-autocomplete.min.css" />
4+
<link
5+
rel="stylesheet"
6+
href="https://cdnjs.cloudflare.com/ajax/libs/easy-autocomplete/1.3.5/easy-autocomplete.min.css"/>
67
{% endblock %}
78

89

910
{% block content %}
10-
<div class="container">
11+
<div class="container">
1112

12-
<div id="homepage-container" class="jumbotron text-center">
13-
<h1>Organizații pentru care poți redirecționa 3.5%</h1>
14-
</div>
13+
<div id="homepage-container" class="jumbotron text-center">
14+
<h1>Organizații pentru care poți redirecționa 3.5%</h1>
15+
</div>
1516

16-
<div class="row">
17-
<div class="col-xs-12 col-md-10 col-md-offset-1 search-bar-container">
18-
<input id="search-bar" type="text" placeholder="Caută un ONG" />
17+
<div class="row">
18+
<div class="col-xs-12 col-md-10 col-md-offset-1 search-bar-container">
19+
<input id="search-bar" type="text" placeholder="Caută un ONG" aria-label="Caută un ONG"/>
20+
</div>
1921
</div>
20-
</div>
2122

22-
<div class="row text-center">
23-
{% for ngo in ngos %}
24-
<div class="col-xs-6 col-sm-4 col-md-3">
25-
<div class="ong-panel panel panel-default">
26-
<a href="{{ ngo.slug }}">
27-
{% if ngo and ngo.logo %}
28-
{% set logo = ngo.logo.url %}
29-
{% elif ngo and ngo.logo_url %}
30-
{% set logo = ngo.logo_url %}
31-
{% else %}
32-
{% set logo = default_ngo_logo %}
33-
{% endif %}
34-
<div class="ong-logo">
35-
<img src="{{ logo }}" class="img-responsive center-block" alt="{{ ngo.name }} logo" />
23+
<div class="row text-center">
24+
{% for ngo in ngos %}
25+
<div class="col-xs-6 col-sm-4 col-md-3">
26+
<div class="ong-panel panel panel-default">
27+
<a href="{{ ngo.slug }}">
28+
{% if ngo and ngo.logo %}
29+
{% set logo = ngo.logo.url %}
30+
{% elif ngo and ngo.logo_url %}
31+
{% set logo = ngo.logo_url %}
32+
{% else %}
33+
{% set logo = default_ngo_logo %}
34+
{% endif %}
35+
<div class="ong-logo">
36+
<img src="{{ logo }}" class="img-responsive center-block" alt="{{ ngo.name }} logo"/>
37+
</div>
38+
<div class="panel-heading">{{ ngo.name }}</div>
39+
</a>
40+
<div class="panel-body">
41+
{{ " ".join(ngo.description.split()[:11]) + " ..." }}
3642
</div>
37-
<div class="panel-heading">{{ ngo.name }}</div>
38-
</a>
39-
<div class="panel-body">
40-
{{ " ".join(ngo.description.split()[:11]) + " ..." }}
4143
</div>
4244
</div>
43-
</div>
44-
{% endfor %}
45-
</div>
45+
{% endfor %}
46+
</div>
4647

47-
<hr>
48-
{% include "components/for-ngos.html" %}
48+
<hr>
49+
{% include "components/for-ngos.html" %}
4950

50-
</div>
51+
</div>
5152

5253
{% endblock %}
5354

5455
{% block scripts %}
55-
<script src="https://cdnjs.cloudflare.com/ajax/libs/easy-autocomplete/1.3.5/jquery.easy-autocomplete.min.js"></script>
56+
<script
57+
src="https://cdnjs.cloudflare.com/ajax/libs/easy-autocomplete/1.3.5/jquery.easy-autocomplete.min.js"></script>
5658
<script src="{{ static('js/search.js') }}"></script>
5759
{% endblock %}

‎backend/templates/v1/footer.html

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,42 @@
66
<div class="col-lg-12">
77
<ul class="social">
88
<li>
9-
<a href="https://www.facebook.com/code4romania" target="_blank">
9+
<a
10+
href="https://www.facebook.com/code4romania"
11+
target="_blank"
12+
aria-label="Link către contul de Facebook al organizației">
1013
<i class="fa fa-facebook" aria-hidden="true"></i>
1114
</a>
1215
</li>
1316
<li>
14-
<a href="https://www.instagram.com/code4romania" target="_blank">
17+
<a
18+
href="https://www.instagram.com/code4romania"
19+
target="_blank"
20+
aria-label="Link către contul de Instagram al organizației">
1521
<i class="fa fa-instagram" aria-hidden="true"></i>
1622
</a>
1723
</li>
1824
<li>
19-
<a href="https://twitter.com/Code4Romania" target="_blank">
25+
<a
26+
href="https://twitter.com/Code4Romania"
27+
target="_blank"
28+
aria-label="Link către contul de Twitter al organizației">
2029
<i class="fa fa-twitter" aria-hidden="true"></i>
2130
</a>
2231
</li>
2332
<li>
24-
<a href="https://github.com/code4romania/redirectioneaza" target="_blank">
33+
<a
34+
href="https://github.com/code4romania/redirectioneaza"
35+
target="_blank"
36+
aria-label="Link către contul de Github al organizației">
2537
<i class="fa fa-github" aria-hidden="true"></i>
2638
</a>
2739
</li>
2840
<li>
29-
<a href="https://www.linkedin.com/company/code4romania/" target="_blank">
41+
<a
42+
href="https://www.linkedin.com/company/code4romania/"
43+
target="_blank"
44+
aria-label="Link către contul de Linkedin al organizației">
3045
<i class="fa fa-linkedin" aria-hidden="true"></i>
3146
</a>
3247
</li>

‎backend/templates/v1/header.html

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44
<div class="row">
55
<div class="col-md-12">
66
<div style="padding: 12px 0; font-size: 14px; font-weight: 500; display: flex; align-items: center;">
7-
<a href="https://www.commitglobal.org" target="_blank">
8-
<svg style="height: 32px; min-width: 80px; float: left; margin: 0 1em 0 0; display: block;"
9-
viewBox="0 0 401.5 114.5" xmlns="http://www.w3.org/2000/svg">
7+
<a
8+
href="https://www.commitglobal.org"
9+
target="_blank"
10+
aria-label="Link către site-ul Commit Global">
11+
<svg
12+
style="height: 32px; min-width: 80px; float: left; margin: 0 1em 0 0; display: block;"
13+
viewBox="0 0 401.5 114.5" xmlns="http://www.w3.org/2000/svg">
1014
<path
1115
d="m87.4 2.4 16.2 2.4 29.6 52.4-29.6 52.5-16.2 2.4 21.4-54.9zm-41.6 0-16.2 2.4-29.6 52.4 29.6 52.5 16.2 2.4-17.5-54.9z"></path>
1216
<path d="m45.8 2.4 20.8-2.4 7.5 31.7-7.5 25.5-24 6.2-28.3-6.2z" fill="#fff8da"></path>
@@ -19,13 +23,12 @@
1923
<path d="m87.4 112.1-20.8 2.4v-57.3h52.2z" fill="#ffd209"></path>
2024
</svg>
2125
</a>
22-
<span>
26+
<a href="https://www.commitglobal.org" class="subtle-link" target="_blank">
2327
O soluție Commit Global.
24-
</span>
28+
</a>
2529
</div>
2630
</div>
2731
</div>
28-
2932
</div>
3033
</div>
3134
<!-- / commitglobal link -->

‎backend/templates/v1/index.html

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,27 @@
1616

1717
<div id="homepage-container" class="jumbotron text-center">
1818
<div class="row">
19-
<img class="col-xs-12 col-md-6 col-md-offset-3" src="{{ static('images/index.png') }}">
19+
<img
20+
class="col-xs-12 col-md-6 col-md-offset-3"
21+
src="{{ static('images/index.png') }}"
22+
alt="Logo of the platform">
2023
</div>
2124
{% if company_name %}
22-
{# we have a custom header for some companies #}
23-
{% if custom_header %}
24-
<h1>
25-
Redirecționează 3.5% din impozitul tău <br>
26-
către o cauză la alegere
27-
</h1>
28-
{% else %}
29-
<h1>
30-
Redirecționează 3.5% din impozitul tău <br>
31-
către unul dintre ONG-urile susținute de {{ company_name }}.
32-
</h1>
33-
{% endif %}
25+
{# we have a custom header for some companies #}
26+
{% if custom_header %}
27+
<h1>
28+
Redirecționează 3.5% din impozitul tău <br>
29+
către o cauză la alegere
30+
</h1>
31+
{% else %}
32+
<h1>
33+
Redirecționează 3.5% din impozitul tău <br>
34+
către unul dintre ONG-urile susținute de {{ company_name }}.
35+
</h1>
36+
{% endif %}
3437
{% else %}
3538
<h1>
36-
Redirecționează 3.5%<br>
39+
Redirecționează 3.5% <br>
3740
din impozitul tău către ONG-ul în care crezi
3841
</h1>
3942
{% endif %}
@@ -56,7 +59,7 @@ <h4>
5659
{% if not custom_subdomain %}
5760
<div class="row">
5861
<div class="col-xs-12 col-md-10 col-md-offset-1 search-bar-container">
59-
<input id="search-bar" type="text" placeholder="Caută un ONG" />
62+
<input id="search-bar" type="text" placeholder="Caută un ONG" aria-label="Caută un ONG"/>
6063
</div>
6164
</div>
6265
{% endif %}

0 commit comments

Comments
 (0)