[ReleasePrep][2022.10.19]RI of dev into main (#9280)

* Update NuGetGallery.Services to address CG alerts (#9274) * Address accessibility for syntax highlighting (#9273) * address accessbility for syntax highlighting * Fix Support link (#9276) * fix broken support link * Update Download table heading (#9267) * update correct place * update table header placement * Add instructions to install MSBuildSdk packages (#9268) * Added "IsMSBuildSdkPackageType" to determine whether a package is of type MSBuildSdk. DisplayPackage view modified to show specific instructions for SDK types in project files as per #8800 * Changed "Include" to correct attribute "Name" for SDK package type Co-authored-by: Advay Tandon <[email protected]> Co-authored-by: lyndaidaii <[email protected]> * [CodeQL] Suppress CSRF token validation warnings (#9278) * Added CSRF token checks to address CodeQL bugs * Added CodeQL suppressions * Make thinner border for focused links (#9277) * Make thiner border for focused links * Change border size of package manager tabs * Delete comment line from base.less * Change nav-tabs color and make overflow-y visible for package-tags Co-authored-by: Joel Verhagen <[email protected]> Co-authored-by: lyndaidaii <[email protected]> Co-authored-by: toseni <[email protected]> Co-authored-by: Ian Rathbone <[email protected]> Co-authored-by: Advay Tandon <[email protected]> Co-authored-by: Daniel Olczyk <[email protected]>
NuGet · Oct 19, 2022 · be76056 · be76056
1 parent 214b162
commit be76056
Show file tree

Hide file tree

Showing 33 changed files with 472 additions and 107 deletions.
diff --git a/src/AccountDeleter/Configuration/GalleryConfiguration.cs b/src/AccountDeleter/Configuration/GalleryConfiguration.cs
@@ -115,5 +115,6 @@ public string SiteRoot
         public int? MaxIoThreads { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string InternalMicrosoftTenantKey { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
         public string AdminSenderUser { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
+        public string SupportEmailSiteRoot { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
     }
 }
diff --git a/src/AccountDeleter/Providers/AccountDeleteUrlHelper.cs b/src/AccountDeleter/Providers/AccountDeleteUrlHelper.cs
@@ -7,7 +7,7 @@ namespace NuGetGallery.AccountDeleter
 {
     public class AccountDeleteUrlHelper : IUrlHelper
     {
-        public string ConfirmPendingOwnershipRequest(string id, string username, string confirmationCode, bool relativeUrl)
+        public string ConfirmPendingOwnershipRequest(string id, string username, string confirmationCode, bool relativeUrl, bool supportEmail)
         {
             throw new NotImplementedException();
         }
@@ -17,12 +17,12 @@ public string ManagePackageOwnership(string id, bool relativeUrl)
             throw new NotImplementedException();
         }
 
-        public string Package(string id, string version, bool relativeUrl)
+        public string Package(string id, string version, bool relativeUrl, bool supportEmail)
         {
             throw new NotImplementedException();
         }
 
-        public string RejectPendingOwnershipRequest(string id, string username, string confirmationCode, bool relativeUrl)
+        public string RejectPendingOwnershipRequest(string id, string username, string confirmationCode, bool relativeUrl, bool supportEmail)
         {
             throw new NotImplementedException();
         }

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
@@ -118,6 +118,13 @@ body {
 .main-container {
   padding-bottom: 75px;
   height: auto;
+
+  a[href] {
+    &:focus {
+      outline: solid 2px;
+      outline-offset: 1px;
+    }
+  }
 }
 
 .navbar-logo {
@@ -343,6 +350,13 @@ img.reserved-indicator-icon {
   li {
     list-style: none;
     display: list-item;
+
+    a {
+      &:focus {
+        outline: solid 0.25px;
+        outline-offset: 0;
+      }
+    }
   }
 
   @media (min-width: @screen-sm-min) {
@@ -353,6 +367,10 @@ img.reserved-indicator-icon {
       overflow-y: hidden;
       padding-right: @padding-small-horizontal;
     }
+
+    li.package-tags {
+      overflow-y: visible;
+    }
   }
 }
 

diff --git a/src/Bootstrap/less/theme/common-readme.less b/src/Bootstrap/less/theme/common-readme.less
@@ -42,8 +42,97 @@
     font-size: @font-size-base;
   }
 
-  pre code.hljs{
-    background-color: #f6f8fa;
+  pre {
+    code.hljs {
+      background-color: #f6f8fa;
+      color: #24292e; 
+
+      .hljs-doctag,
+      .hljs-keyword,
+      .hljs-meta .hljs-keyword,
+      .hljs-template-tag,
+      .hljs-template-variable,
+      .hljs-type,
+      .hljs-variable.language_ 
+      .hljs-built_in {
+        color: #cc3745;
+      }
+
+      .hljs-title,
+      .hljs-title.class_,
+      .hljs-title.class_.inherited__,
+      .hljs-title.function_ {
+        color: #6f42c1;
+      }
+
+      .hljs-attr,
+      .hljs-attribute,
+      .hljs-literal,
+      .hljs-meta,
+      .hljs-number,
+      .hljs-operator,
+      .hljs-variable,
+      .hljs-selector-attr,
+      .hljs-selector-class,
+      .hljs-selector-id {
+        color: #005cc5;
+      }
+
+      .hljs-regexp,
+      .hljs-string,
+      .hljs-meta .hljs-string {
+        color: #032f62;
+      }
+
+      .hljs-built_in,
+      .hljs-symbol {
+        color: #b74e05;
+      }
+
+      .hljs-comment,
+      .hljs-code,
+      .hljs-formula {
+        color: #6a737d;
+      }
+
+      .hljs-name,
+      .hljs-quote,
+      .hljs-selector-tag,
+      .hljs-selector-pseudo {
+        color: #207f37;
+      }
+
+      .hljs-subst {
+        color: #24292e;
+      }
+
+      .hljs-section {
+        color: #005cc5;
+        font-weight: bold;
+      }
+
+      .hljs-bullet {
+        color: #735c0f;
+      }
+
+      .hljs-emphasis {
+        color: #24292e;
+        font-style: italic;
+      }
+
+      .hljs-strong {
+        color: #24292e;
+        font-weight: bold;
+      }
+
+      .hljs-addition {
+        color: #207f37;
+      }
+
+      .hljs-deletion {
+        color: #b31d28;
+      }
+    }
   }
 } 
 

diff --git a/src/Bootstrap/less/theme/page-display-package.less b/src/Bootstrap/less/theme/page-display-package.less
@@ -357,6 +357,11 @@
           border: 0;
           padding: 5px 10px;
           margin: 0;
+
+          &:focus {
+            outline: 3px solid #0078D4;
+            outline-offset: 0;
+          }
         }
       }
     }
@@ -371,7 +376,7 @@
 
     .tab-content {
       .tab-pane {
-        
+
         .install-script-row {
           display: flex;
           height: 100%;
@@ -426,6 +431,11 @@
       font-family: @font-family-base;
       color: #323130;
 
+      &:focus {
+        outline: 3px solid #0078D4;
+        outline-offset: 0;
+      }
+
       .ms-Icon {
         position: relative;
         top: 2px;

diff --git a/src/Bootstrap/less/theme/page-statistics-per-package.less b/src/Bootstrap/less/theme/page-statistics-per-package.less
@@ -1,5 +1,8 @@
-.page-stats-per-package
-{
+.page-stats-per-package {
+    .table {
+      table-layout: fixed;
+    }
+
     .stats-table-control {
         margin-top: 40px;
     }
@@ -76,4 +79,4 @@
     .statistics-report-title {
         overflow-wrap: break-word;
     }
-}
+}
diff --git a/src/GalleryTools/App.config b/src/GalleryTools/App.config
@@ -25,6 +25,7 @@
 
     <!-- Used for testing locally. -->
     <add key="Gallery.SiteRoot" value="http://localhost"/>
+    <add key="Gallery.SupportEmailSiteRoot" value="http://localhost"/>	  
     <add key="Gallery.FileStorageDirectory" value="..\..\..\NuGetGallery\App_Data\Files"/>
     <add key="Gallery.LuceneIndexLocation" value="Temp"/>
     <add key="Gallery.IsHosted" value="false"/>

diff --git a/src/NuGetGallery.Services/Configuration/AppConfiguration.cs b/src/NuGetGallery.Services/Configuration/AppConfiguration.cs
@@ -210,6 +210,11 @@ public class AppConfiguration : IAppConfiguration
         /// </summary>
         public string SiteRoot { get; set; }
 
+        /// <summary>
+        /// Gets the protocol-independent support email site root
+        /// </summary>
+        public string SupportEmailSiteRoot { get; set; }
+
         /// <summary>
         /// Private key for verifying recaptcha user response.
         /// </summary>