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

Conflicts:
	endpoints/api.py
	static/js/app.js
	static/partials/view-repo.html
	test/data/test.db
	test/specs.py
	test/test_api_usage.py
This commit is contained in:
jakedt 2014-03-26 19:42:29 -04:00
commit 302bfb27ae
123 changed files with 16314 additions and 3789 deletions

View file

@ -9,7 +9,74 @@
}
}
.notification-view-element {
cursor: pointer;
margin-bottom: 10px;
border-bottom: 1px solid #eee;
padding-bottom: 10px;
position: relative;
max-width: 320px;
}
.notification-view-element .orginfo {
margin-top: 8px;
float: left;
}
.notification-view-element .orginfo .orgname {
font-size: 12px;
color: #aaa;
}
.notification-view-element .circle {
position: absolute;
top: 14px;
left: 0px;
width: 12px;
height: 12px;
display: inline-block;
border-radius: 50%;
}
.notification-view-element .datetime {
margin-top: 16px;
font-size: 12px;
color: #aaa;
text-align: right;
}
.notification-view-element .message {
margin-bottom: 4px;
}
.notification-view-element .container {
padding: 10px;
border-radius: 6px;
margin-left: 16px;
}
.notification-view-element .container:hover {
background: rgba(66, 139, 202, 0.1);
}
.dockerfile-path {
margin-top: 10px;
padding: 20px;
padding-bottom: 0px;
font-family: Consolas, "Lucida Console", Monaco, monospace;
font-size: 14px;
}
.dockerfile-path:before {
content: "\f15b";
font-family: FontAwesome;
margin-right: 8px;
font-size: 18px;
}
.dockerfile-view {
margin-top: 10px;
margin: 20px;
padding: 20px;
background: #F7F6F6;
@ -282,21 +349,6 @@ i.toggle-icon:hover {
vertical-align: middle;
}
#copyClipboard {
cursor: pointer;
}
#copyClipboard.zeroclipboard-is-hover {
background: #428bca;
color: white;
}
#clipboardCopied.hovering {
position: absolute;
right: 0px;
top: 40px;
}
.content-container {
padding-bottom: 70px;
}
@ -506,7 +558,22 @@ i.toggle-icon:hover {
min-width: 200px;
}
.user-notification {
.notification-primary {
background: #428bca;
color: white;
}
.notification-info {
color: black;
background: #d9edf7;
}
.notification-warning {
color: #8a6d3b;
background: #fcf8e3;
}
.notification-error {
background: red;
}
@ -775,11 +842,20 @@ i.toggle-icon:hover {
margin-bottom: 16px;
}
.new-repo .section-title {
float: right;
color: #aaa;
}
.new-repo .repo-option {
margin: 6px;
margin-top: 16px;
}
.new-repo .repo-option label {
font-weight: normal;
}
.new-repo .repo-option i {
font-size: 18px;
padding-left: 10px;
@ -1596,10 +1672,17 @@ p.editable:hover i {
}
.repo .empty-description {
max-width: 600px;
padding: 6px;
}
.repo .empty-description pre:last-child {
margin-bottom: 0px;
}
.repo .empty-description .panel-default {
margin-top: 20px;
}
.repo dl.dl-horizontal dt {
width: 80px;
padding-right: 10px;
@ -1710,7 +1793,38 @@ p.editable:hover i {
margin-top: 28px;
}
#clipboardCopied {
.copy-box-element {
position: relative;
}
.global-zeroclipboard-container embed {
cursor: pointer;
}
#copyClipboard.zeroclipboard-is-hover, .copy-box-element .zeroclipboard-is-hover {
background: #428bca;
color: white;
cursor: pointer !important;
}
#clipboardCopied.hovering, .copy-box-element .hovering {
position: absolute;
right: 0px;
top: 40px;
pointer-events: none;
z-index: 100;
}
.copy-box-element .id-container {
display: inline-block;
vertical-align: middle;
}
.copy-box-element input {
background-color: white !important;
}
#clipboardCopied, .clipboard-copied-message {
font-size: 0.8em;
display: inline-block;
margin-right: 10px;
@ -1721,7 +1835,7 @@ p.editable:hover i {
border-radius: 4px;
}
#clipboardCopied.animated {
#clipboardCopied.animated, .clipboard-copied-message {
-webkit-animation: fadeOut 4s ease-in-out 0s 1 forwards;
-moz-animation: fadeOut 4s ease-in-out 0s 1 forwards;
-ms-animation: fadeOut 4s ease-in-out 0s 1 forwards;
@ -2037,6 +2151,13 @@ p.editable:hover i {
left: 4px;
}
.repo-admin .right-controls {
text-align: right;
margin-top: 10px;
padding-top: 10px;
border-top: 1px solid #eee;
}
.repo-admin .right-info {
font-size: 11px;
margin-top: 10px;
@ -2205,16 +2326,16 @@ p.editable:hover i {
padding-right: 6px;
}
.delete-ui {
.delete-ui-element {
outline: none;
}
.delete-ui i {
.delete-ui-element i {
cursor: pointer;
vertical-align: middle;
}
.delete-ui .delete-ui-button {
.delete-ui-element .delete-ui-button {
display: inline-block;
vertical-align: middle;
color: white;
@ -2230,15 +2351,15 @@ p.editable:hover i {
transition: width 500ms ease-in-out;
}
.delete-ui .delete-ui-button button {
.delete-ui-element .delete-ui-button button {
padding: 4px;
}
.delete-ui:focus i {
.delete-ui-element:focus i {
visibility: hidden;
}
.delete-ui:focus .delete-ui-button {
.delete-ui-element:focus .delete-ui-button {
width: 60px;
}
@ -2812,7 +2933,7 @@ p.editable:hover i {
margin-bottom: 10px;
}
.create-org .step-container .description {
.form-group .description {
margin-top: 10px;
display: block;
color: #888;
@ -2820,7 +2941,7 @@ p.editable:hover i {
margin-left: 10px;
}
.create-org .form-group input {
.form-group.nested input {
margin-top: 10px;
margin-left: 10px;
}
@ -2927,9 +3048,10 @@ p.editable:hover i {
.tt-suggestion {
display: block;
padding: 3px 20px;
cursor: pointer;
}
.tt-suggestion.tt-is-under-cursor {
.tt-suggestion.tt-cursor {
color: #fff;
background-color: #0081c2;
background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
@ -2941,10 +3063,17 @@ p.editable:hover i {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0)
}
.tt-suggestion.tt-is-under-cursor a {
.tt-suggestion.tt-cursor a {
color: #fff;
}
.tt-empty {
padding: 10px;
font-size: 12px;
color: #aaa;
white-space: nowrap;
}
.tt-suggestion p {
margin: 0;
}
@ -3380,4 +3509,216 @@ pre.command:before {
.label.MAINTAINER {
border-color: #aaa !important;
}
.dropdown-select {
margin: 10px;
position: relative;
}
.dropdown-select .dropdown-select-icon {
position: absolute;
top: 6px;
left: 6px;
z-index: 2;
display: none;
}
.dropdown-select .dropdown-select-icon.fa {
top: 10px;
left: 8px;
font-size: 20px;
}
.dropdown-select .dropdown-select-icon.none-icon {
color: #ccc;
display: inline;
}
.dropdown-select.has-item .dropdown-select-icon {
display: inline;
}
.dropdown-select.has-item .dropdown-select-icon.none-icon {
display: none;
}
.dropdown-select .lookahead-input {
padding-left: 32px;
}
.dropdown-select .twitter-typeahead {
display: block !important;
}
.dropdown-select .twitter-typeahead .tt-hint {
padding-left: 32px;
}
.dropdown-select .dropdown {
position: absolute;
right: 0px;
top: 0px;
}
.dropdown-select .dropdown button.dropdown-toggle {
border-top-left-radius: 0px;
border-bottom-left-radius: 0px;
}
.trigger-setup-github-element .github-org-icon {
width: 20px;
margin-right: 8px;
vertical-align: middle;
}
.trigger-setup-github-element li.github-repo-listing i {
margin-right: 10px;
margin-left: 6px;
}
.trigger-setup-github-element li.github-org-header {
padding-left: 6px;
}
.slideinout {
-webkit-transition:0.5s all;
transition:0.5s linear all;
opacity: 1;
position: relative;
height: 100px;
opacity: 1;
}
.slideinout.ng-hide {
opacity: 0;
height: 0px;
}
.slideinout.ng-hide-add, .slideinout.ng-hide-remove {
display: block !important;
}
.auth-header > img {
float: left;
margin-top: 8px;
margin-right: 20px;
}
.auth-header {
padding-bottom: 10px;
border-bottom: 1px solid #eee;
margin-bottom: 10px;
}
.auth-scopes .reason {
margin-top: 20px;
margin-bottom: 20px;
font-size: 18px;
}
.auth-scopes ul {
margin-top: 10px;
list-style: none;
}
.auth-scopes li {
display: block;
}
.auth-scopes .scope {
max-width: 500px;
}
.auth-scopes .scope-container:last-child {
border-bottom: 0px;
}
.auth-scopes .panel-default {
border: 0px;
margin-bottom: 0px;
padding-bottom: 10px;
box-shadow: none;
}
.auth-scopes .panel-default:last-child {
border-bottom: 0px;
}
.auth-scopes .panel-heading {
border: 0px;
background: transparent;
}
.auth-scopes .scope .title {
min-width: 300px;
cursor: pointer;
display: inline-block;
}
.auth-scopes .scope .title a {
color: #444;
}
.auth-scopes .scope .description {
padding: 10px;
}
.auth-scopes .scope i {
margin-right: 10px;
margin-top: 2px;
}
.auth-scopes .scope i.fa-lg {
font-size: 24px;
}
.auth-scopes .title i.arrow:before {
content: "\f0d7";
}
.auth-scopes .title.collapsed i.arrow:before {
content: "\f0da" !important;
}
.auth-container .button-bar form {
display: inline-block;
}
.auth-container .button-bar {
margin-top: 10px;
padding-top: 10px;
border-top: 1px solid #eee;
}
.auth-container .button-bar button {
margin: 6px;
}
.manage-application #oauth td {
padding: 6px;
padding-bottom: 20px;
}
.manage-application .button-bar {
margin-top: 10px;
padding-top: 20px;
border-top: 1px solid #eee;
}
.auth-info .by:before {
content: "by";
margin-right: 4px;
}
.auth-info .by {
color: #aaa;
font-size: 12px;
}
.auth-info .scope {
cursor: pointer;
margin-right: 4px;
}