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

Conflicts:
	data/database.py
	endpoints/api.py
	endpoints/common.py
	templates/base.html
	test/data/test.db
	test/specs.py

static/css/quay.css

@@ -9,6 +9,57 @@
   }
 }
 
+.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;
@@ -507,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;
 }
 
@@ -776,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;
@@ -2122,16 +2197,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;
@@ -2147,15 +2222,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;
 }