Skip to content

Commit f453647

Browse files
robinheidrichwilliamdes
robinheidrich
and
williamdes
committed
Use SVG icons instead of Font Awesome
Mostly imported from #186 Co-Authored-By: William Desportes <williamdes@wdes.fr>
1 parent 6dcd444 commit f453647

6 files changed

Lines changed: 62 additions & 24 deletions

File tree

‎pmaweb/static/css/style.css‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,14 @@ em.big {
122122
div.subscribe {
123123
text-align: center;
124124
}
125-
.fa-google-plus-square {
126-
color: #dd4b39;
127-
}
128-
.fa-twitter-square {
129-
color: #55acee;
130-
}
131-
.fa-facebook-official {
132-
color: #3b5998;
133-
}
134-
.logo .fa {
135-
text-decoration: none;
136-
font-size: 150%;
125+
126+
.bi {
127+
width: 1em;
128+
height: 1em;
129+
vertical-align: -.125em;
130+
fill: currentcolor;
137131
}
132+
138133
.sfc-logo {
139134
text-align: center;
140135
}

‎pmaweb/templates/_dlbox.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{% with release.simpledownload as file %}
2-
<a class="btn btn-success download_popup" href="{{ file.get_absolute_url }}" title="Download {{ file.archive }} compressed release, {{ file.size | filesizeformat }}" rel="quick-download" data-sha256="{{ file.sha256 }}" data-pgp="{{ file.get_signed_url }}"><i class="fa fa-download"></i> Download {{ release.version }}</a>
2+
<a class="btn btn-success download_popup" href="{{ file.get_absolute_url }}" title="Download {{ file.archive }} compressed release, {{ file.size | filesizeformat }}" rel="quick-download" data-sha256="{{ file.sha256 }}" data-pgp="{{ file.get_signed_url }}"><svg class="bi"><use href="#download"></use></svg> Download {{ release.version }}</a>
33
{% endwith %}

‎pmaweb/templates/_littleboxes.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
{% endwith %}
99
{% endif %}
1010

11-
<a class="btn btn-success" href="https://demo.phpmyadmin.net/master-config/" title="Go to demo server"><i class="fa fa-search"></i> Try demo</a>
11+
<a class="btn btn-success" href="https://demo.phpmyadmin.net/master-config/" title="Go to demo server"><svg class="bi"><use href="#eye"></use></svg> Try demo</a>
1212

13-
<a class="btn btn-success" href="{% url 'donate' %}" rel="payment"><i class="fa fa-credit-card"></i> Donate</a>
13+
<a class="btn btn-success" href="{% url 'donate' %}" rel="payment"><svg class="bi"><use href="#credit-card"></use></svg> Donate</a>

‎pmaweb/templates/_svg_symbols.html‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<svg xmlns="http://www.w3.org/2000/svg" class="d-none">
2+
<symbol id="calendar-event" viewBox="0 0 16 16">
3+
<path d="M11 6.5a.5.5 0 0 1 .5-.5h1a.5.5 0 0 1 .5.5v1a.5.5 0 0 1-.5.5h-1a.5.5 0 0 1-.5-.5z"/>
4+
<path d="M3.5 0a.5.5 0 0 1 .5.5V1h8V.5a.5.5 0 0 1 1 0V1h1a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2V3a2 2 0 0 1 2-2h1V.5a.5.5 0 0 1 .5-.5M1 4v10a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1V4z"/>
5+
</symbol>
6+
<symbol id="check2" viewBox="0 0 16 16">
7+
<path d="M13.854 3.646a.5.5 0 0 1 0 .708l-7 7a.5.5 0 0 1-.708 0l-3.5-3.5a.5.5 0 1 1 .708-.708L6.5 10.293l6.646-6.647a.5.5 0 0 1 .708 0z"/>
8+
</symbol>
9+
<symbol id="circle-half" viewBox="0 0 16 16">
10+
<path d="M8 15A7 7 0 1 0 8 1v14zm0 1A8 8 0 1 1 8 0a8 8 0 0 1 0 16z"/>
11+
</symbol>
12+
<symbol id="credit-card" viewBox="0 0 16 16">
13+
<path d="M0 4a2 2 0 0 1 2-2h12a2 2 0 0 1 2 2v8a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2zm2-1a1 1 0 0 0-1 1v1h14V4a1 1 0 0 0-1-1zm13 4H1v5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1z"/>
14+
<path d="M2 10a1 1 0 0 1 1-1h1a1 1 0 0 1 1 1v1a1 1 0 0 1-1 1H3a1 1 0 0 1-1-1z"/>
15+
</symbol>
16+
<symbol id="download" viewBox="0 0 16 16">
17+
<path d="M.5 9.9a.5.5 0 0 1 .5.5v2.5a1 1 0 0 0 1 1h12a1 1 0 0 0 1-1v-2.5a.5.5 0 0 1 1 0v2.5a2 2 0 0 1-2 2H2a2 2 0 0 1-2-2v-2.5a.5.5 0 0 1 .5-.5"/>
18+
<path d="M7.646 11.854a.5.5 0 0 0 .708 0l3-3a.5.5 0 0 0-.708-.708L8.5 10.293V1.5a.5.5 0 0 0-1 0v8.793L5.354 8.146a.5.5 0 1 0-.708.708z"/>
19+
</symbol>
20+
<symbol id="eye" viewBox="0 0 16 16">
21+
<path d="M16 8s-3-5.5-8-5.5S0 8 0 8s3 5.5 8 5.5S16 8 16 8M1.173 8a13 13 0 0 1 1.66-2.043C4.12 4.668 5.88 3.5 8 3.5s3.879 1.168 5.168 2.457A13 13 0 0 1 14.828 8q-.086.13-.195.288c-.335.48-.83 1.12-1.465 1.755C11.879 11.332 10.119 12.5 8 12.5s-3.879-1.168-5.168-2.457A13 13 0 0 1 1.172 8z"/>
22+
<path d="M8 5.5a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5M4.5 8a3.5 3.5 0 1 1 7 0 3.5 3.5 0 0 1-7 0"/>
23+
</symbol>
24+
<symbol id="facebook" viewBox="0 0 16 16">
25+
<path d="M16 8.049c0-4.446-3.582-8.05-8-8.05C3.58 0-.002 3.603-.002 8.05c0 4.017 2.926 7.347 6.75 7.951v-5.625h-2.03V8.05H6.75V6.275c0-2.017 1.195-3.131 3.022-3.131.876 0 1.791.157 1.791.157v1.98h-1.009c-.993 0-1.303.621-1.303 1.258v1.51h2.218l-.354 2.326H9.25V16c3.824-.604 6.75-3.934 6.75-7.951z"/>
26+
</symbol>
27+
<symbol id="github" viewBox="0 0 16 16">
28+
<path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27s1.36.09 2 .27c1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.01 8.01 0 0 0 16 8c0-4.42-3.58-8-8-8"/>
29+
</symbol>
30+
<symbol id="moon-stars-fill" viewBox="0 0 16 16">
31+
<path d="M6 .278a.768.768 0 0 1 .08.858 7.208 7.208 0 0 0-.878 3.46c0 4.021 3.278 7.277 7.318 7.277.527 0 1.04-.055 1.533-.16a.787.787 0 0 1 .81.316.733.733 0 0 1-.031.893A8.349 8.349 0 0 1 8.344 16C3.734 16 0 12.286 0 7.71 0 4.266 2.114 1.312 5.124.06A.752.752 0 0 1 6 .278z"/>
32+
<path d="M10.794 3.148a.217.217 0 0 1 .412 0l.387 1.162c.173.518.579.924 1.097 1.097l1.162.387a.217.217 0 0 1 0 .412l-1.162.387a1.734 1.734 0 0 0-1.097 1.097l-.387 1.162a.217.217 0 0 1-.412 0l-.387-1.162A1.734 1.734 0 0 0 9.31 6.593l-1.162-.387a.217.217 0 0 1 0-.412l1.162-.387a1.734 1.734 0 0 0 1.097-1.097l.387-1.162zM13.863.099a.145.145 0 0 1 .274 0l.258.774c.115.346.386.617.732.732l.774.258a.145.145 0 0 1 0 .274l-.774.258a1.156 1.156 0 0 0-.732.732l-.258.774a.145.145 0 0 1-.274 0l-.258-.774a1.156 1.156 0 0 0-.732-.732l-.774-.258a.145.145 0 0 1 0-.274l.774-.258c.346-.115.617-.386.732-.732L13.863.1z"/>
33+
</symbol>
34+
<symbol id="sun-fill" viewBox="0 0 16 16">
35+
<path d="M8 12a4 4 0 1 0 0-8 4 4 0 0 0 0 8zM8 0a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 0zm0 13a.5.5 0 0 1 .5.5v2a.5.5 0 0 1-1 0v-2A.5.5 0 0 1 8 13zm8-5a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2a.5.5 0 0 1 .5.5zM3 8a.5.5 0 0 1-.5.5h-2a.5.5 0 0 1 0-1h2A.5.5 0 0 1 3 8zm10.657-5.657a.5.5 0 0 1 0 .707l-1.414 1.415a.5.5 0 1 1-.707-.708l1.414-1.414a.5.5 0 0 1 .707 0zm-9.193 9.193a.5.5 0 0 1 0 .707L3.05 13.657a.5.5 0 0 1-.707-.707l1.414-1.414a.5.5 0 0 1 .707 0zm9.193 2.121a.5.5 0 0 1-.707 0l-1.414-1.414a.5.5 0 0 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .707zM4.464 4.465a.5.5 0 0 1-.707 0L2.343 3.05a.5.5 0 1 1 .707-.707l1.414 1.414a.5.5 0 0 1 0 .708z"/>
36+
</symbol>
37+
<symbol id="twitter-x" viewBox="0 0 16 16">
38+
<path d="M12.6.75h2.454l-5.36 6.142L16 15.25h-4.937l-3.867-5.07-4.425 5.07H.316l5.733-6.57L0 .75h5.063l3.495 4.633L12.601.75Zm-.86 13.028h1.36L4.323 2.145H2.865z"/>
39+
</symbol>
40+
<symbol id="menu" viewBox="0 0 16 16">
41+
<path fill-rule="evenodd" d="M2.5 12a.5.5 0 0 1 .5-.5h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5m0-4a.5.5 0 0 1 .5-.5h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5m0-4a.5.5 0 0 1 .5-.5h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5"/>
42+
</symbol>
43+
</svg>

‎pmaweb/templates/base.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,12 @@
4747
<meta name="robots" content="index, follow" />
4848
</head>
4949
<body>
50+
{% include '_svg_symbols.html' %}
5051
<header>
5152
<nav class="navbar navbar-expand-lg navbar-light bg-light">
5253
<div class="container">
5354
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
54-
<span class="fa fa-bars"></span>
55+
<span><svg class="bi"><use href="#menu"></use></svg></span>
5556
</button>
5657

5758
<div class="collapse navbar-collapse" id="navbarSupportedContent">
@@ -64,7 +65,7 @@
6465
</ul>
6566
<ul class="navbar-nav me-0">
6667
<li class="nav-item">
67-
<a class="nav-link" href="https://github.com/phpmyadmin/phpmyadmin" title="phpMyAdmin is developed on GitHub"><i class="fa fa-github"></i> GitHub</a>
68+
<a class="nav-link" href="https://github.com/phpmyadmin/phpmyadmin" title="phpMyAdmin is developed on GitHub"><svg class="bi"><use href="#github"></use></svg> GitHub</a>
6869
</li>
6970
</ul>
7071
</div>
@@ -145,8 +146,8 @@ <h4>phpMyAdmin needs your continued support to grow and thrive</h4>
145146
<li><a href="{% url 'license' %}" rel="license">License</a></li>
146147
<li><a href="{% url 'donate' %}" rel="payment" title="Support phpMyAdmin by donating money!">Donate</a></li>
147148
<li><a href="{% url 'about-website' %}" title="Information about website">About</a></li>
148-
<li class="logo"><a href="https://twitter.com/phpmya"><i class="fa fa-twitter-square"></i></a></li>
149-
<li class="logo"><a href="https://www.facebook.com/pages/PhpMyAdmin/157021164334486"><i class="fa fa-facebook-official"></i></a></li>
149+
<li class="logo"><a href="https://twitter.com/phpmya"><svg class="bi"><use href="#twitter-x"></use></svg></a></li>
150+
<li class="logo"><a href="https://www.facebook.com/pages/PhpMyAdmin/157021164334486"><svg class="bi"><use href="#facebook"></use></svg></a></li>
150151
</ul>
151152
</footer>
152153
<script>
@@ -161,4 +162,3 @@ <h4>phpMyAdmin needs your continued support to grow and thrive</h4>
161162
</script>
162163
</body>
163164
</html>
164-

‎pmaweb/templates/news/post_archive.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ <h2 class="entry-title"><a rel="bookmark" href="{{ item.get_absolute_url }}">{{
2020
<nav aria-label="News page navigation">
2121
<ul class="pagination">
2222
<li class="page-item{% if page_obj.number == 1 %} disabled{% endif %}">
23-
<a class="page-link" href="{% url 'news' %}"{% if page_obj.number == 1 %} tabindex="-1" aria-disabled="true"{% endif %}><i class="fa fa-step-backward"></i></a>
23+
<a class="page-link" href="{% url 'news' %}"{% if page_obj.number == 1 %} tabindex="-1" aria-disabled="true"{% endif %}><</a>
2424
</li>
2525
<li class="page-item{% if not page_obj.has_previous %} disabled{% endif %}">
26-
<a class="page-link"{% if page_obj.has_previous %} href="{% url 'news-page' page=page_obj.previous_page_number %}"{% else %} tabindex="-1" aria-disabled="true"{% endif %}><i class="fa fa-backward"></i></a>
26+
<a class="page-link"{% if page_obj.has_previous %} href="{% url 'news-page' page=page_obj.previous_page_number %}"{% else %} tabindex="-1" aria-disabled="true"{% endif %}><<</a>
2727
</li>
2828
<li class="page-item">
2929
<span class="page-link">{{ page_obj.number }} / {{ paginator.num_pages }}</span>
3030
</li>
3131
<li class="page-item{% if not page_obj.has_next %} disabled{% endif %}">
32-
<a class="page-link"{% if page_obj.has_next %} href="{% url 'news-page' page=page_obj.next_page_number %}"{% else %} tabindex="-1" aria-disabled="true"{% endif %}><i class="fa fa-forward"></i></a>
32+
<a class="page-link"{% if page_obj.has_next %} href="{% url 'news-page' page=page_obj.next_page_number %}"{% else %} tabindex="-1" aria-disabled="true"{% endif %}>></a>
3333
</li>
3434
<li class="page-item{% if page_obj.paginator.num_pages == page_obj.number %} disabled{% endif %}">
35-
<a class="page-link" href="{% url 'news-page' page=page_obj.paginator.num_pages %}"{% if page_obj.paginator.num_pages == page_obj.number %} tabindex="-1" aria-disabled="true"{% endif %}><i class="fa fa-step-forward"></i></a>
35+
<a class="page-link" href="{% url 'news-page' page=page_obj.paginator.num_pages %}"{% if page_obj.paginator.num_pages == page_obj.number %} tabindex="-1" aria-disabled="true"{% endif %}>>></a>
3636
</li>
3737
</ul>
3838
</nav>

0 commit comments

Comments
 (0)