Skip to content

Commit 2c78f80

Browse files
author
Scott Bommarito
authored
Gallery search results should not have owners right aligned (#6830)
1 parent cad6c08 commit 2c78f80

3 files changed

Lines changed: 52 additions & 96 deletions

File tree

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

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

src/Bootstrap/less/theme/common-list-packages.less

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,44 +7,31 @@
77
font-size: 15px;
88

99
.package-header {
10-
display: flex;
11-
justify-content: space-between;
12-
13-
.package-title-container {
14-
white-space: nowrap;
15-
16-
.package-title {
17-
font-size: 24px;
18-
font-weight: 300;
19-
line-height: 0.9;
20-
}
10+
.package-title {
11+
font-size: 24px;
12+
font-weight: 300;
13+
line-height: 0.9;
14+
}
2115

22-
.edit-button {
23-
vertical-align: text-bottom;
24-
margin-left: 10px;
25-
}
16+
.reserved-indicator {
17+
margin-top: 3px;
18+
margin-left: 3px;
19+
vertical-align: top;
20+
width: 20px;
21+
}
2622

27-
.reserved-indicator {
28-
margin-top: 3px;
29-
margin-left: 3px;
30-
vertical-align: top;
31-
width: 20px;
32-
}
23+
.edit-button {
24+
vertical-align: text-bottom;
25+
margin-left: 10px;
3326
}
3427

35-
.package-by-container {
36-
white-space: nowrap;
37-
overflow: hidden;
38-
text-overflow: ellipsis;
28+
.package-by {
29+
margin-left: @padding-small-horizontal;
30+
color: @text-color;
3931

40-
.package-by {
41-
margin-left: @padding-small-horizontal;
42-
color: @text-color;
43-
44-
@media (max-width: @screen-xs-min) {
45-
margin-left: 0;
46-
display: block;
47-
}
32+
@media (max-width: @screen-xs-min) {
33+
margin-left: 0;
34+
display: block;
4835
}
4936
}
5037
}

src/NuGetGallery/Views/Shared/_ListPackage.cshtml

Lines changed: 25 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
11
@model ListPackageItemViewModel
22

3-
@helper OwnersHeader()
4-
{
5-
if (Model.Owners != null && Model.Owners.Any())
6-
{
7-
<span class="package-by">
8-
by:
9-
@foreach (var owner in Model.Owners)
10-
{
11-
<a href="@Url.User(owner)" title="View @owner.Username's profile">@owner.Username</a>
12-
}
13-
</span>
14-
}
15-
}
16-
173
<article class="package" role="listitem">
184

195
<div class="row">
@@ -24,31 +10,33 @@
2410
</div>
2511
<div class="col-sm-11">
2612
<div class="package-header">
27-
<div class="package-title-container">
28-
<a class="package-title" href="@Url.Package(Model.Id, Model.UseVersion ? Model.Version : null)">@Model.Id</a>
13+
<a class="package-title" href="@Url.Package(Model.Id, Model.UseVersion ? Model.Version : null)">@Html.BreakWord(Model.Id)</a>
2914

30-
@if (Model.IsVerified.HasValue && Model.IsVerified.Value)
31-
{
32-
<img class="reserved-indicator"
33-
src="~/Content/gallery/img/reserved-indicator.svg"
34-
@ViewHelpers.ImageFallback(Url.Absolute("~/Content/gallery/img/reserved-indicator-20x20.png"))
35-
title="@Strings.ReservedNamespace_ReservedIndicatorTooltip" />
36-
}
15+
@if (Model.IsVerified.HasValue && Model.IsVerified.Value)
16+
{
17+
<img class="reserved-indicator"
18+
src="~/Content/gallery/img/reserved-indicator.svg"
19+
@ViewHelpers.ImageFallback(Url.Absolute("~/Content/gallery/img/reserved-indicator-20x20.png"))
20+
title="@Strings.ReservedNamespace_ReservedIndicatorTooltip" />
21+
}
3722

38-
@if (Model.CanEdit || Model.CanManageOwners || Model.CanUnlistOrRelist)
39-
{
40-
<a href="@Url.ManagePackage(Model)" class="icon-link edit-button" title="Manage package">
41-
<i class="ms-Icon ms-Icon--Edit" aria-hidden="true"></i>
42-
</a>
43-
}
44-
</div>
45-
<div class="package-by-container hidden-xs">
46-
@OwnersHeader()
47-
</div>
48-
</div>
23+
@if (Model.CanEdit || Model.CanManageOwners || Model.CanUnlistOrRelist)
24+
{
25+
<a href="@Url.ManagePackage(Model)" class="icon-link edit-button" title="Manage @Model.Id">
26+
<i class="ms-Icon ms-Icon--Edit" aria-hidden="true"></i>
27+
</a>
28+
}
4929

50-
<div class="hidden-sm hidden-md hidden-lg">
51-
@OwnersHeader()
30+
@if (Model.Owners != null && Model.Owners.Any())
31+
{
32+
<span class="package-by">
33+
by:
34+
@foreach (var owner in Model.Owners)
35+
{
36+
<a href="@Url.User(owner)" title="View @owner.Username's profile">@owner.Username</a>
37+
}
38+
</span>
39+
}
5240
</div>
5341

5442
@if (!StringComparer.OrdinalIgnoreCase.Equals(Model.Id, Model.Title))
@@ -100,4 +88,4 @@
10088
</div>
10189
</div>
10290
</div>
103-
</article>
91+
</article>

0 commit comments

Comments
 (0)