Updated logo thanks to @reallinfo

mailslurper · Apr 13, 2018 · ffd6e58 · ffd6e58
1 parent fa95533
commit ffd6e58
Show file tree

Hide file tree

Showing 10 changed files with 279 additions and 62 deletions.
diff --git a/assets/MailSlurperLogo.ico b/assets/MailSlurperLogo.ico
diff --git a/assets/MailSlurperLogo.png b/assets/MailSlurperLogo.png
diff --git a/bin/package.sh b/bin/package.sh
@@ -71,8 +71,7 @@ fi
 #
 cp ../LICENSE ./deploy
 cp ../cmd/mailslurper/config.json ./deploy
-cp ../assets/MailSlurperLogo.ico ./deploy
-cp ../assets/MailSlurperLogo.png ./deploy
+cp ../logo/logo.png ./deploy
 cp ../README.md ./deploy
 cp ./create-mssql.sql ./deploy
 cp ./create-mysql.sql ./deploy
@@ -117,8 +116,7 @@ fi
 #
 rm ./deploy/LICENSE
 rm ./deploy/config.json
-rm ./deploy/MailSlurperLogo.ico
-rm ./deploy/MailSlurperLogo.png
+rm ./deploy/logo.png
 rm ./deploy/README.md
 rm ./deploy/create-mssql.sql
 rm ./deploy/create-mysql.sql

diff --git a/cmd/mailslurper/mailslurper.go b/cmd/mailslurper/mailslurper.go
@@ -23,7 +23,7 @@ import (
 
 const (
 	// Version of the MailSlurper Server application
-	SERVER_VERSION string = "1.13.1"
+	SERVER_VERSION string = "1.13.2"
 
 	// Set to true while developing
 	DEBUG_ASSETS bool = false

diff --git a/cmd/mailslurper/version.json b/cmd/mailslurper/version.json
@@ -1,3 +1,3 @@
 {
-	"version": "1.13.1"
+	"version": "1.13.2"
 }
diff --git a/cmd/mailslurper/www/mailslurper/css/style.css b/cmd/mailslurper/www/mailslurper/css/style.css
@@ -71,6 +71,15 @@
 
 #showSearchFilters { padding: 8px 12px 8px 12px; }
 
+.mailSlurperLogoLink {
+	padding: 0px 15px;
+}
+
+.mailSlurperLogo {
+	height: 50px;
+	width: auto;
+}
+
 /*
  * Bootstrap
  */

diff --git a/cmd/mailslurper/www/mailslurper/images/favicon.ico b/cmd/mailslurper/www/mailslurper/images/favicon.ico
diff --git a/cmd/mailslurper/www/mailslurper/images/logo.png b/cmd/mailslurper/www/mailslurper/images/logo.png
diff --git a/cmd/mailslurper/www/mailslurper/layouts/mainLayout.gohtml b/cmd/mailslurper/www/mailslurper/layouts/mainLayout.gohtml
@@ -38,7 +38,7 @@
 					<span class="icon-bar"></span>
 					<span class="icon-bar"></span>
 				</button>
-				<a class="navbar-brand" href="/">MailSlurper</a>
+				<a class="navbar-brand mailSlurperLogoLink" href="/"><img src="/www/mailslurper/images/logo.png" alt="MailSlurper" class="mailSlurperLogo" /></a>
 			</div>
 
 			<div id="navbar" class="collapse navbar-collapse">

diff --git a/cmd/mailslurper/www/www.go b/cmd/mailslurper/www/www.go