Merge pull request #328 from asaadmahmoodspin/mm-1874

mm-1874 - Improving team url screen and fixing file attachments in IE 10
Этот коммит содержится в:
Christopher Speller
2015-08-05 12:09:30 -04:00
родитель 2e684943b0 45ca0c7f8d
Коммит 110a1e51a4
3 изменённых файлов: 31 добавлений и 4 удалений

Просмотреть файл

@@ -248,6 +248,8 @@ TeamURLPage = React.createClass({
}, },
render: function() { render: function() {
$('body').tooltip( {selector: '[data-toggle=tooltip]', trigger: 'hover click'} );
client.track('signup', 'signup_team_03_url'); client.track('signup', 'signup_team_03_url');
var name_error = this.state.name_error ? <label className="control-label">{ this.state.name_error }</label> : null; 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={ name_error ? "form-group has-error" : "form-group" }>
<div className="row"> <div className="row">
<div className="col-sm-11"> <div className="col-sm-11">
<div className="input-group"> <div className="input-group input-group--limit">
<span className="input-group-addon">{ utils.getWindowLocationOrigin() + "/" }</span> <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}/> <input type="text" ref="name" className="form-control" placeholder="" maxLength="128" defaultValue={this.props.state.team.name} autoFocus={true} onFocus={this.handleFocus}/>
</div> </div>
</div> </div>

Просмотреть файл

@@ -114,8 +114,7 @@
height: 100px; height: 100px;
float: left; float: left;
margin: 5px 10px 5px 0; margin: 5px 10px 5px 0;
@include display-flex; display: table;
display: -ms-flexbox;
border: 1px solid lightgrey; border: 1px solid lightgrey;
.post__load { .post__load {
height: 100%; height: 100%;
@@ -137,10 +136,14 @@
} }
} }
.post-image__thumbnail { .post-image__thumbnail {
display: table-cell;
vertical-align: top;
width: 50%; width: 50%;
height: 100%; height: 100%;
} }
.post-image__details { .post-image__details {
display: table-cell;
vertical-align: top;
width: 50%; width: 50%;
height: 100%; height: 100%;
background: white; background: white;

Просмотреть файл

@@ -54,6 +54,28 @@
margin-bottom: 1em; margin-bottom: 1em;
} }
.input-group {
&.input-group--limit {
table-layout: fixed;
width: 100%;
.tooltip-inner {
word-wrap: break-word;
}
.form-control {
text-align: left;
display: table-cell;
width: 100%;
}
.input-group-addon {
text-align: left;
width: 50%;
display: table-cell;
overflow: hidden;
text-overflow: ellipsis;
}
}
}
.inner__content { .inner__content {
padding: 0 15px; padding: 0 15px;
margin: 30px 0 20px; margin: 30px 0 20px;