Merge branch '3.3.x'

.gitignore

@@ -32,3 +32,4 @@ node_modules
 /tests/vendor
 /vagrant/phpbb-install-config.yml
 .vagrant
+*.DS_Store*

phpBB/adm/style/admin.css

@@ -217,14 +217,14 @@ li {
 #page-header {
 	font-size: 0.85em;
 	text-align: right;
-	background: url("../images/phpbb_logo.png") top left no-repeat;
+	background: url("../images/phpbb_logo.svg") top left no-repeat;
 	height: 54px;
 	margin-bottom: 10px;
 }
 
 .rtl #page-header {
 	text-align: left;
-	background: url("../images/phpbb_logo.png") top right no-repeat;
+	background: url("../images/phpbb_logo.svg") top right no-repeat;
 }
 
 #page-header h1 {

phpBB/styles/prosilver/template/overall_header.html

@@ -76,7 +76,9 @@
 			<div class="inner">
 
 			<div id="site-description" class="site-description">
-				<a id="logo" class="logo" href="<!-- IF U_SITE_HOME -->{U_SITE_HOME}<!-- ELSE -->{U_INDEX}<!-- ENDIF -->" title="<!-- IF U_SITE_HOME -->{L_SITE_HOME}<!-- ELSE -->{L_INDEX}<!-- ENDIF -->"><span class="site_logo"></span></a>
+		<a id="logo" class="logo" href="{% if U_SITE_HOME %}{{ U_SITE_HOME }}{% else %}{{ U_INDEX }}{% endif %}" title="{% if U_SITE_HOME %}{{ L_SITE_HOME }}{% else %}{{ L_INDEX }}{% endif %}">
+					<span class="site_logo"></span>
+				</a>
 				<h1>{SITENAME}</h1>
 				<p>{SITE_DESCRIPTION}</p>
 				<p class="skiplink"><a href="#start_here">{L_SKIP}</a></p>

phpBB/styles/prosilver/theme/colours.css

@@ -709,7 +709,7 @@ dd.profile-warnings {
 }
 
 /*  icon images */
-.site_logo { background-image: url("./images/site_logo.gif"); }
+.site_logo { background-image: url("./images/site_logo.svg"); }
 .contact-icon { background-image: url("./images/icons_contact.png"); }
 
 /* profile icons */

phpBB/styles/prosilver/theme/common.css

@@ -183,6 +183,7 @@ a:hover {
 }
 
 .site_logo {
+	background-repeat: no-repeat;
 	display: inline-block;
 	width: 149px;
 	height: 52px;