From 6ff9b7b60558717db1c0d012145cb9799aa0d2b1 Mon Sep 17 00:00:00 2001 From: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Date: Tue, 8 Dec 2020 13:43:41 -0800 Subject: [PATCH] Sync eng/common directory with azure-sdk-tools for PR 1257 (#1100) * Make up the css using for .net sdk github io pages * Remove index.html * Make changes to js Co-authored-by: Sima Zhu --- eng/common/docgeneration/Generate-DocIndex.ps1 | 3 --- .../docgeneration/templates/matthews/styles/main.css | 9 +++++++++ .../docgeneration/templates/matthews/styles/main.js | 3 +-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/eng/common/docgeneration/Generate-DocIndex.ps1 b/eng/common/docgeneration/Generate-DocIndex.ps1 index cb7b10514..8e8d0b83b 100644 --- a/eng/common/docgeneration/Generate-DocIndex.ps1 +++ b/eng/common/docgeneration/Generate-DocIndex.ps1 @@ -165,7 +165,6 @@ function UpdateDocIndexFiles { Param ( [Parameter(Mandatory=$false)] [String]$appTitleLang = $Language, [Parameter(Mandatory=$false)] [String]$lang = $Language, - [Parameter(Mandatory=$false)] [String]$indexhtmlloc = "index.html", [Parameter(Mandatory=$false)] [String]$packageRegex = "`"`"", [Parameter(Mandatory=$false)] [String]$regexReplacement = "" ) @@ -177,8 +176,6 @@ function UpdateDocIndexFiles { # Update main.js var lang $mainJsContent = Get-Content -Path $MainJsPath -Raw $mainJsContent = $mainJsContent -replace "var SELECTED_LANGUAGE = ''", "var SELECTED_LANGUAGE = '$lang'" - # Update main.js var index html - $mainJsContent = $mainJsContent -replace "var INDEX_HTML = ''", "var INDEX_HTML = '$indexhtmlloc'" # Update main.js package regex and replacement $mainJsContent = $mainJsContent -replace "var PACKAGE_REGEX = ''", "var PACKAGE_REGEX = $packageRegex" $mainJsContent = $mainJsContent -replace "var PACKAGE_REPLACEMENT = ''", "var PACKAGE_REPLACEMENT = `"$regexReplacement`"" diff --git a/eng/common/docgeneration/templates/matthews/styles/main.css b/eng/common/docgeneration/templates/matthews/styles/main.css index 21eb0c356..944ef728f 100644 --- a/eng/common/docgeneration/templates/matthews/styles/main.css +++ b/eng/common/docgeneration/templates/matthews/styles/main.css @@ -299,4 +299,13 @@ article h4 { color: #ecdbff; background-color: #0071c5; } +} + +.navbar-version-select { + padding: 2px; + border: none; + border-radius: 2px; + box-shadow: none; + -webkit-appearance: media-time-remaining-display; + margin-top: 14px; } \ No newline at end of file diff --git a/eng/common/docgeneration/templates/matthews/styles/main.js b/eng/common/docgeneration/templates/matthews/styles/main.js index 73ccd7774..173f60aaf 100644 --- a/eng/common/docgeneration/templates/matthews/styles/main.js +++ b/eng/common/docgeneration/templates/matthews/styles/main.js @@ -5,7 +5,6 @@ containers.addClass("container-fluid"); WINDOW_CONTENTS = window.location.href.split('/') var SELECTED_LANGUAGE = '' -var INDEX_HTML = '' var PACKAGE_REGEX = '' var PACKAGE_REPLACEMENT = '' @@ -198,7 +197,7 @@ function populateIndexList(selector, packageName) { } function getPackageUrl(language, package, version) { - return "https://azuresdkdocs.blob.core.windows.net/$web/" + language + "/" + package + "/" + version + "/" + INDEX_HTML + return "https://azuresdkdocs.blob.core.windows.net/$web/" + language + "/" + package + "/" + version + "/index.html" } // Populate Versions