Skip to content

fix: dark theme flash on page refresh #8573

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

Merged
merged 2 commits into from
Mar 30, 2023
Merged

fix: dark theme flash on page refresh #8573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
540ffcf
fix: dark theme flash on page refresh
yufeih Mar 30, 2023
a39749b
test(snapshot): update snapshots for 2a4ba7c33816299f97e9dde463d1103c…
yufeih Mar 30, 2023
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
6 changes: 3 additions & 3 deletions templates/modern/layout/_master.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@
{{#_noindex}}<meta name="searchOption" content="noindex">{{/_noindex}}
{{#_enableSearch}}<meta name="docfx:rel" content="{{_rel}}">{{/_enableSearch}}
{{#docurl}}<meta name="docfx:docurl" content="{{docurl}}">{{/docurl}}

<script type="text/javascript" src="{{_rel}}styles/docfx.min.js"></script>
<script type="text/javascript" src="{{_rel}}styles/main.js"></script>
{{/redirect_url}}
</head>

Expand Down Expand Up @@ -102,9 +105,6 @@
</div>
</div>
</footer>

<script type="text/javascript" src="{{_rel}}styles/docfx.min.js"></script>
<script type="text/javascript" src="{{_rel}}styles/main.js"></script>
</body>
{{/redirect_url}}
</html>
4 changes: 2 additions & 2 deletions templates/modern/src/theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ setTheme(localStorage.getItem('theme') as Theme || 'auto')
function setTheme(theme: Theme) {
localStorage.setItem('theme', theme)
if (theme === 'auto') {
document.body.setAttribute('data-bs-theme', window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
document.documentElement.setAttribute('data-bs-theme', window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
} else {
document.body.setAttribute('data-bs-theme', theme)
document.documentElement.setAttribute('data-bs-theme', theme)
}
}

Expand Down
8 changes: 4 additions & 4 deletions ...x.Snapshot.Tests/SamplesTest.SeedHtml/html/api-BuildFromProject.Class1.html.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html><head>
<!DOCTYPE html><html data-bs-theme="light"><head>
<meta charset="utf-8">
<title>Class Class1
| docfx seed website </title>
Expand All @@ -14,6 +14,9 @@

<meta name="docfx:rel" content="../">
<meta name="docfx:docurl" content="https://github.com/dotnet/docfx/new/main/apiSpec/new?filename=BuildFromProject_Class1.md&amp;value=---%0Auid%3A%20BuildFromProject.Class1%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>
</head>

<body data-layout="" data-yaml-mime="ManagedReference" data-bs-theme="light">
Expand Down Expand Up @@ -443,8 +446,5 @@ <h5 class="border-bottom">In this article</h5>
</ul>
</div></div>
</footer>

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>

</body></html>
8 changes: 4 additions & 4 deletions ...fx.Snapshot.Tests/SamplesTest.SeedHtml/html/api-CatLibrary.Cat-2.html-q-cat.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html><head>
<!DOCTYPE html><html data-bs-theme="light"><head>
<meta charset="utf-8">
<title>Class Cat&lt;T, K&gt;
| docfx seed website </title>
Expand All @@ -14,6 +14,9 @@

<meta name="docfx:rel" content="../">
<meta name="docfx:docurl" content="https://github.com/dotnet/docfx/blob/main/samples/seed/specs/Cat.md/#L2">

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>
</head>

<body data-layout="" data-yaml-mime="ManagedReference" data-bs-theme="light">
Expand Down Expand Up @@ -939,8 +942,5 @@ <h5 class="border-bottom">In this article</h5>
</ul>
</div></div>
</footer>

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>

</body></html>
8 changes: 4 additions & 4 deletions ...docfx.Snapshot.Tests/SamplesTest.SeedHtml/html/api-CatLibrary.html-term-cat.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html><head>
<!DOCTYPE html><html data-bs-theme="light"><head>
<meta charset="utf-8">
<title>Namespace CatLibrary
| docfx seed website </title>
Expand All @@ -14,6 +14,9 @@

<meta name="docfx:rel" content="../">


<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>
</head>

<body data-layout="" data-yaml-mime="ManagedReference" data-bs-theme="light" data-search="true">
Expand Down Expand Up @@ -346,8 +349,5 @@ <h5 class="border-bottom">In this article</h5>
</ul>
</div></div>
</footer>

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>

</body></html>
8 changes: 4 additions & 4 deletions test/docfx.Snapshot.Tests/SamplesTest.SeedHtml/html/api-CatLibrary.html.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html><head>
<!DOCTYPE html><html data-bs-theme="light"><head>
<meta charset="utf-8">
<title>Namespace CatLibrary
| docfx seed website </title>
Expand All @@ -14,6 +14,9 @@

<meta name="docfx:rel" content="../">


<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>
</head>

<body data-layout="" data-yaml-mime="ManagedReference" data-bs-theme="light">
Expand Down Expand Up @@ -328,8 +331,5 @@ <h5 class="border-bottom">In this article</h5>
</ul>
</div></div>
</footer>

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>

</body></html>
8 changes: 4 additions & 4 deletions ...pshot.Tests/SamplesTest.SeedHtml/html/articles-csharp_coding_standards.html.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html><head>
<!DOCTYPE html><html data-bs-theme="light"><head>
<meta charset="utf-8">
<title>C# Coding Standards | docfx seed website </title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand All @@ -12,6 +12,9 @@

<meta name="docfx:rel" content="../">
<meta name="docfx:docurl" content="https://github.com/dotnet/docfx/blob/main/samples/seed/articles/csharp_coding_standards.md/#L1">

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>
</head>

<body data-layout="" data-yaml-mime="" data-bs-theme="light">
Expand Down Expand Up @@ -309,8 +312,5 @@ <h5 class="border-bottom">In this article</h5>
</ul>
</div></div>
</footer>

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>

</body></html>
8 changes: 4 additions & 4 deletions ...l/html/articles-markdown.html-tabs-windows-2Ctypescript-markdown-extensions.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html><head>
<!DOCTYPE html><html data-bs-theme="light"><head>
<meta charset="utf-8">
<title>Markdown | docfx seed website </title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand All @@ -12,6 +12,9 @@

<meta name="docfx:rel" content="../">
<meta name="docfx:docurl" content="https://github.com/dotnet/docfx/blob/main/samples/seed/articles/markdown.md/#L1">

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>
</head>

<body data-layout="" data-yaml-mime="" data-bs-theme="light">
Expand Down Expand Up @@ -365,8 +368,5 @@ <h5 class="border-bottom">In this article</h5>
</ul>
</div></div>
</footer>

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>

</body></html>
8 changes: 4 additions & 4 deletions test/docfx.Snapshot.Tests/SamplesTest.SeedHtml/html/index.html.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html><head>
<!DOCTYPE html><html data-bs-theme="light"><head>
<meta charset="utf-8">
<title>docfx-seed | docfx seed website </title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand All @@ -12,6 +12,9 @@

<meta name="docfx:rel" content="">
<meta name="docfx:docurl" content="https://github.com/dotnet/docfx/blob/main/samples/seed/index.md/#L1">

<script type="text/javascript" src="styles/docfx.min.js"></script>
<script type="text/javascript" src="styles/main.js"></script>
</head>

<body data-layout="landing" data-yaml-mime="" data-bs-theme="light">
Expand Down Expand Up @@ -156,8 +159,5 @@ <h5 class="border-bottom">In this article</h5>
</ul>
</div></div>
</footer>

<script type="text/javascript" src="styles/docfx.min.js"></script>
<script type="text/javascript" src="styles/main.js"></script>

</body></html>
8 changes: 4 additions & 4 deletions test/docfx.Snapshot.Tests/SamplesTest.SeedHtml/html/restapi-petstore.html.verified.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html><html><head>
<!DOCTYPE html><html data-bs-theme="light"><head>
<meta charset="utf-8">
<title>Pet Store APIs | docfx seed website </title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
Expand All @@ -12,6 +12,9 @@

<meta name="docfx:rel" content="../">
<meta name="docfx:docurl" content="https://github.com/dotnet/docfx/new/main/apiSpec/new?filename=petstore_swagger_io_v2_Swagger_Petstore_1_0_0.md&amp;value=---%0Auid%3A%20petstore.swagger.io%2Fv2%2FSwagger%20Petstore%2F1.0.0%0Asummary%3A%20'*You%20can%20override%20summary%20for%20the%20API%20here%20using%20*MARKDOWN*%20syntax'%0A---%0A%0A*Please%20type%20below%20more%20information%20about%20this%20API%3A*%0A%0A">

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>
</head>

<body data-layout="" data-yaml-mime="" data-bs-theme="light">
Expand Down Expand Up @@ -1457,8 +1460,5 @@ <h5 class="border-bottom">In this article</h5>
</ul>
</div></div>
</footer>

<script type="text/javascript" src="../styles/docfx.min.js"></script>
<script type="text/javascript" src="../styles/main.js"></script>

</body></html>