diff options
-rw-r--r-- | api/templates/email_change_body.html | 4 | ||||
-rw-r--r-- | api/templates/find_teams_body.html | 4 | ||||
-rw-r--r-- | api/templates/invite_body.html | 4 | ||||
-rw-r--r-- | api/templates/password_change_body.html | 4 | ||||
-rw-r--r-- | api/templates/post_body.html | 4 | ||||
-rw-r--r-- | api/templates/reset_body.html | 4 | ||||
-rw-r--r-- | api/templates/signup_team_body.html | 4 | ||||
-rw-r--r-- | api/templates/verify_body.html | 4 | ||||
-rw-r--r-- | api/templates/welcome_body.html | 4 | ||||
-rw-r--r-- | store/sql_store.go | 2 | ||||
-rw-r--r-- | web/static/images/Bladekick-logodark.png | bin | 7754 -> 10380 bytes | |||
-rw-r--r-- | web/static/images/Mattermost-logodark.png | bin | 7754 -> 10380 bytes |
12 files changed, 19 insertions, 19 deletions
diff --git a/api/templates/email_change_body.html b/api/templates/email_change_body.html index f8f3845e7..439fffd5b 100644 --- a/api/templates/email_change_body.html +++ b/api/templates/email_change_body.html @@ -8,7 +8,7 @@ <td style="border: 1px solid #ddd;"> <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> <tr> - <td style="padding: 20px 30px 10px; text-align:left;"> + <td style="padding: 20px 20px 10px; text-align:left;"> <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt=""> </td> </tr> @@ -32,7 +32,7 @@ </td> </tr> <tr> - <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;"> + <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;"> <p style="margin: 25px 0;"> <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt=""> </p> diff --git a/api/templates/find_teams_body.html b/api/templates/find_teams_body.html index 6eaaf56e0..a73ed0ad4 100644 --- a/api/templates/find_teams_body.html +++ b/api/templates/find_teams_body.html @@ -8,7 +8,7 @@ <td style="border: 1px solid #ddd;"> <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> <tr> - <td style="padding: 20px 30px 10px; text-align:left;"> + <td style="padding: 20px 20px 10px; text-align:left;"> <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt=""> </td> </tr> @@ -40,7 +40,7 @@ </td> </tr> <tr> - <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;"> + <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;"> <p style="margin: 25px 0;"> <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt=""> </p> diff --git a/api/templates/invite_body.html b/api/templates/invite_body.html index 46189fae5..ad0658e3d 100644 --- a/api/templates/invite_body.html +++ b/api/templates/invite_body.html @@ -8,7 +8,7 @@ <td style="border: 1px solid #ddd;"> <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> <tr> - <td style="padding: 20px 30px 10px; text-align:left;"> + <td style="padding: 20px 20px 10px; text-align:left;"> <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt=""> </td> </tr> @@ -35,7 +35,7 @@ </td> </tr> <tr> - <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;"> + <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;"> <p style="margin: 25px 0;"> <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt=""> </p> diff --git a/api/templates/password_change_body.html b/api/templates/password_change_body.html index 515c0a7d9..1d4a6e1c8 100644 --- a/api/templates/password_change_body.html +++ b/api/templates/password_change_body.html @@ -8,7 +8,7 @@ <td style="border: 1px solid #ddd;"> <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> <tr> - <td style="padding: 20px 30px 10px; text-align:left;"> + <td style="padding: 20px 20px 10px; text-align:left;"> <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt=""> </td> </tr> @@ -32,7 +32,7 @@ </td> </tr> <tr> - <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;"> + <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;"> <p style="margin: 25px 0;"> <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt=""> </p> diff --git a/api/templates/post_body.html b/api/templates/post_body.html index c0f4375d8..0aa913db5 100644 --- a/api/templates/post_body.html +++ b/api/templates/post_body.html @@ -8,7 +8,7 @@ <td style="border: 1px solid #ddd;"> <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> <tr> - <td style="padding: 20px 30px 10px; text-align:left;"> + <td style="padding: 20px 20px 10px; text-align:left;"> <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt=""> </td> </tr> @@ -35,7 +35,7 @@ </td> </tr> <tr> - <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;"> + <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;"> <p style="margin: 25px 0;"> <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt=""> </p> diff --git a/api/templates/reset_body.html b/api/templates/reset_body.html index af9f6b4e8..4c2fec1e7 100644 --- a/api/templates/reset_body.html +++ b/api/templates/reset_body.html @@ -8,7 +8,7 @@ <td style="border: 1px solid #ddd;"> <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> <tr> - <td style="padding: 20px 30px 10px; text-align:left;"> + <td style="padding: 20px 20px 10px; text-align:left;"> <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt=""> </td> </tr> @@ -35,7 +35,7 @@ </td> </tr> <tr> - <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;"> + <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;"> <p style="margin: 25px 0;"> <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt=""> </p> diff --git a/api/templates/signup_team_body.html b/api/templates/signup_team_body.html index 5a5ae4d47..5e60a042b 100644 --- a/api/templates/signup_team_body.html +++ b/api/templates/signup_team_body.html @@ -8,7 +8,7 @@ <td style="border: 1px solid #ddd;"> <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> <tr> - <td style="padding: 20px 30px 10px; text-align:left;"> + <td style="padding: 20px 20px 10px; text-align:left;"> <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt=""> </td> </tr> @@ -38,7 +38,7 @@ </td> </tr> <tr> - <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;"> + <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;"> <p style="margin: 25px 0;"> <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt=""> </p> diff --git a/api/templates/verify_body.html b/api/templates/verify_body.html index 67ded9c20..1a68c16f5 100644 --- a/api/templates/verify_body.html +++ b/api/templates/verify_body.html @@ -8,7 +8,7 @@ <td style="border: 1px solid #ddd;"> <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> <tr> - <td style="padding: 20px 30px 10px; text-align:left;"> + <td style="padding: 20px 20px 10px; text-align:left;"> <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt=""> </td> </tr> @@ -35,7 +35,7 @@ </td> </tr> <tr> - <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;"> + <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;"> <p style="margin: 25px 0;"> <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt=""> </p> diff --git a/api/templates/welcome_body.html b/api/templates/welcome_body.html index 7107bc2e0..cc4d95fb1 100644 --- a/api/templates/welcome_body.html +++ b/api/templates/welcome_body.html @@ -8,7 +8,7 @@ <td style="border: 1px solid #ddd;"> <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse;"> <tr> - <td style="padding: 20px 30px 10px; text-align:left;"> + <td style="padding: 20px 20px 10px; text-align:left;"> <img src="{{.TeamURL}}/static/images/{{.SiteName}}-logodark.png" width="130px" style="opacity: 0.5" alt=""> </td> </tr> @@ -32,7 +32,7 @@ </td> </tr> <tr> - <td style="text-align: center;color: #AAA; font-size: 13px; padding-bottom: 10px;"> + <td style="text-align: center;color: #AAA; font-size: 11px; padding-bottom: 10px;"> <p style="margin: 25px 0;"> <img width="65" src="{{.TeamURL}}/static/images/circles.png" alt=""> </p> diff --git a/store/sql_store.go b/store/sql_store.go index 606b2cbc1..0d4f76a72 100644 --- a/store/sql_store.go +++ b/store/sql_store.go @@ -224,7 +224,7 @@ func (ss SqlStore) CreateFullTextIndexIfNotExists(indexName string, tableName st func (ss SqlStore) createIndexIfNotExists(indexName string, tableName string, columnName string, fullText bool) { if utils.Cfg.SqlSettings.DriverName == "postgres" { - _, err := ss.GetMaster().SelectStr("SELECT to_regclass($1)", indexName) + _, err := ss.GetMaster().SelectStr("SELECT $1::regclass", indexName) // It should fail if the index does not exist if err == nil { return diff --git a/web/static/images/Bladekick-logodark.png b/web/static/images/Bladekick-logodark.png Binary files differindex 8f1268fdd..c16978ba8 100644 --- a/web/static/images/Bladekick-logodark.png +++ b/web/static/images/Bladekick-logodark.png diff --git a/web/static/images/Mattermost-logodark.png b/web/static/images/Mattermost-logodark.png Binary files differindex 8f1268fdd..c16978ba8 100644 --- a/web/static/images/Mattermost-logodark.png +++ b/web/static/images/Mattermost-logodark.png |