Improved color palette and minor UI bug fixes.

This commit is contained in:
Sean Li 2015-04-27 10:49:11 -07:00
parent 5e159c8a8d
commit 708493b25b
19 changed files with 25 additions and 16 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 83 KiB

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 844 B

After

Width:  |  Height:  |  Size: 865 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 571 B

After

Width:  |  Height:  |  Size: 593 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 966 B

After

Width:  |  Height:  |  Size: 1002 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 749 B

After

Width:  |  Height:  |  Size: 740 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

After

Width:  |  Height:  |  Size: 92 KiB

View File

@ -31,7 +31,7 @@ var ContainerListItem = React.createClass({
});
ContainerStore.remove(this.props.container.Name, () => {
var containers = ContainerStore.sorted();
if (containers.length === 1) {
if (containers.length === 0) {
$(document.body).find('.new-container-item').parent().fadeIn();
}
});

View File

@ -75,7 +75,7 @@ var ImageCard = React.createClass({
name = (
<div>
<div className="namespace official">{namespace}</div>
<OverlayTrigger placement="bottom" overlay={<Tooltip>View on DockerHub</Tooltip>}>
<OverlayTrigger placement="bottom" overlay={<Tooltip>View on Docker Hub</Tooltip>}>
<span className="repo" onClick={this.handleRepoClick}>{repo}</span>
</OverlayTrigger>
</div>
@ -84,7 +84,7 @@ var ImageCard = React.createClass({
name = (
<div>
<div className="namespace">{namespace}</div>
<OverlayTrigger placement="bottom" overlay={<Tooltip>View on DockerHub</Tooltip>}>
<OverlayTrigger placement="bottom" overlay={<Tooltip>View on Docker Hub</Tooltip>}>
<span className="repo" onClick={this.handleRepoClick}>{repo}</span>
</OverlayTrigger>
</div>

View File

@ -126,7 +126,10 @@ var Setup = React.createClass({
<h1>We&#39;re Sorry!</h1>
<p>There seems to have been an unexpected error with Kitematic:</p>
<p className="error">{this.state.error.message || this.state.error}</p>
<p><button className="btn btn-action" onClick={this.handleErrorRetry}>Retry Setup</button> <button className="btn btn-action" onClick={this.handleErrorRemoveRetry}>Delete VM and Retry Setup</button></p>
<p className="setup-actions">
<button className="btn btn-action" onClick={this.handleErrorRetry}>Retry Setup</button>
<button className="btn btn-action" onClick={this.handleErrorRemoveRetry}>Delete VM and Retry Setup</button>
</p>
</div>
</div>
</div>

View File

@ -69,11 +69,11 @@
padding: 4px 8px 4px 35px;
color: @gray-darkest;
margin-bottom: 3px;
border-color: @gray-lightest;
border-color: @gray-lighter;
box-shadow: none;
&:focus {
box-shadow: none;
border-color: @gray-lighter;
border-color: @brand-primary;
}
&::-webkit-input-placeholder {
color: #DDD;
@ -96,7 +96,6 @@
width: 320px;
height: 166px;
border-radius: 4px;
border: 1px solid @gray-lightest;
background-color: white;
margin-right: 20px;
margin-bottom: 20px;
@ -154,6 +153,7 @@
border-bottom-left-radius: 3px;
justify-content: center;
text-align: center;
box-shadow: inset 0px 0px 0px 1px rgba(0,0,0,0.2);
img {
margin-top: 15px;
}
@ -161,6 +161,8 @@
.card {
padding: 10px 20px 10px 20px;
position: relative;
border: 1px solid @gray-lightest;
border-left: 0;
.badges {
position: absolute;
right: 15px;
@ -186,7 +188,6 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
text-decoration: underline;
}
}
.description {

View File

@ -100,7 +100,7 @@
}
&.radial-gray {
background: #EEE;
background: @gray-lightest;
}
&.radial-transparent {

View File

@ -63,6 +63,11 @@
overflow: auto;
}
}
.setup-actions {
button {
margin-right: 12px;
}
}
}
}

View File

@ -12,14 +12,14 @@
@traffic-light-gray: #E5E5E5;
@traffic-light-gray-border: #D3D3D3;
@gray-darkest: #253237;
@gray-darker: #394C51;
@gray-normal: #546C70;
@gray-lighter: #7A9999;
@gray-lightest: #C7D7D7;
@gray-darkest: #233137;
@gray-darker: #556473;
@gray-normal: #7A8491;
@gray-lighter: #C4CDDA;
@gray-lightest: #E1E8EF;
@color-divider: #DCE2E2;
@color-background: #F9F9F9;
@color-divider: @gray-lightest;
@color-background: #FCFCFC;
@font-regular: "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
@font-code: Menlo;