Merge pull request #433 from bornhack/2020logo

New logos for 2020 and 2021, new favicon package

src/camps/templates/bornhack-2020_camp_detail.html

@@ -5,7 +5,7 @@
 {% block content %}
 <div class="row">
     <div class="col-md-12">
-        <img src="{% static camp.logo_large %}" height="300px" width="600px" class="img-responsive" id="front-logo" />
+        <img src="{% static camp.logo_large %}" width="800px" class="img-responsive" id="front-logo" />
     </div>
 </div>
 
@@ -27,7 +27,7 @@
         </div>
         <div class="col-md-9 col-sm-9 text-container">
             <div class="lead">
-                <strong>BornHack 2020</strong> will be the fifth BornHack. It will take place from <strong>Tuesday the 11th of August to Tuesday the 18th of August 2020</strong> at a our new venue on the Danish island of Funen.
+                <strong>BornHack 2020</strong> will be the fifth BornHack. It will take place from <strong>Tuesday the 11th of August to Tuesday the 18th of August 2020</strong> at a our venue on the Danish island of Funen.
             </div>
         </div>
 </div>

src/camps/templates/bornhack-2021_camp_detail.html

@@ -5,7 +5,7 @@
 {% block content %}
 <div class="row">
     <div class="col-md-12">
-        <img src="{% static camp.logo_large %}" height="350px" width="400px" class="img-responsive" id="front-logo" />
+        <img src="{% static camp.logo_large %}" width="800" class="img-responsive" id="front-logo" />
     </div>
 </div>
 
@@ -28,7 +28,7 @@
         </div>
         <div class="col-md-9 col-sm-9 text-container">
             <div class="lead">
-                <strong>BornHack 2019</strong> will be the fourth BornHack. It will take place from <strong>Thursday the 8th of August to Thursday the 15th of August 2019</strong> at a our new venue on the Danish island of Funen.
+                <strong>BornHack 2021</strong> will be the sixth BornHack. It will take place from <strong>Thursday the 19th of August to Thursday the 26th of August 2021</strong> at a our venue on the Danish island of Funen.
             </div>
         </div>
 </div>

src/static_src/img/favicon/browserconfig.xml

@@ -2,8 +2,8 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
-            <TileColor>#2b5797</TileColor>
+            <square150x150logo src="/img/favicon/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
         </tile>
     </msapplication>
 </browserconfig>

src/static_src/img/favicon/manifest.json

@@ -1,18 +0,0 @@
-{
-    "name": "",
-    "icons": [
-        {
-            "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "/android-chrome-384x384.png",
-            "sizes": "384x384",
-            "type": "image/png"
-        }
-    ],
-    "theme_color": "#ffffff",
-    "background_color": "#ffffff",
-    "display": "standalone"
-}

src/static_src/img/favicon/safari-pinned-tab.svg

@@ -2,50 +2,85 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
  "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="16.000000pt" height="16.000000pt" viewBox="0 0 16.000000 16.000000"
+ width="786.000000pt" height="786.000000pt" viewBox="0 0 786.000000 786.000000"
  preserveAspectRatio="xMidYMid meet">
 <metadata>
 Created by potrace 1.11, written by Peter Selinger 2001-2013
 </metadata>
-<g transform="translate(0.000000,16.000000) scale(0.004000,-0.004000)"
+<g transform="translate(0.000000,786.000000) scale(0.100000,-0.100000)"
 fill="#000000" stroke="none">
