Merge pull request #5844 from NuGet/dev

[ReleasePrep][2018.04.25]RI of dev into master
NuGet · May 2, 2018 · a7317bb · a7317bb
2 parents 67373eb + 6200a64
commit a7317bb
Show file tree

Hide file tree

Showing 229 changed files with 13,671 additions and 3,470 deletions.
diff --git a/src/Bootstrap/dist/css/bootstrap-theme.css b/src/Bootstrap/dist/css/bootstrap-theme.css
diff --git a/src/Bootstrap/less/theme/base.less b/src/Bootstrap/less/theme/base.less
@@ -103,29 +103,12 @@ body {
 .main-container {
   padding-bottom: 75px;
   height: auto;
-
-  .page-subheading {
-    color: #777;
-  }
 }
 
 .navbar-logo {
   margin: 8px 20px 0 0;
 }
 
-.navbar-seperated {
-  .seperator {
-    padding: 11px 0;
-    color: #fff;
-    display: block;
-    font-weight: 100;
-
-    > span::after {
-      content: " | ";
-    }
-  }
-}
-
 .dropdown-menu {
   padding-top: (@padding-large-vertical * 2);
   padding-bottom: (@padding-large-vertical * 2);

diff --git a/src/Bootstrap/less/theme/page-account-settings.less b/src/Bootstrap/less/theme/page-account-settings.less
@@ -37,4 +37,16 @@
       margin-top: 20px;
     }
   }
+
+  .login-account-row {
+    padding-top: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .certificates-form {
+    display: inline-block;
+    width: 100%;
+  }
 }
diff --git a/src/Bootstrap/less/theme/page-display-package.less b/src/Bootstrap/less/theme/page-display-package.less
@@ -21,6 +21,17 @@
 
   .package-details-main {
     .break-word;
+
+    .signature-info-cell {
+      cursor: default;
+      max-width: 1em;
+      padding-left: 0;
+      padding-right: 0;
+
+      .signature-info {
+        padding-left: 6px;
+      }
+    }
   }
 
   .package-details-info {

diff --git a/src/Bootstrap/less/theme/page-header.less b/src/Bootstrap/less/theme/page-header.less
@@ -1,4 +1,9 @@
 .warning-icon {
     vertical-align: bottom; 
     color: #ea7918;
+}
+
+.checkmark-icon {
+    vertical-align: bottom;
+    color: green;
 }
diff --git a/src/Bootstrap/less/theme/page-manage-organizations.less b/src/Bootstrap/less/theme/page-manage-organizations.less
@@ -37,45 +37,47 @@
       margin-top: 20px;
     }
   }
+
+  .certificates-form {
+    display: inline-block;
+    width: 100%;
+  }
 }
 
 .manage-members-listing tbody:first-child {
   border-style: hidden
 }
 
 .members-list {
-  margin-top: 15px;
-
   .manage-members-listing {
     margin-bottom: 0;
-
-    .heading-left {
-      padding-left: 5px;
-    }
-
-    .heading-right {
-      padding-right: 5px;
-    }
-
-    .icon-left {
-      padding-left: 25px;
-    }
-
-    .icon-right {
-      padding-right: 20px;
+
+    .alert-container {
+      .alert {
+        margin-top: 0px;
+      }
     }
-  
+
     .role-description {
-      margin-top: 15px;
+      margin-top: 25px;
       margin-bottom: 25px;
     }
 
-    .alert {
-      margin-bottom: 5px;
-    }
+    .member-item {
+      hr {
+        margin-top: 8px;
+        margin-bottom: 8px;
+      }
 
-    .row-center {
-      vertical-align: middle;
+      .member-column {
+        display: table;
+        height: 36px;
+
+        div {
+          display: table-cell;
+          vertical-align: middle;
+        }
+      }
     }
   }
-}
+}
diff --git a/src/Bootstrap/less/theme/page-manage-packages.less b/src/Bootstrap/less/theme/page-manage-packages.less
@@ -1,6 +1,10 @@
 .page-manage-packages {
   @section-margin-top: 40px;
 
+  .organizations-divider {
+    color: @gray-lighter;
+  }
+
   h1 {
     margin-bottom: 0;
   }
@@ -10,6 +14,10 @@
     margin-top: 0;
   }
 
+  .organizations-empty {
+    margin-top: 60px;
+  }
+
   .subtitle {
     margin-top: 33px;
   }
@@ -42,4 +50,8 @@
       top: 2px;
     }
   }
+
+  .inner-table {
+    margin-bottom: 0px;
+  }
 }
diff --git a/src/NuGetGallery.Core/Auditing/AuditedCertificateAction.cs b/src/NuGetGallery.Core/Auditing/AuditedCertificateAction.cs
@@ -0,0 +1,12 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+namespace NuGetGallery.Auditing
+{
+    public enum AuditedCertificateAction
+    {
+        Add,
+        Activate,
+        Deactivate
+    }
+}
diff --git a/src/NuGetGallery.Core/Auditing/AuditedPackageRegistrationAction.cs b/src/NuGetGallery.Core/Auditing/AuditedPackageRegistrationAction.cs
@@ -8,6 +8,7 @@ public enum AuditedPackageRegistrationAction
         AddOwner,
         RemoveOwner,
         MarkVerified,
-        MarkUnverified
+        MarkUnverified,
+        SetRequiredSigner
     }
 }
diff --git a/src/NuGetGallery.Core/Auditing/AuditedUserAction.cs b/src/NuGetGallery.Core/Auditing/AuditedUserAction.cs
@@ -16,6 +16,11 @@ public enum AuditedUserAction
         ConfirmEmail,
         Login,
         SubscribeToPolicies,
-        UnsubscribeFromPolicies
+        UnsubscribeFromPolicies,
+        AddOrganization,
+        TransformOrganization,
+        AddOrganizationMember,
+        RemoveOrganizationMember,
+        UpdateOrganizationMember
     }
 }