Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Replace some of the bitmap images with SVGs

Roland Geider97288d4e55f0
diff --git a/wger/core/static/images/logos/logo-font-no-icon.svg b/wger/core/static/images/logos/logo-font-no-icon.svg
new file mode 100644
index 000000000..7b521bed7
--- /dev/null
+++ b/wger/core/static/images/logos/logo-font-no-icon.svg
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ width="70.991096"
+ height="24.582001"
+ viewBox="0 0 70.991096 24.582001"
+ fill="none"
+ version="1.1"
+ id="svg12"
+ sodipodi:docname="logotype-no-text.svg"
+ inkscape:version="1.2.1 (9c6d41e, 2022-07-14)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <defs
+ id="defs16" />
+ <sodipodi:namedview
+ id="namedview14"
+ pagecolor="#ffffff"
+ bordercolor="#000000"
+ borderopacity="0.25"
+ inkscape:showpageshadow="2"
+ inkscape:pageopacity="0.0"
+ inkscape:pagecheckerboard="0"
+ inkscape:deskcolor="#d1d1d1"
+ showgrid="false"
+ inkscape:zoom="4.9166667"
+ inkscape:cx="-14.338983"
+ inkscape:cy="8.440678"
+ inkscape:window-width="1353"
+ inkscape:window-height="663"
+ inkscape:window-x="177"
+ inkscape:window-y="43"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg12" />
+ <path
+ d="m 4.76,17.782 h 3.502 l 2.55,-9.384 c 0.17,-0.68 0.442,-1.802 0.544,-2.38 0.068,0.578 0.374,1.7 0.544,2.38 l 2.55,9.384 h 3.536 l 4.76,-17.374 h -3.91 l -2.278,9.622 c -0.17,0.714 -0.306,1.462 -0.408,2.04 -0.102,-0.578 -0.272,-1.36 -0.442,-2.04 L 13.192,0.408 H 9.554 L 7.004,10.03 C 6.834,10.71 6.664,11.492 6.562,12.07 6.46,11.492 6.324,10.744 6.154,10.03 L 3.91,0.408 H 0 Z"
+ fill="#2a4c7d"
+ id="path4" />
+ <path
+ d="m 30.8812,24.582 c 5.984,-0.442 8.194,-2.788 8.194,-8.534 V 0.408 h -3.978 V 1.462 C 34.2812,0.646 32.9892,0 31.1872,0 c -4.25,0 -7.208,3.4 -7.208,9.078 0,6.052 3.094,9.112 7.174,9.112 1.564,0 2.924,-0.442 3.944,-1.564 v 0.986 c 0,2.346 -1.428,3.434 -6.324,3.774 z m 0.952,-10.2 c -2.482,0 -3.876,-2.108 -3.876,-5.304 0,-3.434 1.394,-5.304 3.876,-5.304 1.53,0 2.652,0.816 3.264,1.7 v 7.208 c -0.714,1.088 -1.836,1.7 -3.264,1.7 z"
+ fill="#2a4c7d"
+ id="path6" />
+ <path
+ d="m 49.9611,18.19 c 2.788,0 4.828,-1.088 6.188,-2.72 l -2.516,-2.584 c -0.918,1.224 -2.142,1.802 -3.672,1.802 -2.074,0 -3.9445,-1.53 -4.0805,-4.08 h 11.5265 c 0.102,-0.782 0.136,-1.734 0.136,-2.448 0,-5.576 -3.4,-8.16 -7.582,-8.16 -4.8625,0 -8.0245,3.4 -8.0245,9.078 0,5.712 3.094,9.112 8.0245,9.112 z M 45.9146,7.31 c 0.204,-2.72 1.9045,-3.808 4.0465,-3.808 1.802,0 3.468,1.156 3.638,3.808 z"
+ fill="#2a4c7d"
+ id="path8" />
+ <path
+ d="m 60.2131,17.782 h 3.978 V 8.058 c 0,-3.298 1.734,-4.148 3.264,-4.148 1.326,0 2.244,0.408 2.958,0.918 L 70.9911,1.19 C 70.1071,0.442 69.0531,0 67.7611,0 c -1.734,0 -2.89,0.782 -3.57,2.21 V 0.408 h -3.978 z"
+ fill="#2a4c7d"
+ id="path10" />
+</svg>
diff --git a/wger/core/static/images/logos/logo-font.svg b/wger/core/static/images/logos/logo-font.svg
new file mode 100644
index 000000000..0cb07487a
--- /dev/null
+++ b/wger/core/static/images/logos/logo-font.svg
@@ -0,0 +1,7 @@
+<svg width="125" height="48" viewBox="0 0 125 48" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.7941 0.448339C24.6721 -0.149446 23.3279 -0.149447 22.2059 0.448339L3.03406 10.6625C1.7825 11.3293 1 12.6358 1 14.0585V33.9415C1 35.3642 1.78249 36.6707 3.03406 37.3375L22.2059 47.5517C23.3279 48.1494 24.6721 48.1494 25.7941 47.5517L44.9659 37.3375C46.2175 36.6707 47 35.3642 47 33.9415V14.0585C47 12.6358 46.2175 11.3293 44.9659 10.6625L25.7941 0.448339ZM17 15V22H31V15H35V16H38V17H41V22H42V26H41V31H38V32H35V33H31V26H17V33H13V32H10V31H7V26H6V22H7V17H10V16H13V15H17ZM14 16H16V32H14V16ZM17 25V23H31V25H17ZM34 32H32V16H34V32ZM10 18V30H8V18H10ZM11 31V17H13V31H11ZM38 30V18H40V30H38ZM37 17V31H35V17H37Z" fill="#2A4C7D"/>
+<path d="M57.9499 34H61.4519L64.0019 24.616C64.1719 23.936 64.4439 22.814 64.5459 22.236C64.6139 22.814 64.9199 23.936 65.0899 24.616L67.6399 34H71.1759L75.9359 16.626H72.0259L69.7479 26.248C69.5779 26.962 69.4419 27.71 69.3399 28.288C69.2379 27.71 69.0679 26.928 68.8979 26.248L66.3819 16.626H62.7439L60.1939 26.248C60.0239 26.928 59.8539 27.71 59.7519 28.288C59.6499 27.71 59.5139 26.962 59.3439 26.248L57.0999 16.626H53.1899L57.9499 34Z" fill="#2A4C7D"/>
+<path d="M84.0711 40.8C90.0551 40.358 92.2651 38.012 92.2651 32.266V16.626H88.2871V17.68C87.4711 16.864 86.1791 16.218 84.3771 16.218C80.1271 16.218 77.1691 19.618 77.1691 25.296C77.1691 31.348 80.2631 34.408 84.3431 34.408C85.9071 34.408 87.2671 33.966 88.2871 32.844V33.83C88.2871 36.176 86.8591 37.264 81.9631 37.604L84.0711 40.8ZM85.0231 30.6C82.5411 30.6 81.1471 28.492 81.1471 25.296C81.1471 21.862 82.5411 19.992 85.0231 19.992C86.5531 19.992 87.6751 20.808 88.2871 21.692V28.9C87.5731 29.988 86.4511 30.6 85.0231 30.6Z" fill="#2A4C7D"/>
+<path d="M103.151 34.408C105.939 34.408 107.979 33.32 109.339 31.688L106.823 29.104C105.905 30.328 104.681 30.906 103.151 30.906C101.077 30.906 99.2065 29.376 99.0705 26.826H110.597C110.699 26.044 110.733 25.092 110.733 24.378C110.733 18.802 107.333 16.218 103.151 16.218C98.2885 16.218 95.1265 19.618 95.1265 25.296C95.1265 31.008 98.2205 34.408 103.151 34.408ZM99.1045 23.528C99.3085 20.808 101.009 19.72 103.151 19.72C104.953 19.72 106.619 20.876 106.789 23.528H99.1045Z" fill="#2A4C7D"/>
+<path d="M113.403 34H117.381V24.276C117.381 20.978 119.115 20.128 120.645 20.128C121.971 20.128 122.889 20.536 123.603 21.046L124.181 17.408C123.297 16.66 122.243 16.218 120.951 16.218C119.217 16.218 118.061 17 117.381 18.428V16.626H113.403V34Z" fill="#2A4C7D"/>
+</svg>
diff --git a/wger/core/templates/template_features.html b/wger/core/templates/template_features.html
index c954131fa..0ad590474 100644
--- a/wger/core/templates/template_features.html
+++ b/wger/core/templates/template_features.html
@@ -48,6 +48,7 @@
<link rel="stylesheet" type="text/css" href="{% static 'yarn/bootstrap/dist/css/bootstrap.min.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'yarn/components-font-awesome/css/all.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/landing_page.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'fontawesomefree/css/all.min.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'yarn/shariff/dist/shariff.min.css' %}">
{% endcompress %}
diff --git a/wger/software/static/images/branch.png b/wger/software/static/images/branch.png
deleted file mode 100644
index 64df1964f..000000000
Binary files a/wger/software/static/images/branch.png and /dev/null differ
diff --git a/wger/software/static/images/code.png b/wger/software/static/images/code.png
deleted file mode 100644
index 873512c4e..000000000
Binary files a/wger/software/static/images/code.png and /dev/null differ
diff --git a/wger/software/static/images/code.svg b/wger/software/static/images/code.svg
new file mode 100644
index 000000000..54fa12725
--- /dev/null
+++ b/wger/software/static/images/code.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ width="102"
+ height="82"
+ viewBox="0 0 102 82"
+ fill="none"
+ version="1.1"
+ id="svg4"
+ sodipodi:docname="image (1).svg"
+ inkscape:version="1.2.1 (9c6d41e, 2022-07-14)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <defs
+ id="defs8" />
+ <sodipodi:namedview
+ id="namedview6"
+ pagecolor="#ffffff"
+ bordercolor="#000000"
+ borderopacity="0.25"
+ inkscape:showpageshadow="2"
+ inkscape:pageopacity="0.0"
+ inkscape:pagecheckerboard="true"
+ inkscape:deskcolor="#d1d1d1"
+ showgrid="false"
+ inkscape:zoom="2.8780488"
+ inkscape:cx="51.076271"
+ inkscape:cy="41"
+ inkscape:window-width="1344"
+ inkscape:window-height="456"
+ inkscape:window-x="177"
+ inkscape:window-y="43"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg4" />
+ <path
+ d="M44.4375 81C45.5312 81.3125 46.4688 80.6875 46.7812 79.75L68.1875 6.3125C68.5 5.21875 67.875 4.125 66.9375 3.96875L57.4062 1.15625C56.3125 0.84375 55.375 1.46875 55.0625 2.40625L33.6562 75.8438C33.3438 76.9375 33.9688 77.875 34.9062 78.1875L44.4375 81ZM26.625 63.5L33.5 56.1562C34.2812 55.375 34.125 54.2812 33.3438 53.5L19.2812 41L33.3438 28.6562C34.125 27.875 34.2812 26.625 33.5 26L26.625 18.6562C26 17.875 24.75 17.875 23.9688 18.6562L1.46875 39.75C0.6875 40.375 0.6875 41.625 1.46875 42.4062L23.9688 63.5C24.75 64.2812 26 64.2812 26.625 63.5ZM77.875 63.5L100.375 42.4062C101.156 41.7812 101.156 40.375 100.375 39.75L77.875 18.6562C77.0938 17.875 75.8438 17.875 75.2188 18.6562L68.3438 25.8438C67.7188 26.625 67.7188 27.875 68.5 28.6562L82.7188 41L68.5 53.5C67.7188 54.2812 67.5625 55.375 68.3438 56.1562L75.2188 63.5C75.8438 64.2812 77.0938 64.2812 77.875 63.5Z"
+ fill="white"
+ id="path2" />
+</svg>
diff --git a/wger/software/static/images/dumbbell.svg b/wger/software/static/images/dumbbell.svg
new file mode 100644
index 000000000..786608cee
--- /dev/null
+++ b/wger/software/static/images/dumbbell.svg
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ width="80"
+ height="80"
+ viewBox="0 0 80 80"
+ fill="none"
+ version="1.1"
+ id="svg4"
+ sodipodi:docname="image.svg"
+ inkscape:version="1.2.1 (9c6d41e, 2022-07-14)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <defs
+ id="defs8" />
+ <sodipodi:namedview
+ id="namedview6"
+ pagecolor="#ffffff"
+ bordercolor="#000000"
+ borderopacity="0.25"
+ inkscape:showpageshadow="2"
+ inkscape:pageopacity="0.0"
+ inkscape:pagecheckerboard="true"
+ inkscape:deskcolor="#d1d1d1"
+ showgrid="false"
+ inkscape:zoom="2.95"
+ inkscape:cx="40"
+ inkscape:cy="40"
+ inkscape:window-width="1344"
+ inkscape:window-height="456"
+ inkscape:window-x="177"
+ inkscape:window-y="43"
+ inkscape:window-maximized="0"
+ inkscape:current-layer="svg4" />
+ <path
+ d="M74.3125 51.4375L79.9375 57.25L71.5 65.6875L77.125 71.5L71.5 77.125L65.6875 71.5L57.25 79.9375L51.4375 74.3125L45.8125 79.9375L40 74.3125L54.25 60.0625L19.9375 25.75L5.6875 40L0.0625 34.1875L5.6875 28.5625L0.0625 22.75L8.5 14.3125L2.875 8.5L8.5 2.875L14.3125 8.5L22.75 0.0625L28.5625 5.6875L34.1875 0.0625L40 5.6875L25.75 19.9375L60.0625 54.25L74.3125 40L79.9375 45.8125L74.3125 51.4375Z"
+ fill="white"
+ id="path2" />
+</svg>
diff --git a/wger/software/static/images/dumbell.png b/wger/software/static/images/dumbell.png
deleted file mode 100644
index 8d8f9a2da..000000000
Binary files a/wger/software/static/images/dumbell.png and /dev/null differ
diff --git a/wger/software/static/images/fork.svg b/wger/software/static/images/fork.svg
new file mode 100644
index 000000000..56d158029
--- /dev/null
+++ b/wger/software/static/images/fork.svg
@@ -0,0 +1,3 @@
+<svg width="60" height="80" viewBox="0 0 60 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M60 22.5C60 15.625 54.375 10 47.5 10C40.4688 10 35 15.625 35 22.5C35 28.2812 38.75 33.125 43.9062 34.5312C43.75 37.0312 43.2812 39.0625 42.1875 40.3125C39.8438 43.2812 34.5312 43.9062 28.9062 44.375C24.5312 44.6875 19.8438 45.1562 16.25 47.0312V24.5312C21.25 22.9688 25 18.125 25 12.5C25 5.625 19.375 0 12.5 0C5.46875 0 0 5.625 0 12.5C0 18.125 3.59375 22.9688 8.75 24.5312V55.625C3.59375 57.1875 0 62.0312 0 67.5C0 74.5312 5.46875 80 12.5 80C19.375 80 25 74.5312 25 67.5C25 62.1875 21.5625 57.6562 16.875 55.9375C17.3438 55.1562 18.125 54.375 19.2188 53.75C21.7188 52.5 25.625 52.1875 29.5312 51.875C36.25 51.25 43.5938 50.4688 48.125 45C50.3125 42.3438 51.4062 38.75 51.4062 34.375C56.4062 32.8125 60 28.125 60 22.5ZM12.5 10C13.75 10 15 11.25 15 12.5C15 13.9062 13.75 15 12.5 15C11.0938 15 10 13.9062 10 12.5C10 11.25 11.0938 10 12.5 10ZM12.5 70C11.0938 70 10 68.9062 10 67.5C10 66.25 11.0938 65 12.5 65C13.75 65 15 66.25 15 67.5C15 68.9062 13.75 70 12.5 70ZM47.5 20C48.75 20 50 21.25 50 22.5C50 23.9062 48.75 25 47.5 25C46.0938 25 45 23.9062 45 22.5C45 21.25 46.0938 20 47.5 20Z" fill="white"/>
+</svg>
diff --git a/wger/software/static/images/google-play.png b/wger/software/static/images/google-play.png
deleted file mode 100644
index 2a42bfa60..000000000
Binary files a/wger/software/static/images/google-play.png and /dev/null differ
diff --git a/wger/software/static/images/wger-logo.png b/wger/software/static/images/wger-logo.png
deleted file mode 100644
index c12deb200..000000000
Binary files a/wger/software/static/images/wger-logo.png and /dev/null differ
diff --git a/wger/software/templates/features.html b/wger/software/templates/features.html
index b23e50b9f..aeecb5b0c 100644
--- a/wger/software/templates/features.html
+++ b/wger/software/templates/features.html
@@ -22,7 +22,7 @@
<nav class="navbar navbar-expand-lg px-4">
<div class="container-fluid">
<a class="navbar-brand" href="#">
- <img src="{% static 'images/wger-logo.png' %}"/>
+ <img src="{% static 'images/logos/logo-font.svg' %}"/>
</a>
<button class="navbar-toggler"
type="button"
@@ -53,9 +53,12 @@
</ul>
<!-- buttons -->
<div class="d-flex gap-2">
- <button type="button" class="btn btn-transparent">Login</button>
+ <a rola="button" class="btn btn-transparent" href="{% url 'core:user:login' %}">Login</a>
{% if allow_registration %}
- <button type="button" class="btn btn-primary rounded-1 bg-dark-blue px-4">Sign Up</button>
+ <a role="button" class="btn btn-primary rounded-1 bg-dark-blue px-4"
+ href="{% url 'core:user:registration' %}">
+ Sign Up
+ </a>
{% endif %}
</div>
</div>
@@ -308,7 +311,7 @@
</h1>
<div class="row py-4">
<div class="col-lg-4 col-sm-12 d-flex flex-column align-items-center justify-content-start gap-2">
- <img src="{% static 'images/dumbell.png' %}" height="96px" width="96px" alt="dumbbell image"
+ <img src="{% static 'images/dumbbell.svg' %}" height="96px" width="96px" alt="dumbbell image"
class="mb-4">
<h6 class="text-white fw-bold text-center">Set up a private server for your gym</h6>
<p class="text-light fw-lighter text-center">
@@ -316,7 +319,7 @@
</p>
</div>
<div class="col-lg-4 col-sm-12 d-flex flex-column align-items-center justify-content-start gap-2">
- <img src="{% static 'images/code.png' %}" height="96px" width="96px" alt="dumbbell image"
+ <img src="{% static 'images/code.svg' %}" height="96px" width="96px" alt="dumbbell image"
class="mb-4">
<h6 class="text-white fw-bold text-center">Integrate with your own app</h6>
<p class="text-light fw-lighter text-center">
@@ -324,7 +327,7 @@
</p>
</div>
<div class="col-lg-4 col-sm-12 d-flex flex-column align-items-center justify-content-start gap-2">
- <img src="{% static 'images/branch.png' %}" height="96px" width="96px" alt="dumbbell image"
+ <img src="{% static 'images/fork.svg' %}" height="96px" width="96px" alt="dumbbell image"
class="mb-4">
<h6 class="text-white fw-bold text-center">Create your own version</h6>
<p class="text-light fw-lighter text-center">
@@ -465,7 +468,7 @@
English
<i class="fa fa-pencil px-2" aria-hidden="true"></i>
</button>
- <img src="{% static 'images/google-play.png' %}"/>
+ <img src="{% static 'images/logos/play-store/google-play-badge.png' %}" height="64"/>
</div>
</footer>
{% endblock %}