Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tabs for the new Display Package page redesign #8625

Merged
merged 7 commits into from
Jun 11, 2021
Merged

Tabs for the new Display Package page redesign #8625

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
41c8a1d
Added and styled tabs
sophiamfavro May 27, 2021
e06641e
Finished tabs
sophiamfavro Jun 7, 2021
800ec80
addressed headings margins moving content to far down
sophiamfavro Jun 7, 2021
2896bb7
fixed issues pointed out in comments on PR
sophiamfavro Jun 9, 2021
24e5f84
fixed issues Loic commented about
sophiamfavro Jun 9, 2021
4d3f276
addressed comments from PR
sophiamfavro Jun 10, 2021
3843636
fixed issues
sophiamfavro Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions src/Bootstrap/dist/css/bootstrap-theme.css
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions src/Bootstrap/less/theme/page-display-package-v2.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,4 +324,35 @@
}
}
}

.body-tabs {

.nav-tabs > li.active > a {
border-bottom-color: #0078D4;
border-bottom-width: 2px;
font-weight: bold;
}

.nav-tabs > li > a {
border-left: 0px;
border-right: 0px;
border-top: 0px;
font-size: 14px;
font-family: @font-family-base;
color: #323130;
}
}

.body-tab-content {
padding-top: 30px;

h1:first-child,
h2:first-child,
h3:first-child,
h4:first-child,
h5:first-child,
h6:first-child {
margin-top:0px;
sophiamfavro marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
3 changes: 2 additions & 1 deletion src/NuGetGallery/App_Data/Files/Content/flags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"NuGetGallery.ManagePackagesVulnerabilities": "Enabled",
"NuGetGallery.DisplayFuGetLinks": "Enabled",
"NuGetGallery.PatternSetTfmHeuristics": "Enabled",
"NuGetGallery.EmbeddedIcons": "Enabled"
"NuGetGallery.EmbeddedIcons": "Enabled",
"NuGetGallery.MarkdigMdRendering": "Enabled"
sophiamfavro marked this conversation as resolved.
Show resolved Hide resolved
},
"Flights": {
"NuGetGallery.TyposquattingFlight": {
Expand Down
73 changes: 20 additions & 53 deletions src/NuGetGallery/Scripts/gallery/page-display-package-v2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,45 +48,6 @@
});
}

// Configure ReadMe container
var readmeContainer = $("#readme-container");
if (readmeContainer[0])
{
window.nuget.configureExpanderHeading("readme-container");

window.nuget.configureExpander(
"readme-more",
"CalculatorAddition",
"Show less",
"CalculatorSubtract",
"Show more");

var showLess = $("#readme-less");
$clamp(showLess[0], { clamp: 30, useNativeClamp: false });

$("#show-readme-more").click(function (e) {
showLess.collapse("toggle");
e.preventDefault();
});
showLess.on('hide.bs.collapse', function (e) {
e.stopPropagation();
});
showLess.on('show.bs.collapse', function (e) {
e.stopPropagation();
});
}

// Configure expanders
window.nuget.configureExpanderHeading("dependency-groups");
window.nuget.configureExpanderHeading("used-by");
window.nuget.configureExpanderHeading("version-history");
window.nuget.configureExpander(
"hidden-versions",
"CalculatorAddition",
"Show less",
"CalculatorSubtract",
"Show more");

// Configure package manager copy buttons
function configureCopyButton(id) {
var copyButton = $('#' + id + '-button');
Expand Down Expand Up @@ -125,30 +86,36 @@

var storage = window['localStorage'];
if (storage) {
var key = 'preferred_tab';
var installationKey = 'preferred_tab';
sophiamfavro marked this conversation as resolved.
Show resolved Hide resolved

// Restore preferred tab selection from localStorage.
var preferredTab = storage.getItem(key);
if (preferredTab) {
$('#' + preferredTab).tab('show');
var preferredInstallationTab = storage.getItem(installationKey);
if (preferredInstallationTab) {
$('#' + preferredInstallationTab).tab('show');
}

// Make sure we save the user's preferred tab to localStorage.
$('.package-manager-tab').on('shown.bs.tab', function (e) {
storage.setItem(key, e.target.id);
storage.setItem(installationKey, e.target.id);
});
}

if (window.nuget.isGaAvailable()) {
// Emit a Google Analytics event when the user expands or collapses the Dependencies section.
$("#dependency-groups").on('hide.bs.collapse show.bs.collapse', function (e) {
ga('send', 'event', 'dependencies', e.type);
});
// set preferred body tab
var bodyKey = 'preferred_body_tab';

// Restore preferred tab selection from localStorage.
var preferredBodyTab = storage.getItem(bodyKey);
if (preferredBodyTab) {
$('#' + preferredBodyTab).tab('show');
}

// Emit a Google Analytics event when the user expands or collapses the Used By section.
$("#used-by").on('hide.bs.collapse show.bs.collapse', function (e) {
ga('send', 'event', 'used-by', e.type);
// Make sure we save the user's preferred tab to localStorage.
$('.body-tab').on('shown.bs.tab', function (e) {
storage.setItem(bodyKey, e.target.id);
});
}

if (window.nuget.isGaAvailable()) {
// TO-DO add telemetry events for when each tab is clicked, see https://github.com/nuget/nugetgallery/issues/8613

// Emit a Google Analytics event when the user clicks on a repo link in the GitHub Repos area of the Used By section.
$(".gh-link").on('click', function (elem) {
Expand Down
Loading