From: John Dallahan <redacted>
Date: Wed, 24 Feb 2016 16:50:28 +0000 (+0200)
Subject: Merge branch 'master' into page-placeholders
X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/commitdiff_plain/refs/pull/29/head?hp=fba24f681711796fc6c054532c0e55f6d7eb80c9

Merge branch 'master' into page-placeholders
---

diff --git a/static/css/style.css b/static/css/style.css
index d076d4280..256df8a8f 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -54,6 +54,7 @@ a {
     align-items: center;
     border-bottom: 1px solid var(--border-color);
     z-index: 100;
+    padding-right: 5px;
 }
 
 @media all and (max-width: 600px) {
@@ -63,16 +64,10 @@ a {
 }
 
 .navbar a {
+    margin-top: 2px;
     height: 40px;
 }
 
-a.nav-light {
-    background-color: #eee;
-    height: 44px;
-    padding: 2px;
-    margin-right: 3px;
-}
-
 .nlogo {
     height: 40px;
 }
@@ -199,7 +194,7 @@ div.artlist {
     flex-wrap: wrap;
     justify-content: flex-start;
     align-items: stretch;
-    max-width: 600px;
+    max-width: var(--max-width);
     margin: 0 auto;
     margin-top: .5em;
 }
@@ -398,6 +393,10 @@ a.hchild:hover,a.hchild:active {
         border-radius: calc(var(--box-round) / 2);
         margin: 5px 0;
     }
+
+    div.artlist {
+        padding: 0 .3em;
+    }
 }
 
 .footer h2,.footer h3 {
diff --git a/static/img/logos/PIALogo_white.svg b/static/img/logos/PIALogo_white.svg
new file mode 100644
index 000000000..9d277a5e2
--- /dev/null
+++ b/static/img/logos/PIALogo_white.svg
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="-568 373 143 56" style="enable-background:new -568 373 143 56;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#349334;}
+	.st1{fill:url(#SVGID_1_);}
+	.st2{fill:#FFFFFF;}
+	.st3{fill:#118011;}
+	.st4{fill:url(#SVGID_2_);}
+	.st5{fill:#3CCE33;}
+	.st6{fill:url(#SVGID_3_);}
+	.st7{opacity:0.1;}
+	.st8{fill:url(#SVGID_4_);}
+</style>
+<g>
+	<g>
+		<g>
+			<g>
+				<path class="st0" d="M-478.5,383.8c2.2-1.1,4.9-1,7.1,0.4c3.3,2.2,4.2,6.6,2,9.8l-0.4,0.7l0.7,0.5c0.8,0.5,1,1.5,0.5,2.3
+					l-3.6,5.4c-0.2,0.4-0.4,0.6-0.7,0.7c-0.3,0.1-0.6,0-0.9-0.2l-1.2-0.8l-2.1,2.7l0,0c-0.1,0.1-0.2,0.2-0.4,0.3s-0.5,0.1-0.8-0.1
+					l-0.2-0.1V383.8z"/>
+				
+					<radialGradient id="SVGID_1_" cx="-1700.4744" cy="1202.4304" r="10.0419" gradientTransform="matrix(-0.8325 -0.554 0.554 -0.8325 -2559.1514 452.223)" gradientUnits="userSpaceOnUse">
+					<stop  offset="0" style="stop-color:#23FF16"/>
+					<stop  offset="0.3605" style="stop-color:#23FC16"/>
+					<stop  offset="0.581" style="stop-color:#21F415"/>
+					<stop  offset="0.7638" style="stop-color:#1FE613"/>
+					<stop  offset="0.9251" style="stop-color:#1CD110"/>
+					<stop  offset="1" style="stop-color:#1AC50F"/>
+				</radialGradient>
+				<path class="st1" d="M-478.5,384c2.1-1.1,4.8-1.1,7,0.4c3.2,2.1,4,6.4,1.9,9.5l-0.6,0.8l0.9,0.6c0.7,0.4,0.8,1.3,0.4,2l-3.6,5.4
+					c-0.2,0.4-0.4,0.6-0.6,0.6c-0.2,0.1-0.4,0-0.7-0.2l-1.3-0.9l-2.2,2.9l0,0l0,0c0,0.1-0.1,0.2-0.3,0.3c-0.2,0.1-0.3,0.1-0.6-0.1
+					l-0.3-0.2C-478.5,405.1-478.5,384-478.5,384z"/>
+				<polygon class="st2" points="-478.5,399.8 -475.2,402 -475.4,402.3 -478.5,400.3 				"/>
+				<polygon class="st3" points="-475.1,402.2 -470.4,395.3 -470.6,395.1 -475.3,402.1 				"/>
+				
+					<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="-1701.8217" y1="1201.9189" x2="-1701.8217" y2="1203.5168" gradientTransform="matrix(-0.8325 -0.554 0.554 -0.8325 -2559.1514 452.223)">
+					<stop  offset="0" style="stop-color:#23FF16"/>
+					<stop  offset="1" style="stop-color:#91FF8A"/>
+				</linearGradient>
+				<path class="st4" d="M-478.5,391.1c0.6,0.3,1.2,0.7,1.9,1.1c2.2,1.5,3.8,3,3.5,3.4c-0.3,0.4-2.3-0.5-4.5-1.9
+					c-0.3-0.2-0.6-0.4-0.9-0.6V391.1z"/>
+				<path class="st2" d="M-478.5,387.1c1.4-1.6,3.9-2,5.7-0.7c2,1.3,2.6,4,1.2,6.1l-0.7,1.1l-6.2-4.1V387.1z"/>
+				<circle cx="-472.9" cy="389.2" r="0.8"/>
+				<circle cx="-475.3" cy="387.6" r="0.8"/>
+				<polygon class="st2" points="-478.5,395.2 -477.3,396 -478.5,397.8 				"/>
+				<path class="st2" d="M-478.5,393.8c0.2,0,0.5,0.1,0.7,0.2c0.6,0.4,0.8,1.1,0.5,1.7l-0.3-0.2c0.1-0.5,0-1-0.4-1.2
+					c-0.2-0.1-0.3-0.2-0.5-0.2C-478.5,394.1-478.5,393.8-478.5,393.8z"/>
+				<path class="st5" d="M-475,402.6l1.2,0.8c0.2,0.1,0.3,0.2,0.5,0.2l-0.2,0.2c-0.1,0-0.2-0.1-0.3-0.1l-1.2-0.8l-0.9,1.2l-0.1-0.2
+					L-475,402.6z"/>
+				
+					<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="-1706.4683" y1="1197.5299" x2="-1709.1681" y2="1194.5349" gradientTransform="matrix(-0.8325 -0.554 0.554 -0.8325 -2559.1514 452.223)">
+					<stop  offset="0" style="stop-color:#23FF16"/>
+					<stop  offset="1" style="stop-color:#189A33"/>
+				</linearGradient>
+				<path class="st6" d="M-473.7,403.7c0.1,0.1,0.2,0.1,0.3,0.1l-0.1,0.1c-0.4,0.6-1.3,0.8-1.9,0.4l-0.4-0.2l0.9-1.2L-473.7,403.7z"
+					/>
+				<path d="M-473.6,391.1c-1.4,0-2.8-0.9-3.4-2.2c0.1-0.1,0.3-0.1,0.4-0.2c0.6,1.2,1.7,1.9,3,2C-473.6,390.8-473.6,391-473.6,391.1
+					z"/>
+			</g>
+		</g>
+		<path class="st2" d="M-518.7,408.6v-31.7h16.9c7.4,0,11.4,4.9,11.4,10.9c0,5.9-4,10.8-11.4,10.8h-7.3v10H-518.7z M-500.2,387.8
+			c0-1.7-1.3-2.5-2.9-2.5h-6.1v5h6.1C-501.4,390.3-500.2,389.5-500.2,387.8z"/>
+		<path class="st2" d="M-486.5,408.6v-31.7h9.6v31.7C-476.9,408.6-486.5,408.6-486.5,408.6z"/>
+		<path class="st2" d="M-445.8,408.6l-1.1-3.7h-11.4l-1.1,3.7h-11l11.7-31.7h12.1l11.7,31.7H-445.8z M-452.7,386.3l-3.1,10.2h6.3
+			L-452.7,386.3z"/>
+	</g>
+	<g>
+		<g class="st7">
+			<circle cx="-547" cy="394.6" r="17.2"/>
+		</g>
+		<g>
+			
+				<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="-548.4" y1="428.2611" x2="-548.4" y2="393.7636" gradientTransform="matrix(1 0 0 -1 0 804)">
+				<stop  offset="0" style="stop-color:#A0CE71"/>
+				<stop  offset="0.1827" style="stop-color:#7DC142"/>
+				<stop  offset="0.5169" style="stop-color:#45B549"/>
+				<stop  offset="1" style="stop-color:#0E733A"/>
+			</linearGradient>
+			<circle class="st8" cx="-548.4" cy="393" r="17.2"/>
+			<path class="st2" d="M-548.4,410.9c-2.4,0-4.8-0.5-7-1.4c-2.1-0.9-4-2.2-5.7-3.8c-1.6-1.7-2.9-3.6-3.8-5.8
+				c-0.9-2.2-1.4-4.5-1.4-7c0-2.4,0.5-4.8,1.4-7c0.9-2,2.2-3.9,3.9-5.5c1.6-1.6,3.6-2.9,5.7-3.8c2.2-0.9,4.5-1.4,7-1.4
+				s4.8,0.5,7,1.4c2.1,0.9,4,2.2,5.7,3.8c1.6,1.6,2.9,3.6,3.8,5.7c0.9,2.2,1.4,4.5,1.4,7c0,2.4-0.5,4.8-1.4,7
+				c-0.9,2.1-2.2,4-3.8,5.7c-1.6,1.6-3.6,2.9-5.7,3.8C-543.7,410.4-546,410.9-548.4,410.9z M-548.4,376.4c-2.2,0-4.4,0.4-6.5,1.3
+				c-2,0.8-3.8,2-5.3,3.6c-1.5,1.5-2.7,3.3-3.6,5.3c-0.8,2-1.2,4.1-1.2,6.4s0.4,4.4,1.3,6.5c0.8,2,2,3.8,3.6,5.3
+				c1.5,1.5,3.3,2.7,5.3,3.6c2.1,0.9,4.2,1.3,6.5,1.3s4.4-0.4,6.5-1.3c2-0.8,3.8-2,5.3-3.6c1.5-1.5,2.7-3.3,3.6-5.3
+				c0.9-2.1,1.3-4.2,1.3-6.5s-0.4-4.4-1.3-6.5c-0.8-2-2-3.8-3.6-5.3c-1.5-1.5-3.3-2.7-5.3-3.6C-544,376.8-546.2,376.4-548.4,376.4z"
+				/>
+		</g>
+		<path class="st2" d="M-542,389.9h-1.1v-1.7c0-2.9-2.4-5.2-5.3-5.2c-2.9,0-5.3,2.3-5.3,5.2v1.7h-1.2c-0.2,0-0.5,0.4-0.5,0.6v9.4
+			c0,0.2,0.3,0.4,0.5,0.4h12.9c0.2,0,0.6-0.2,0.6-0.4v-9.4C-541.4,390.3-541.8,389.9-542,389.9z M-546.1,389.9h-4.5v-1.7
+			c0-1.2,1-2.2,2.3-2.2c1.2,0,2.3,1,2.3,2.2L-546.1,389.9L-546.1,389.9z"/>
+	</g>
+	<g>
+		<g>
+			<path class="st2" d="M-564.9,423.4v3.7h-0.8v-9.4h0.7v1.1c0.5-0.7,1.4-1.2,2.4-1.2c1.8,0,3,1.4,3,3.6c0,2.2-1.2,3.6-3,3.6
+				C-563.5,424.7-564.4,424.2-564.9,423.4z M-560.3,421.1c0-1.7-0.9-2.9-2.4-2.9c-0.9,0-1.8,0.6-2.2,1.2v3.4
+				c0.4,0.6,1.3,1.2,2.2,1.2C-561.2,424-560.3,422.7-560.3,421.1z"/>
+			<path class="st2" d="M-557.6,424.5v-6.8h0.7v1.2c0.6-0.8,1.4-1.3,2.3-1.3v0.8c-0.1,0-0.2,0-0.4,0c-0.7,0-1.6,0.6-1.9,1.2v5h-0.7
+				V424.5z"/>
+			<path class="st2" d="M-553.4,416c0-0.3,0.3-0.6,0.6-0.6s0.6,0.2,0.6,0.6s-0.3,0.6-0.6,0.6S-553.4,416.3-553.4,416z M-553.2,424.5
+				v-6.8h0.7v6.8H-553.2z"/>
+			<path class="st2" d="M-548.3,424.5l-2.9-6.8h0.8l2.5,6l2.5-6h0.8l-2.9,6.8H-548.3z"/>
+			<path class="st2" d="M-539,424.5v-0.8c-0.6,0.7-1.4,1-2.3,1c-1.2,0-2.4-0.8-2.4-2.3s1.2-2.3,2.4-2.3c0.9,0,1.7,0.3,2.3,1v-1.4
+				c0-1-0.8-1.6-1.8-1.6c-0.9,0-1.5,0.3-2.1,1l-0.4-0.5c0.7-0.8,1.5-1.1,2.6-1.1c1.4,0,2.5,0.7,2.5,2.2v4.8
+				C-538.2,424.5-539,424.5-539,424.5z M-539,423.2v-1.5c-0.5-0.6-1.2-0.9-2.1-0.9c-1.1,0-1.9,0.7-1.9,1.7s0.7,1.7,1.9,1.7
+				C-540.3,424.1-539.5,423.8-539,423.2z"/>
+			<path class="st2" d="M-535.9,423.2v-4.9h-1.1v-0.6h1.1v-1.9h0.7v1.9h1.4v0.6h-1.4v4.7c0,0.6,0.2,0.9,0.7,0.9
+				c0.3,0,0.6-0.2,0.8-0.3l0.3,0.6c-0.3,0.3-0.6,0.4-1.2,0.4C-535.4,424.7-535.9,424.1-535.9,423.2z"/>
+			<path class="st2" d="M-532.5,421.1c0-2,1.4-3.6,3.3-3.6c2.1,0,3.2,1.6,3.2,3.6v0.2h-5.7c0.1,1.5,1.1,2.7,2.7,2.7
+				c0.9,0,1.7-0.3,2.2-0.9l0.4,0.5c-0.7,0.7-1.5,1.1-2.7,1.1C-531.1,424.7-532.5,423.2-532.5,421.1z M-529.2,418.1
+				c-1.6,0-2.4,1.4-2.5,2.6h5C-526.8,419.6-527.5,418.1-529.2,418.1z"/>
+			<path class="st2" d="M-524.5,415.9c0-0.6,0.5-1.1,1.1-1.1c0.6,0,1.1,0.5,1.1,1.1s-0.5,1.1-1.1,1.1
+				C-524.1,416.9-524.5,416.5-524.5,415.9z M-524.4,424.5v-6.8h1.8v6.8H-524.4z"/>
+			<path class="st2" d="M-516.2,424.5v-4.1c0-0.9-0.5-1.3-1.3-1.3c-0.7,0-1.2,0.4-1.6,0.8v4.6h-1.8v-6.8h1.9v0.9
+				c0.4-0.5,1.3-1,2.4-1c1.5,0,2.2,0.8,2.2,2.2v4.8h-1.8V424.5z"/>
+			<path class="st2" d="M-512.3,422.8v-3.5h-1.1v-1.6h1.1v-1.9h1.8v1.9h1.4v1.6h-1.4v3.1c0,0.4,0.2,0.8,0.6,0.8
+				c0.3,0,0.5-0.1,0.6-0.2l0.4,1.4c-0.3,0.2-0.7,0.4-1.5,0.4C-511.6,424.7-512.3,424-512.3,422.8z"/>
+			<path class="st2" d="M-508.3,421.1c0-2,1.5-3.6,3.5-3.6s3.4,1.5,3.4,3.7v0.4h-5.1c0.1,0.8,0.8,1.5,2,1.5c0.6,0,1.4-0.2,1.8-0.7
+				l0.8,1.2c-0.7,0.6-1.8,0.9-2.8,0.9C-506.7,424.7-508.3,423.3-508.3,421.1z M-504.8,419c-1.1,0-1.6,0.8-1.7,1.5h3.4
+				C-503.1,419.8-503.6,419-504.8,419z"/>
+			<path class="st2" d="M-500,424.5v-6.8h1.8v0.9c0.5-0.6,1.3-1.1,2.2-1.1v1.8c-0.1,0-0.3,0-0.5,0c-0.6,0-1.4,0.3-1.7,0.8v4.5h-1.8
+				V424.5z"/>
+			<path class="st2" d="M-490.4,424.5v-4.1c0-0.9-0.5-1.3-1.3-1.3c-0.7,0-1.2,0.4-1.6,0.8v4.6h-1.7v-6.8h1.8v0.9
+				c0.4-0.5,1.3-1,2.4-1c1.5,0,2.2,0.8,2.2,2.2v4.8h-1.8V424.5z"/>
+			<path class="st2" d="M-487.2,421.1c0-2,1.5-3.6,3.5-3.6s3.4,1.5,3.4,3.7v0.4h-5.1c0.1,0.8,0.8,1.5,2,1.5c0.6,0,1.4-0.2,1.8-0.7
+				l0.8,1.2c-0.7,0.6-1.8,0.9-2.8,0.9C-485.7,424.7-487.2,423.3-487.2,421.1z M-483.7,419c-1.1,0-1.6,0.8-1.7,1.5h3.4
+				C-482.1,419.8-482.5,419-483.7,419z"/>
+			<path class="st2" d="M-478.6,422.8v-3.5h-1.1v-1.6h1.1v-1.9h1.8v1.9h1.4v1.6h-1.4v3.1c0,0.4,0.2,0.8,0.6,0.8
+				c0.3,0,0.5-0.1,0.6-0.2l0.4,1.4c-0.3,0.2-0.7,0.4-1.5,0.4C-478,424.7-478.6,424-478.6,422.8z"/>
+			<path class="st2" d="M-469.6,424.5v-0.8c-0.6,0.7-1.4,1-2.3,1c-1.2,0-2.4-0.8-2.4-2.3s1.2-2.3,2.4-2.3c0.9,0,1.7,0.3,2.3,1v-1.4
+				c0-1-0.8-1.6-1.8-1.6c-0.9,0-1.5,0.3-2.1,1l-0.5-0.5c0.7-0.8,1.5-1.1,2.6-1.1c1.4,0,2.5,0.7,2.5,2.2v4.8H-469.6z M-469.6,423.2
+				v-1.5c-0.5-0.6-1.2-0.9-2.1-0.9c-1.1,0-1.9,0.7-1.9,1.7s0.7,1.7,1.9,1.7C-470.9,424.1-470.1,423.8-469.6,423.2z"/>
+			<path class="st2" d="M-467,421.1c0-2,1.3-3.6,3.3-3.6c1.2,0,1.9,0.5,2.4,1.2l-0.5,0.5c-0.5-0.7-1.1-0.9-1.9-0.9
+				c-1.6,0-2.6,1.3-2.6,2.9c0,1.6,1,2.9,2.6,2.9c0.7,0,1.4-0.3,1.9-1l0.5,0.5c-0.6,0.7-1.2,1.2-2.4,1.2
+				C-465.7,424.7-467,423.1-467,421.1z"/>
+			<path class="st2" d="M-460,421.1c0-2,1.3-3.6,3.3-3.6c1.2,0,1.9,0.5,2.4,1.2l-0.5,0.5c-0.5-0.7-1.1-0.9-1.9-0.9
+				c-1.6,0-2.6,1.3-2.6,2.9c0,1.6,1,2.9,2.6,2.9c0.7,0,1.4-0.3,1.9-1l0.5,0.5c-0.6,0.7-1.2,1.2-2.4,1.2
+				C-458.7,424.7-460,423.1-460,421.1z"/>
+			<path class="st2" d="M-453,421.1c0-2,1.4-3.6,3.3-3.6c2.1,0,3.2,1.6,3.2,3.6v0.2h-5.7c0.1,1.5,1.1,2.7,2.7,2.7
+				c0.9,0,1.7-0.3,2.2-0.9l0.4,0.5c-0.7,0.7-1.5,1.1-2.7,1.1C-451.6,424.7-453,423.2-453,421.1z M-449.8,418.1
+				c-1.6,0-2.4,1.4-2.5,2.6h5C-447.3,419.6-448.1,418.1-449.8,418.1z"/>
+			<path class="st2" d="M-445.2,423.6l0.4-0.5c0.4,0.6,1.2,1,2.2,1c1.1,0,1.8-0.6,1.8-1.4c0-1.9-4.3-0.8-4.3-3.3
+				c0-1,0.9-1.9,2.4-1.9c1.2,0,1.9,0.5,2.4,1l-0.4,0.5c-0.4-0.5-1.1-0.9-2-0.9c-1.1,0-1.7,0.5-1.7,1.2c0,1.7,4.3,0.7,4.3,3.3
+				c0,1.1-0.8,2-2.6,2C-443.7,424.7-444.6,424.3-445.2,423.6z"/>
+			<path class="st2" d="M-438.8,423.6l0.4-0.5c0.4,0.6,1.2,1,2.2,1c1.1,0,1.8-0.6,1.8-1.4c0-1.9-4.3-0.8-4.3-3.3
+				c0-1,0.9-1.9,2.4-1.9c1.2,0,1.9,0.5,2.4,1l-0.4,0.5c-0.4-0.5-1.1-0.9-2-0.9c-1.1,0-1.7,0.5-1.7,1.2c0,1.7,4.3,0.7,4.3,3.3
+				c0,1.1-0.8,2-2.6,2C-437.2,424.7-438.1,424.3-438.8,423.6z"/>
+		</g>
+		<g>
+			<g>
+				<path class="st2" d="M-431.1,416.6v2.7h-0.4v-2.7h-0.9v-0.4h2.1v0.4H-431.1z M-427.1,419.3v-2.5l-1,2.5h-0.1l-1-2.5v2.5h-0.4
+					v-3.1h0.6l0.9,2.2l0.9-2.2h0.6v3.1H-427.1z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/templates/base.html b/templates/base.html
index aa81b930a..eed835043 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -16,7 +16,7 @@
 <body>
     <nav class="navbar">
         <a href="{{ url_for("index") }}"><img alt="freenode" class="nlogo" src="{{ url_for("static/img/logos/coloured-alphabg.svg") }} "></a>
-        <a class="nav-light" href="https://www.privateinternetaccess.com/" target="_blank"><img alt="Private internet access" class="nlogo" src="{{ url_for("static/img/logos/PIALogo_black.svg") }}"></a>
+        <a href="https://www.privateinternetaccess.com/" target="_blank"><img alt="Private internet access" class="nlogo" src="{{ url_for("static/img/logos/PIALogo_white.svg") }}"></a>
     </nav>
     <div class="container">
             {% block content %}{% endblock %}