Skip to content

Commit be76056

Browse files
RiadGahlouzjoelverhagenlyndaidaiitoseniianrathbone
authored
[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]>
1 parent 214b162 commit be76056

33 files changed

+472
-107
lines changed

src/AccountDeleter/Configuration/GalleryConfiguration.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,5 +115,6 @@ public string SiteRoot
115115
public int? MaxIoThreads { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
116116
public string InternalMicrosoftTenantKey { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
117117
public string AdminSenderUser { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
118+
public string SupportEmailSiteRoot { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
118119
}
119120
}

src/AccountDeleter/Providers/AccountDeleteUrlHelper.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace NuGetGallery.AccountDeleter
77
{
88
public class AccountDeleteUrlHelper : IUrlHelper
99
{
10-
public string ConfirmPendingOwnershipRequest(string id, string username, string confirmationCode, bool relativeUrl)
10+
public string ConfirmPendingOwnershipRequest(string id, string username, string confirmationCode, bool relativeUrl, bool supportEmail)
1111
{
1212
throw new NotImplementedException();
1313
}
@@ -17,12 +17,12 @@ public string ManagePackageOwnership(string id, bool relativeUrl)
1717
throw new NotImplementedException();
1818
}
1919

20-
public string Package(string id, string version, bool relativeUrl)
20+
public string Package(string id, string version, bool relativeUrl, bool supportEmail)
2121
{
2222
throw new NotImplementedException();
2323
}
2424

25-
public string RejectPendingOwnershipRequest(string id, string username, string confirmationCode, bool relativeUrl)
25+
public string RejectPendingOwnershipRequest(string id, string username, string confirmationCode, bool relativeUrl, bool supportEmail)
2626
{
2727
throw new NotImplementedException();
2828
}

src/Bootstrap/dist/css/bootstrap-theme.css

Lines changed: 94 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Bootstrap/less/theme/base.less

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,13 @@ body {
118118
.main-container {
119119
padding-bottom: 75px;
120120
height: auto;
121+
122+
a[href] {
123+
&:focus {
124+
outline: solid 2px;
125+
outline-offset: 1px;
126+
}
127+
}
121128
}
122129

123130
.navbar-logo {
@@ -343,6 +350,13 @@ img.reserved-indicator-icon {
343350
li {
344351
list-style: none;
345352
display: list-item;
353+
354+
a {
355+
&:focus {
356+
outline: solid 0.25px;
357+
outline-offset: 0;
358+
}
359+
}
346360
}
347361

348362
@media (min-width: @screen-sm-min) {
@@ -353,6 +367,10 @@ img.reserved-indicator-icon {
353367
overflow-y: hidden;
354368
padding-right: @padding-small-horizontal;
355369
}
370+
371+
li.package-tags {
372+
overflow-y: visible;
373+
}
356374
}
357375
}
358376

src/Bootstrap/less/theme/common-readme.less

Lines changed: 91 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,97 @@
4242
font-size: @font-size-base;
4343
}
4444

45-
pre code.hljs{
46-
background-color: #f6f8fa;
45+
pre {
46+
code.hljs {
47+
background-color: #f6f8fa;
48+
color: #24292e;
49+
50+
.hljs-doctag,
51+
.hljs-keyword,
52+
.hljs-meta .hljs-keyword,
53+
.hljs-template-tag,
54+
.hljs-template-variable,
55+
.hljs-type,
56+
.hljs-variable.language_
57+
.hljs-built_in {
58+
color: #cc3745;
59+
}
60+
61+
.hljs-title,
62+
.hljs-title.class_,
63+
.hljs-title.class_.inherited__,
64+
.hljs-title.function_ {
65+
color: #6f42c1;
66+
}
67+
68+
.hljs-attr,
69+
.hljs-attribute,
70+
.hljs-literal,
71+
.hljs-meta,
72+
.hljs-number,
73+
.hljs-operator,
74+
.hljs-variable,
75+
.hljs-selector-attr,
76+
.hljs-selector-class,
77+
.hljs-selector-id {
78+
color: #005cc5;
79+
}
80+
81+
.hljs-regexp,
82+
.hljs-string,
83+
.hljs-meta .hljs-string {
84+
color: #032f62;
85+
}
86+
87+
.hljs-built_in,
88+
.hljs-symbol {
89+
color: #b74e05;
90+
}
91+
92+
.hljs-comment,
93+
.hljs-code,
94+
.hljs-formula {
95+
color: #6a737d;
96+
}
97+
98+
.hljs-name,
99+
.hljs-quote,
100+
.hljs-selector-tag,
101+
.hljs-selector-pseudo {
102+
color: #207f37;
103+
}
104+
105+
.hljs-subst {
106+
color: #24292e;
107+
}
108+
109+
.hljs-section {
110+
color: #005cc5;
111+
font-weight: bold;
112+
}
113+
114+
.hljs-bullet {
115+
color: #735c0f;
116+
}
117+
118+
.hljs-emphasis {
119+
color: #24292e;
120+
font-style: italic;
121+
}
122+
123+
.hljs-strong {
124+
color: #24292e;
125+
font-weight: bold;
126+
}
127+
128+
.hljs-addition {
129+
color: #207f37;
130+
}
131+
132+
.hljs-deletion {
133+
color: #b31d28;
134+
}
135+
}
47136
}
48137
}
49138

src/Bootstrap/less/theme/page-display-package.less

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,11 @@
357357
border: 0;
358358
padding: 5px 10px;
359359
margin: 0;
360+
361+
&:focus {
362+
outline: 3px solid #0078D4;
363+
outline-offset: 0;
364+
}
360365
}
361366
}
362367
}
@@ -371,7 +376,7 @@
371376

372377
.tab-content {
373378
.tab-pane {
374-
379+
375380
.install-script-row {
376381
display: flex;
377382
height: 100%;
@@ -426,6 +431,11 @@
426431
font-family: @font-family-base;
427432
color: #323130;
428433

434+
&:focus {
435+
outline: 3px solid #0078D4;
436+
outline-offset: 0;
437+
}
438+
429439
.ms-Icon {
430440
position: relative;
431441
top: 2px;

src/Bootstrap/less/theme/page-statistics-per-package.less

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
.page-stats-per-package
2-
{
1+
.page-stats-per-package {
2+
.table {
3+
table-layout: fixed;
4+
}
5+
36
.stats-table-control {
47
margin-top: 40px;
58
}
@@ -76,4 +79,4 @@
7679
.statistics-report-title {
7780
overflow-wrap: break-word;
7881
}
79-
}
82+
}

src/GalleryTools/App.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
<!-- Used for testing locally. -->
2727
<add key="Gallery.SiteRoot" value="http://localhost"/>
28+
<add key="Gallery.SupportEmailSiteRoot" value="http://localhost"/>
2829
<add key="Gallery.FileStorageDirectory" value="..\..\..\NuGetGallery\App_Data\Files"/>
2930
<add key="Gallery.LuceneIndexLocation" value="Temp"/>
3031
<add key="Gallery.IsHosted" value="false"/>

src/NuGetGallery.Services/Configuration/AppConfiguration.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,11 @@ public class AppConfiguration : IAppConfiguration
210210
/// </summary>
211211
public string SiteRoot { get; set; }
212212

213+
/// <summary>
214+
/// Gets the protocol-independent support email site root
215+
/// </summary>
216+
public string SupportEmailSiteRoot { get; set; }
217+
213218
/// <summary>
214219
/// Private key for verifying recaptcha user response.
215220
/// </summary>

0 commit comments

Comments
 (0)