summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-08-04 18:58:13 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-08-04 18:58:13 +0500
commit6ee11f0cbe2150323a7f2a215ca9991520c14a56 (patch)
treed8871da267ba2cb9f5a5d4fdf0f2b02d7fe38220
parent42c5d0d366cb38866dd6d2ce7e8485ac7a2746a4 (diff)
downloadchat-6ee11f0cbe2150323a7f2a215ca9991520c14a56.tar.gz
chat-6ee11f0cbe2150323a7f2a215ca9991520c14a56.tar.bz2
chat-6ee11f0cbe2150323a7f2a215ca9991520c14a56.zip
mm-1874 - Improving team url screen and fixing file attachments in IE 10
-rw-r--r--web/react/components/signup_team_complete.jsx6
-rw-r--r--web/sass-files/sass/partials/_files.scss1
-rw-r--r--web/sass-files/sass/partials/_signup.scss18
3 files changed, 23 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>
diff --git a/web/sass-files/sass/partials/_files.scss b/web/sass-files/sass/partials/_files.scss
index ddc5e98bb..690b0caea 100644
--- a/web/sass-files/sass/partials/_files.scss
+++ b/web/sass-files/sass/partials/_files.scss
@@ -137,6 +137,7 @@
}
}
.post-image__thumbnail {
+ display: block;
width: 50%;
height: 100%;
}
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index 4b6ee79a1..d98e4b99f 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -54,6 +54,24 @@
margin-bottom: 1em;
}
+ .input-group {
+ &.input-group--limit {
+ table-layout: fixed;
+ width: 100%;
+ .form-control {
+ text-align: left;
+ display: table-cell;
+ width: 100%;
+ }
+ .input-group-addon {
+ width: 50%;
+ display: table-cell;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+ }
+ }
+
.inner__content {
padding: 0 15px;
margin: 30px 0 20px;