vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into rockyhorror

Browse source 
Conflicts:
	test/data/test.db
This commit is contained in:
Jake Moshenko 2015-02-13 13:17:10 -05:00
commit 5aedd1fabc
5 changed files with 53 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
static/css/quay.css
View file

@ -845,28 +845,24 @@ i.toggle-icon:hover {
background-color: #DFFF00;
}
.phase-icon.waiting, .phase-icon.unpacking, .phase-icon.starting, .phase-icon.initializing {
background-color: #ddd;
.phase-icon.waiting, .phase-icon.build-scheduled {
background-color: rgba(66, 139, 202, 0.2);
}
.phase-icon.pulling {
background-color: #cab442;
.phase-icon.unpacking, .phase-icon.starting, .phase-icon.initializing {
background-color: rgba(66, 139, 202, 0.4);
}
.phase-icon.building {
background-color: #f0ad4e;
.phase-icon.pulling, .phase-icon.priming-cache, .phase-icon.checking-cache {
background-color: rgba(66, 139, 202, 0.6);
}
.phase-icon.priming-cache, .phase-icon.checking-cache {
background-color: #cab442;
}
.phase-icon.pushing {
background-color: #5cb85c;
.phase-icon.pushing, .phase-icon.building {
background-color: rgba(66, 139, 202, 0.8);
}
.phase-icon.complete {
background-color: #428bca;
background-color: rgba(66, 139, 202, 1);
}
.build-status {

3
static/js/app.js
View file

@ -5830,6 +5830,9 @@ quayApp.directive('buildMessage', function () {
case 'priming-cache':
return 'Priming cache for build';
case 'build-scheduled':
return 'Preparing build node';
case 'pushing':
return 'Pushing image built from Dockerfile';