Merge pull request #630 from kitematic/fix-username-overflow

Fixed long username and adjusted verify account layout.
This commit is contained in:
Jeffrey Morgan 2015-06-12 15:34:56 -07:00
commit 97e0b74d6d
4 changed files with 18 additions and 10 deletions

View File

@ -128,7 +128,12 @@ var Header = React.createClass({
username = (
<div className="login-wrapper">
<div className="login no-drag" onClick={this.handleUserClick}>
<span className="icon icon-user"></span> {this.state.username} {this.state.verified ? null : '(Unverified)'} <RetinaImage src="userdropdown.png"/>
<span className="icon icon-user"></span>
<span className="text">
{this.state.username}
{this.state.verified ? null : '(Unverified)'}
</span>
<RetinaImage src="userdropdown.png"/>
</div>
</div>
);

View File

@ -126,7 +126,7 @@ module.exports = React.createClass({
<div className="no-results">
<h2>Please verify your Docker Hub account email address</h2>
<div className="verify">
<button className="btn btn-primary btn-lg" onClick={this.handleCheckVerification}>{'I\'ve Verified My Email Address'}</button> {spinner}
<button className="btn btn-primary" onClick={this.handleCheckVerification}>{'I\'ve Verified My Email Address'}</button> {spinner}
</div>
<RetinaImage src="inspection.png" checkIfRetinaImgExists={false}/>
</div>

View File

@ -50,15 +50,18 @@
border-right: 1px solid @color-divider;
padding: 0 1rem 0 1rem;
.box-button();
&:active {
img, span {
-webkit-filter: brightness(0.9);
}
.text {
width: 70px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
img {
margin: 0 5px;
position: relative;
top: 0.1rem;
margin: 0 0rem 0 0.4rem;
width: 8px;
height: 5px;
}
}

View File

@ -55,7 +55,7 @@
}
.verify {
margin: 15px 0;
margin: 0.5rem 0 3rem 0;
position: relative;
.spinner {