summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-08-05 12:29:28 -0400
committerChristopher Speller <crspeller@gmail.com>2015-08-05 12:29:28 -0400
commit201d165ed9552a39667eb997d381f893f1b12446 (patch)
tree176fdf85beb1b1ab9deff99fe2c011911c75cfdf /web/react
parent7692e67728cc471a5ac8903a859eba9d82c6429e (diff)
parenta2d26be5df2e4b3f73176044d92c923bb3899798 (diff)
downloadchat-201d165ed9552a39667eb997d381f893f1b12446.tar.gz
chat-201d165ed9552a39667eb997d381f893f1b12446.tar.bz2
chat-201d165ed9552a39667eb997d381f893f1b12446.zip
Merge pull request #342 from mattermost/release-0.6.0
Release 0.6.0
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/signup_team_complete.jsx6
1 files changed, 4 insertions, 2 deletions
diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx
index 447a405bd..3f35a5912 100644
--- a/web/react/components/signup_team_complete.jsx
+++ b/web/react/components/signup_team_complete.jsx
@@ -248,6 +248,8 @@ TeamURLPage = React.createClass({
},
render: function() {
+ $('body').tooltip( {selector: '[data-toggle=tooltip]', trigger: 'hover click'} );
+
client.track('signup', 'signup_team_03_url');
var name_error = this.state.name_error ? <label className="control-label">{ this.state.name_error }</label> : null;
@@ -260,8 +262,8 @@ TeamURLPage = React.createClass({
<div className={ name_error ? "form-group has-error" : "form-group" }>
<div className="row">
<div className="col-sm-11">
- <div className="input-group">
- <span className="input-group-addon">{ utils.getWindowLocationOrigin() + "/" }</span>
+ <div className="input-group input-group--limit">
+ <span data-toggle="tooltip" title={ utils.getWindowLocationOrigin() + "/" } className="input-group-addon">{ utils.getWindowLocationOrigin() + "/" }</span>
<input type="text" ref="name" className="form-control" placeholder="" maxLength="128" defaultValue={this.props.state.team.name} autoFocus={true} onFocus={this.handleFocus}/>
</div>
</div>