From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 15 Aug 2016 16:32:21 +0000 (+0200)
Subject: Updated logo
X-Git-Tag: 3.0.0_Beta_1~740
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=07937b161ca75cbcb98143abca40da3d55143bfc;p=GitHub%2FWoltLab%2FWCF.git

Updated logo
---

diff --git a/wcfsetup/install.php b/wcfsetup/install.php
index 636b7a333f..b8ba222bc2 100644
--- a/wcfsetup/install.php
+++ b/wcfsetup/install.php
@@ -21,7 +21,7 @@ set_error_handler('handleError', E_ALL);
 // define list of needed file
 $neededFilesPattern = [
 	'!^setup/.*!',
-	'!^install/files/acp/images/wcfLogo.*!',
+	'!^install/files/acp/images/woltlabSuite.*!',
 	'!^install/files/acp/style/setup/.*!',
 	'!^install/files/lib/data/.*!',
 	'!^install/files/icon/.*!',
diff --git a/wcfsetup/install/files/acp/images/wcfLogo-small.png b/wcfsetup/install/files/acp/images/wcfLogo-small.png
deleted file mode 100644
index f0fec150da..0000000000
Binary files a/wcfsetup/install/files/acp/images/wcfLogo-small.png and /dev/null differ
diff --git a/wcfsetup/install/files/acp/images/wcfLogo.png b/wcfsetup/install/files/acp/images/wcfLogo.png
deleted file mode 100644
index aeb620fa1a..0000000000
Binary files a/wcfsetup/install/files/acp/images/wcfLogo.png and /dev/null differ
diff --git a/wcfsetup/install/files/acp/images/woltlabSuite-small.png b/wcfsetup/install/files/acp/images/woltlabSuite-small.png
new file mode 100644
index 0000000000..7edb733aa3
Binary files /dev/null and b/wcfsetup/install/files/acp/images/woltlabSuite-small.png differ
diff --git a/wcfsetup/install/files/acp/images/woltlabSuite.png b/wcfsetup/install/files/acp/images/woltlabSuite.png
new file mode 100644
index 0000000000..13475ee6fb
Binary files /dev/null and b/wcfsetup/install/files/acp/images/woltlabSuite.png differ
diff --git a/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl b/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl
index a2e0807c3c..ba2350e52c 100644
--- a/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderLogo.tpl
@@ -1,6 +1,6 @@
 <div id="pageHeaderLogo" class="pageHeaderLogo">
 	<a href="{link}{/link}">
-		<img src="{@$__wcf->getPath()}acp/images/wcfLogo.png" alt="" class="pageHeaderLogoLarge">
-		<img src="{@$__wcf->getPath()}acp/images/wcfLogo-small.png" alt="" class="pageHeaderLogoSmall">
+		<img src="{@$__wcf->getPath()}acp/images/woltlabSuite.png" alt="" class="pageHeaderLogoLarge">
+		<img src="{@$__wcf->getPath()}acp/images/woltlabSuite-small.png" alt="" class="pageHeaderLogoSmall">
 	</a>
 </div>
\ No newline at end of file
diff --git a/wcfsetup/install/files/acp/templates/styleAdd.tpl b/wcfsetup/install/files/acp/templates/styleAdd.tpl
index 29320cd555..ac7a2c99d7 100644
--- a/wcfsetup/install/files/acp/templates/styleAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/styleAdd.tpl
@@ -492,7 +492,7 @@
 					<div id="spWindow">
 						<div id="spHeader" data-region="wcfHeader">
 							<div class="spBoundary">
-								<div id="spLogo"><img src="{@$__wcf->getPath()}acp/images/wcfLogo.png"></div>
+								<div id="spLogo"><img src="{@$__wcf->getPath()}acp/images/woltlabSuite.png"></div>
 								<div id="spSearch"><input type="search" id="spSearchBox" placeholder="{lang}wcf.global.search.enterSearchTerm{/lang}" autocomplete="off" data-region="wcfHeaderSearchBox"></div>
 								<div id="spMenu">
 									<ol class="inlineList" data-region="wcfHeaderMenu">
diff --git a/wcfsetup/install/files/images/default-logo-small.png b/wcfsetup/install/files/images/default-logo-small.png
index f0fec150da..7edb733aa3 100644
Binary files a/wcfsetup/install/files/images/default-logo-small.png and b/wcfsetup/install/files/images/default-logo-small.png differ
diff --git a/wcfsetup/install/files/images/default-logo.png b/wcfsetup/install/files/images/default-logo.png
index aeb620fa1a..13475ee6fb 100644
Binary files a/wcfsetup/install/files/images/default-logo.png and b/wcfsetup/install/files/images/default-logo.png differ
diff --git a/wcfsetup/setup/db/install.sql b/wcfsetup/setup/db/install.sql
index 186a6d9408..d2fb5a5488 100644
--- a/wcfsetup/setup/db/install.sql
+++ b/wcfsetup/setup/db/install.sql
@@ -1996,7 +1996,7 @@ INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('individual
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('messageSidebarOrientation', 'left');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('overrideScss', '');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogo', '');
-INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoWidth', '288');
+INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoWidth', '281');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoHeight', '40');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('pageLogoMobile', '');
 INSERT INTO wcf1_style_variable (variableName, defaultValue) VALUES ('useFluidLayout', '1');
diff --git a/wcfsetup/setup/template/header.tpl b/wcfsetup/setup/template/header.tpl
index f038f4c932..320bda96a4 100644
--- a/wcfsetup/setup/template/header.tpl
+++ b/wcfsetup/setup/template/header.tpl
@@ -32,7 +32,7 @@
 				<div>
 					<div class="layoutBoundary">
 						<div id="pageHeaderLogo" class="pageHeaderLogo">
-							<img src="{if $lastStep|isset}{@RELATIVE_WCF_DIR}acp/images/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showImage={/if}wcfLogo.png" alt="" style="height: 40px; width: 288px;">
+							<img src="{if $lastStep|isset}{@RELATIVE_WCF_DIR}acp/images/{else}install.php?tmpFilePrefix={@TMP_FILE_PREFIX}&amp;showImage={/if}woltlabSuite.png" alt="" style="height: 40px; width: 288px;">
 						</div>
 					</div>
 				</div>