diff options
| author | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 20:55:56 +0500 |
|---|---|---|
| committer | Asaad Mahmood <Unknowngi@live.com> | 2015-07-29 20:55:56 +0500 |
| commit | 1c186121fe04fb61d945f0b57112e28675c8e066 (patch) | |
| tree | f2cf511b15990bd01bfde349016388af39f8d340 /web/templates | |
| parent | 5d77ff4bcde3496554551701438c1f42550e58b3 (diff) | |
| parent | 27dbcd8767426a60699d2acbeeb9b8a825d5b728 (diff) | |
| download | chat-1c186121fe04fb61d945f0b57112e28675c8e066.tar.gz chat-1c186121fe04fb61d945f0b57112e28675c8e066.tar.bz2 chat-1c186121fe04fb61d945f0b57112e28675c8e066.zip | |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'web/templates')
| -rw-r--r-- | web/templates/head.html | 7 | ||||
| -rw-r--r-- | web/templates/signup_team.html | 4 | ||||
| -rw-r--r-- | web/templates/signup_team_complete.html | 2 | ||||
| -rw-r--r-- | web/templates/signup_user_complete.html | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/web/templates/head.html b/web/templates/head.html index d14340998..7a7d4fe8e 100644 --- a/web/templates/head.html +++ b/web/templates/head.html @@ -36,6 +36,13 @@ <script type="text/javascript" src="https://cloudfront.loggly.com/js/loggly.tracker.js" async></script> <script id="config" type="text/javascript" src="/static/config/config.js"></script> + <style id="antiClickjack">body{display:none !important;}</style> + <script type="text/javascript"> + if (self === top) { + var blocker = document.getElementById("antiClickjack"); + blocker.parentNode.removeChild(blocker); + } + </script> <script> if (config == null) { config = {}; diff --git a/web/templates/signup_team.html b/web/templates/signup_team.html index b86590589..b84b8e486 100644 --- a/web/templates/signup_team.html +++ b/web/templates/signup_team.html @@ -9,8 +9,8 @@ <div class="col-sm-12"> <div class="signup-team__container"> <img class="signup-team-logo" src="/static/images/logo.png" /> - <h2>All team communication in one place, searchable and accessible anywhere</h2> - <h4 class="text--light">{{ .SiteName }} is free for an unlimited time, for unlimited users </h4 class="text--light"> + <h1>Mattermost</h1> + <h4 class="color--light">All team communication in one place, searchable and accesible anywhere</h4> <div id="signup-team"></div> </div> </div> diff --git a/web/templates/signup_team_complete.html b/web/templates/signup_team_complete.html index 674e54ee2..041889435 100644 --- a/web/templates/signup_team_complete.html +++ b/web/templates/signup_team_complete.html @@ -19,7 +19,7 @@ </div> </div> <script> -window.setup_signup_team_complete_page('{{.Props.Email}}', '{{.Props.DisplayName}}', '{{.Props.Data}}', '{{.Props.Hash}}'); +window.setup_signup_team_complete_page('{{.Props.Email}}', '{{.Props.Data}}', '{{.Props.Hash}}'); </script> </body> </html> diff --git a/web/templates/signup_user_complete.html b/web/templates/signup_user_complete.html index 176ca77b1..e9f6bafcf 100644 --- a/web/templates/signup_user_complete.html +++ b/web/templates/signup_user_complete.html @@ -7,7 +7,7 @@ <div class="inner__wrap"> <div class="row content"> <div class="col-sm-12"> - <div class="signup-team__container"> + <div class="signup-team__container padding--less"> <div id="signup-user-complete"></div> </div> </div> |