-<path d="M890 3793 c-85 -47 -157 -87 -158 -89 -2 -1 -13 -75 -23 -163 l-19
--161 -113 -257 -113 -258 -44 -232 -43 -231 51 -184 50 -183 -19 -120 c-11
--66 -24 -167 -29 -223 -8 -79 -19 -125 -45 -190 -19 -47 -34 -86 -32 -88 1 -1
-21 -11 43 -22 40 -21 54 -38 54 -69 0 -8 32 -52 72 -97 63 -72 76 -82 112 -86
-37 -5 43 -10 70 -58 26 -49 41 -62 189 -158 l160 -105 57 20 57 21 113 -64
-c96 -55 118 -64 147 -59 21 4 38 1 42 -5 4 -6 94 -43 201 -82 l195 -71 70 -70
-c69 -68 72 -69 103 -58 30 10 36 8 112 -45 79 -56 84 -58 253 -96 94 -22 197
--51 227 -66 35 -16 84 -28 137 -33 72 -7 92 -14 153 -51 l70 -42 38 26 c70 49
-110 91 244 256 74 91 138 171 142 177 4 7 -9 62 -28 123 -20 60 -36 115 -36
-121 0 6 13 27 30 46 21 23 30 44 30 67 0 28 8 40 45 70 45 37 45 38 45 101 0
-62 1 65 50 121 l49 58 -6 81 c-3 44 -13 96 -21 115 -8 19 -16 58 -17 85 -1 28
--8 72 -16 99 l-14 49 49 42 c47 42 48 44 33 66 -15 20 -14 25 4 60 10 21 19
-40 19 42 0 2 -59 59 -131 126 l-130 124 -52 -15 c-52 -14 -52 -14 -147 25 -65
-27 -148 76 -264 155 -123 84 -183 119 -219 127 -36 8 -69 28 -127 75 -79 65
--79 65 -130 185 -42 102 -59 129 -104 174 l-53 52 -86 -42 c-80 -40 -87 -42
--104 -27 -25 23 -261 129 -303 137 -32 6 -38 12 -74 88 l-39 82 -58 -6 -57 -6
--56 53 -57 53 -35 -16 c-19 -9 -39 -17 -44 -17 -4 0 -31 69 -59 153 l-52 154
--94 59 -94 59 -1 103 c0 56 -3 102 -7 102 -5 -1 -78 -39 -163 -87z m196 -325
-c27 -16 35 -34 79 -173 27 -86 53 -159 59 -163 28 -21 154 -59 168 -51 11 6
-28 -2 61 -31 35 -31 53 -40 82 -40 35 0 37 -2 72 -75 l35 -75 56 0 c45 0 76
--9 166 -50 92 -42 116 -58 140 -91 27 -39 30 -40 70 -34 22 4 70 20 105 36 35
-16 65 28 66 27 1 -2 23 -56 50 -121 l48 -118 120 -100 c103 -86 124 -99 156
--99 35 0 124 -53 266 -159 22 -17 55 -37 73 -47 17 -9 32 -20 32 -25 0 -5 7
--9 15 -9 8 0 34 -8 58 -19 156 -69 195 -81 227 -69 30 10 34 8 83 -38 28 -27
-53 -50 56 -51 11 -6 -26 -72 -57 -98 l-34 -31 22 -73 c19 -65 20 -75 7 -88
--13 -13 -10 -26 24 -108 51 -123 51 -144 -6 -211 -41 -48 -45 -57 -45 -106 0
--51 -3 -56 -45 -98 -37 -36 -45 -51 -45 -80 0 -27 -10 -47 -40 -84 -22 -26
--40 -53 -40 -60 0 -6 16 -62 35 -125 l34 -114 -121 -148 c-67 -82 -127 -149
--134 -149 -7 0 -28 9 -46 20 -21 12 -68 23 -125 30 -55 6 -105 18 -125 29 -18
-11 -114 38 -212 60 l-179 41 -95 67 c-74 51 -103 66 -127 65 -24 -2 -39 7 -74
-42 -39 40 -61 51 -219 108 -174 62 -176 63 -190 101 -17 41 -19 41 -107 27
-l-60 -10 -122 70 -123 70 -51 -21 -52 -20 -51 32 c-28 18 -64 39 -80 48 -16 9
--40 26 -54 39 -14 12 -28 22 -32 22 -8 0 -40 67 -40 85 0 8 -4 15 -10 15 -5 0
--16 13 -25 29 -13 27 -21 30 -67 33 -48 3 -55 6 -85 46 -24 32 -33 54 -33 82
-0 28 -6 41 -22 52 -20 14 -21 18 -10 43 7 15 15 55 18 89 3 33 17 147 31 251
-l26 190 -46 168 c-26 92 -47 179 -47 193 0 15 16 112 36 218 l37 191 113 255
-c104 237 113 262 123 350 7 52 14 112 17 132 l6 37 86 -56 c48 -31 101 -64
-118 -75z"/>
+<path d="M4913 7592 c-76 -83 -620 -629 -749 -752 -344 -327 -608 -555 -884
+-764 -133 -101 -407 -296 -415 -296 -2 0 -30 -17 -62 -39 -138 -91 -371 -231
+-518 -311 -185 -100 -241 -132 -251 -143 -6 -7 -53 -127 -104 -267 -101 -280
+-147 -406 -244 -670 -35 -96 -112 -307 -170 -468 -59 -161 -111 -303 -116
+-315 -5 -12 -81 -222 -170 -467 -88 -245 -165 -454 -170 -465 -5 -11 -19 -49
+-30 -85 -12 -36 -28 -78 -35 -95 -7 -16 -22 -57 -33 -90 -11 -34 -26 -74 -33
+-90 -21 -53 -27 -69 -49 -135 -23 -68 -30 -86 -50 -135 -7 -16 -16 -41 -20
+-55 -5 -14 -24 -68 -43 -120 -50 -139 -395 -1081 -429 -1175 -17 -44 -43 -116
+-58 -160 -16 -44 -45 -123 -64 -174 -19 -52 -33 -97 -31 -99 7 -7 2265 -5
+2272 1 3 4 21 50 39 104 18 54 123 366 234 693 111 327 251 741 311 920 60
+179 130 384 154 455 77 227 384 1135 430 1270 24 72 134 398 245 725 111 327
+214 633 230 680 16 47 117 346 225 665 108 319 216 639 240 710 24 72 125 370
+225 664 99 294 179 535 177 537 -1 1 -26 -23 -54 -54z"/>
+<path d="M5045 7418 c-3 -7 -35 -103 -71 -213 -76 -228 -939 -2802 -947 -2825
+-63 -178 -419 -1262 -415 -1265 3 -3 58 15 123 40 65 25 123 44 130 42 6 -3
+16 -20 22 -38 6 -19 41 -117 78 -219 195 -538 196 -540 182 -545 -7 -3 -98
+-26 -202 -53 l-190 -49 -32 91 c-17 50 -47 136 -68 191 -71 196 -97 270 -102
+293 -11 45 -22 30 -59 -82 l-37 -113 71 -200 c40 -111 72 -205 72 -210 0 -5
+-71 -29 -157 -52 l-158 -43 -53 -163 -53 -163 17 -44 c39 -103 59 -160 164
+-458 61 -173 120 -337 130 -365 11 -27 76 -210 145 -405 l126 -355 1960 0
+c1738 0 1960 2 1956 15 -3 8 -21 58 -40 110 -107 292 -683 1876 -704 1935 -13
+39 -28 79 -33 90 -8 17 -30 78 -122 335 -70 195 -741 2042 -752 2070 -22 55
+-46 121 -176 480 -67 184 -128 353 -137 375 -8 22 -32 87 -53 145 -69 194
+-320 884 -340 935 -35 91 -212 580 -214 590 -1 6 -4 15 -7 20 -4 6 -14 34 -23
+63 -18 54 -24 61 -31 40z m1064 -3613 c40 -110 90 -247 111 -305 73 -198 168
+-465 175 -491 6 -26 6 -26 -137 -63 -79 -20 -219 -56 -313 -81 -93 -25 -177
+-45 -185 -45 -9 0 -23 23 -36 63 -45 128 -233 647 -244 672 -9 20 -55 149 -70
+195 -7 25 -4 27 84 58 50 18 100 37 111 42 53 23 429 159 431 156 1 0 34 -91
+73 -201z m-804 -405 c58 -162 117 -324 130 -360 13 -36 27 -76 30 -90 4 -14
+11 -29 14 -35 11 -16 55 -155 50 -158 -3 -3 -203 -55 -310 -81 -8 -2 -39 -11
+-67 -20 -29 -8 -52 -13 -52 -10 0 3 -9 0 -19 -6 -11 -5 -34 -12 -53 -15 l-33
+-5 -78 217 c-43 120 -84 234 -92 253 -25 61 -145 400 -145 408 0 7 512 203
+517 198 1 -1 50 -134 108 -296z m-696 -312 c67 -189 126 -352 131 -363 29 -68
+57 -156 51 -159 -8 -5 -296 -81 -389 -103 -35 -8 -67 -11 -71 -7 -4 5 -17 36
+-29 69 -24 68 -175 490 -229 638 -20 54 -33 100 -30 103 6 7 419 162 433 163
+6 1 66 -153 133 -341z m1889 -355 c5 -16 38 -104 72 -198 34 -93 93 -258 132
+-365 38 -107 73 -204 78 -215 12 -29 68 -187 72 -204 2 -7 -6 -15 -17 -16 -69
+-11 -177 -26 -220 -31 -27 -3 -77 -9 -110 -14 -33 -5 -82 -12 -110 -15 -27 -4
+-57 -8 -65 -10 -8 -2 -42 -7 -75 -11 -33 -3 -64 -7 -69 -8 -6 -1 -165 413
+-221 579 -4 11 -8 22 -10 25 -4 10 -13 36 -55 150 -23 63 -48 134 -57 158 -16
+43 -14 54 12 58 8 1 65 14 127 29 62 15 123 29 135 31 12 2 34 9 48 14 14 5
+25 8 25 6 0 -1 57 12 128 30 161 41 168 41 180 7z m-829 -343 c203 -561 280
+-774 278 -776 -1 -1 -22 -5 -47 -9 -25 -3 -56 -8 -70 -10 -14 -2 -47 -7 -75
+-10 -27 -4 -59 -8 -70 -10 -11 -1 -42 -5 -70 -9 -27 -4 -90 -13 -138 -20 l-88
+-13 -15 35 c-7 19 -14 36 -14 38 0 2 -65 183 -145 403 -80 220 -145 405 -145
+410 0 7 182 56 330 88 8 2 58 14 110 26 52 13 96 23 97 22 1 0 29 -75 62 -165z
+m-741 -188 c35 -97 72 -199 82 -227 94 -251 166 -461 161 -466 -3 -4 -28 -10
+-56 -13 -27 -3 -86 -11 -130 -17 -44 -6 -89 -12 -100 -14 -11 -1 -58 -8 -104
+-14 -45 -7 -84 -11 -86 -9 -1 2 -62 167 -134 368 -73 201 -138 382 -146 403
+-8 20 -15 41 -15 46 0 5 93 32 208 59 195 47 240 58 252 61 3 0 33 -79 68
+-177z m-663 -92 c20 -58 58 -161 82 -230 25 -69 56 -154 69 -190 12 -36 39
+-109 58 -164 20 -54 36 -102 36 -106 0 -4 -25 -11 -56 -15 -31 -4 -66 -8 -78
+-10 -89 -15 -204 -28 -250 -29 -35 -1 -40 2 -48 29 -6 17 -20 59 -33 95 -73
+203 -161 447 -192 532 -35 98 -36 118 -5 118 9 0 96 20 192 44 96 24 178 40
+181 37 3 -3 23 -53 44 -111z m-588 -52 c7 -18 66 -185 132 -371 67 -185 121
+-341 121 -346 0 -5 -42 -14 -92 -21 -51 -6 -102 -13 -113 -15 -94 -13 -142
+-19 -150 -20 -5 0 -22 33 -37 75 -14 41 -72 201 -127 355 -56 153 -100 283
+-98 289 2 5 10 11 18 12 7 2 28 6 44 9 17 3 44 10 60 15 17 5 44 12 60 15 17
+3 55 12 85 19 80 21 85 20 97 -16z m3294 -628 c115 -308 341 -941 338 -945 -4
+-3 -362 -14 -639 -19 l-64 -1 -168 460 c-92 253 -172 470 -177 482 -12 26 -5
+29 89 38 36 3 76 8 90 10 24 4 53 7 180 21 30 3 66 8 80 10 14 2 57 7 95 10
+39 3 72 8 75 11 2 2 20 3 39 1 32 -3 35 -6 62 -78z m-891 -181 c110 -300 280
+-777 280 -785 0 -5 -42 -9 -93 -10 -103 -1 -620 -13 -827 -19 -74 -2 -247 -7
+-385 -10 -137 -3 -334 -8 -436 -11 l-186 -5 -11 28 c-6 15 -34 93 -62 173 -28
+80 -57 161 -65 180 -28 73 -143 395 -141 397 1 1 22 5 46 8 25 2 61 7 80 10
+19 2 58 7 85 10 69 7 116 12 215 24 47 6 110 13 140 16 30 3 71 7 90 10 19 2
+58 7 85 10 28 3 59 7 70 9 11 2 52 7 90 10 39 4 81 9 95 11 36 5 139 17 180
+21 19 2 54 6 78 9 23 3 63 7 90 11 26 3 63 7 82 9 19 3 55 7 80 10 25 3 86 10
+135 16 50 6 112 13 140 15 27 3 51 7 53 9 2 2 11 2 20 1 11 -2 33 -51 72 -157z
+m-2066 -132 c10 -28 38 -108 63 -177 57 -158 138 -385 168 -470 l22 -66 -71 0
+c-39 -1 -125 -3 -190 -4 l-120 -4 -103 285 c-56 156 -116 321 -132 367 l-30
+82 22 1 c12 1 31 3 42 4 11 1 49 6 85 10 36 3 90 10 120 14 112 14 103 16 124
+-42z"/>
 </g>
 </svg>

