Merge remote-tracking branch 'origin/dockerbuild'

Conflicts:
	static/css/quay.css
This commit is contained in:
yackob03 2013-10-30 18:42:17 -04:00
commit 65aad1a2d9
52 changed files with 2117 additions and 204 deletions

View file

@ -36,13 +36,57 @@
100% { -webkit-transform: scale(1); }
}
@keyframes scaleup {
0% { transform: scale(0); }
100% { transform: scale(1); }
}
.user-tools .user-tool {
font-size: 24px;
margin-top: 14px;
color: #aaa;
}
.user-tools i.user-tool:hover {
cursor: pointer;
color: #428bca;
}
.status-boxes .popover {
margin-right: 20px;
}
.status-boxes .popover-content {
width: 260px;
}
.build-statuses {
}
.build-status-container {
padding: 4px;
margin-bottom: 10px;
border-bottom: 1px solid #eee;
width: 230px;
}
.build-status-container .build-message {
display: block;
white-space: nowrap;
font-size: 12px;
}
.build-status-container .progress {
height: 12px;
margin: 0px;
margin-top: 10px;
width: 230px;
}
.build-status-container:last-child {
margin-bottom: 0px;
border-bottom: 0px solid white;
}
.repo-circle {
position: relative;
@ -57,15 +101,23 @@
.repo-circle.no-background {
background: transparent;
position: relative;
height: 40px;
width: 40px;
}
.repo-circle .icon-lock {
font-size: 50%;
.repo-circle .fa-hdd {
font-size: 36px;
}
.repo-circle.no-background .fa-hdd {
font-size: 30px;
}
.repo-circle .fa-lock {
position: absolute;
bottom: -6px;
right: 0px;
bottom: -2px;
right: -4px;
background: rgb(253, 191, 191);
width: 20px;
display: inline-block;
@ -73,11 +125,11 @@
text-align: center;
height: 20px;
line-height: 21px;
font-size: 12px;
font-size: 16px !important;
}
.repo-circle.no-background .icon-lock {
bottom: -4px;
.repo-circle.no-background .fa-lock {
bottom: -2px;
right: -6px;
color: #444;
}
@ -117,6 +169,85 @@
text-decoration: none !important;
}
.new-repo .required-plan {
margin: 10px;
margin-top: 20px;
margin-left: 50px;
}
.new-repo .required-plan .alert {
color: #444 !important;
}
.new-repo .new-header {
font-size: 22px;
}
.new-repo .new-header .repo-circle {
margin-right: 14px;
}
.new-repo .new-header .name-container {
display: inline-block;
width: 300px;
}
.new-repo .description {
margin-left: 10px;
margin-top: 10px;
}
.new-repo .section {
padding-bottom: 20px;
border-bottom: 1px solid #eee;
margin-bottom: 16px;
}
.new-repo .repo-option {
margin: 6px;
margin-top: 16px;
}
.new-repo .repo-option i {
font-size: 18px;
padding-left: 10px;
padding-right: 10px;
width: 42px;
display: inline-block;
text-align: center;
}
.new-repo .option-description {
display: inline-block;
vertical-align: top;
}
.new-repo .option-description label {
display: block;
}
.new-repo .cbox {
margin: 10px;
}
.new-repo .initialize-repo {
margin: 10px;
margin-top: 16px;
margin-left: 20px;
padding: 10px;
border: 1px dashed #ccc;
}
.new-repo .initialize-repo .init-description {
color: #444;
font-size: 12px;
text-align: center;
}
.new-repo .initialize-repo .file-drop {
margin: 10px;
}
.user-guide h3 {
margin-bottom: 20px;
}
@ -532,6 +663,7 @@ p.editable:hover i {
}
.repo .description {
margin-top: 10px;
margin-bottom: 40px;
}
@ -561,22 +693,70 @@ p.editable:hover i {
display: inline-block;
}
.repo .status-boxes {
float: right;
margin-bottom: 20px;
}
.repo .status-boxes .status-box {
cursor: pointer;
display: inline-block;
border: 1px solid #eee;
border-radius: 4px;
}
.repo .status-boxes .status-box .title {
padding: 4px;
display: inline-block;
padding-left: 10px;
padding-right: 10px;
}
.repo .status-boxes .status-box .title i {
margin-right: 6px;
}
.repo .status-boxes .status-box .count {
display: inline-block;
background-image: linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);
padding: 4px;
padding-left: 10px;
padding-right: 10px;
font-weight: bold;
transform: scaleX(0);
-webkit-transform: scaleX(0);
-moz-transform: scaleX(0);
transition: transform 500ms ease-in-out;
-webkit-transition: -webkit-transform 500ms ease-in-out;
-moz-transition: -moz-transform 500ms ease-in-out;
}
.repo .status-boxes .status-box .count.visible {
transform: scaleX(1);
-webkit-transform: scaleX(1);
-moz-transform: scaleX(1);
}
.repo .pull-command {
float: right;
display: inline-block;
font-size: 1.2em;
font-size: 0.8em;
position: relative;
margin-right: 10px;
margin-top: 30px;
margin-right: 26px;
}
.repo .pull-command .pull-container {
.repo .pull-container {
display: inline-block;
width: 300px;
margin-left: 10px;
margin-right: 10px;
vertical-align: middle;
}
.repo .pull-command input {
.repo .pull-container input {
cursor: default;
background: white;
color: #666;
@ -702,7 +882,6 @@ p.editable:hover i {
}
.repo-listing i {
font-size: 1.5em;
color: #999;
display: inline-block;
margin-right: 6px;
@ -742,8 +921,22 @@ p.editable:hover i {
cursor: pointer;
}
.repo .description p {
margin-bottom: 6px;
.repo .build-info {
padding: 10px;
margin: 0px;
}
.repo .build-info .progress {
margin: 0px;
margin-top: 10px;
}
.repo .section {
display: block;
margin-bottom: 20px;
padding-bottom: 20px;
border-bottom: 1px solid #eee;
}
.repo .description p:last-child {
@ -793,15 +986,15 @@ p.editable:hover i {
margin-right: 10px;
}
.repo .changes-container i.icon-plus-sign-alt {
.repo .changes-container i.fa-plus-square {
color: rgb(73, 209, 73);
}
.repo .changes-container i.icon-minus-sign-alt {
.repo .changes-container i.fa-minus-square {
color: rgb(209, 73, 73);
}
.repo .changes-container i.icon-edit-sign {
.repo .changes-container i.fa-pencil-square {
color: rgb(73, 100, 209);
}
@ -929,11 +1122,11 @@ p.editable:hover i {
width: 580px;
}
.repo-admin .repo-access-state .state-icon i.icon-lock {
.repo-admin .repo-access-state .state-icon i.fa-lock {
background: rgb(253, 191, 191);
}
.repo-admin .repo-access-state .state-icon i.icon-unlock-alt {
.repo-admin .repo-access-state .state-icon i.fa-unlock {
background: rgb(170, 236, 170);
}
@ -1105,6 +1298,7 @@ p.editable:hover i {
border: 1px solid #eee;
margin-top: 10px;
padding: 10px;
min-height: 50px;
}
/* Overrides for typeahead to work with bootstrap 3. */