src/static_src/img/favicon/site.webmanifest

@@ -0,0 +1,19 @@
+{
+    "name": "BornHack",
+    "short_name": "BornHack",
+    "icons": [
+        {
+            "src": "/img/favicon/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/img/favicon/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#000000",
+    "background_color": "#000000",
+    "display": "standalone"
+}

src/templates/base.html

@@ -24,13 +24,15 @@
     {% bootstrap_javascript jquery=1 %}
 
     <!-- favicon.ico stuff -->
-    <link rel="shortcut icon" type="image/png" href="{% static 'img/favicon/favicon.ico' %}" sizes="16x16">
-    <link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/favicon/apple-touch-icon.png' %}">
-    <link rel="icon" type="image/png" href="{% static 'img/favicon/favicon-32x32.png' %}" sizes="32x32">
-    <link rel="icon" type="image/png" href="{% static 'img/favicon/favicon-16x16.png' %}" sizes="16x16">
-    <link rel="manifest" href="{% static 'img/favicon/manifest.json' %}">
-    <link rel="mask-icon" href="{% static 'img/favicon/safari-pinned-tab.svg' %}" color="#5bbad5">
-    <meta name="theme-color" content="#ffffff">
+	<link rel="apple-touch-icon" sizes="180x180" href="{% static 'img/favicon/apple-touch-icon.png' %}">
+	<link rel="icon" type="image/png" sizes="32x32" href="{% static 'img/favicon/favicon-32x32.png' %}">
+	<link rel="icon" type="image/png" sizes="16x16" href="{% static 'img/favicon/favicon-16x16.png' %}">
+	<link rel="manifest" href="{% static 'img/favicon/site.webmanifest' %}">
+	<link rel="mask-icon" href="{% static 'img/favicon/safari-pinned-tab.svg' %}" color="#000000">
+	<link rel="shortcut icon" href="{% static 'img/favicon/favicon.ico' %}">
+	<meta name="msapplication-TileColor" content="#da532c">
+	<meta name="msapplication-config" content="{% static 'img/favicon/browserconfig.xml' %}">
+	<meta name="theme-color" content="#000000">
 
     {% block extra_head %}
     {% endblock %}
@@ -50,11 +52,11 @@
           </button>
           {% if request.resolver_match.kwargs.camp_slug and camp %}
             <a class="navbar-brand" href="{% url 'camp_detail' camp_slug=camp.slug %}">
-                <img src="{% static camp.logo_small %}" height="50" width="190px" alt="bornhack" class="img-responsive">
+                <img src="{% static camp.logo_small %}" width="200" alt="bornhack" class="img-responsive">
             </a>
           {% else %}
             <a class="navbar-brand" href="/">
-              <img src="{% static 'img/logo-small.png' %}" alt="bornhack" class="img-responsive" width=200>
+              <img src="{% static 'img/logo-small.png' %}" alt="bornhack" class="img-responsive" width="200">
             </a>
             {% endif %}
         </div>