Merge pull request #66 from ForEvolve/fix-pre-code-color

Fix pre code color
ForEvolve · Mar 5, 2023 · 5b94de1 · 5b94de1
2 parents 7f2a2db + 3cfdd66
commit 5b94de1
Show file tree

Hide file tree

Showing 38 changed files with 98 additions and 44 deletions.
diff --git a/dist/css/bootstrap-dark-prefers-light.css b/dist/css/bootstrap-dark-prefers-light.css
@@ -549,7 +549,7 @@ kbd kbd {
 pre {
   display: block;
   font-size: 87.5%;
-  color: #212529;
+  color: #f8f9fa;
 }
 
 pre code {

diff --git a/dist/css/bootstrap-dark-prefers-light.min.css b/dist/css/bootstrap-dark-prefers-light.min.css
diff --git a/dist/css/bootstrap-dark.css b/dist/css/bootstrap-dark.css
diff --git a/dist/css/bootstrap-dark.min.css b/dist/css/bootstrap-dark.min.css
diff --git a/dist/css/bootstrap-light-prefers-dark.css b/dist/css/bootstrap-light-prefers-dark.css
@@ -11100,7 +11100,7 @@ a.text-themed:hover {
   }
 
   pre {
-    color: #212529;
+    color: #f8f9fa;
   }
 
   pre code {

diff --git a/dist/css/bootstrap-light-prefers-dark.min.css b/dist/css/bootstrap-light-prefers-dark.min.css
diff --git a/dist/css/bootstrap-prefers-dark-color-only.css b/dist/css/bootstrap-prefers-dark-color-only.css
@@ -58,7 +58,7 @@
     background-color: #212529
   }
   pre {
-    color: #212529
+    color: #f8f9fa
   }
   pre code {
     color: inherit

diff --git a/dist/css/bootstrap-prefers-dark.css b/dist/css/bootstrap-prefers-dark.css
diff --git a/dist/css/bootstrap-prefers-dark.min.css b/dist/css/bootstrap-prefers-dark.min.css
diff --git a/dist/css/toggle-bootstrap-dark.css b/dist/css/toggle-bootstrap-dark.css
diff --git a/dist/css/toggle-bootstrap-dark.min.css b/dist/css/toggle-bootstrap-dark.min.css
diff --git a/readme.md b/readme.md
@@ -230,7 +230,15 @@ See [Contributing to ForEvolve open source projects](https://github.com/ForEvolv
 
 # Release notes
 
-Since CI build numbers are automated, it is hard to know in advance what the next deployed build number will be, so the `(latest`)` version represents that version.
+Since CI build numbers are automated, it is hard to know in advance what the next deployed build number will be, so the `(latest)` version represents that version.
+
+## 4.0.0
+
+-   Fix pre and code color, setting the `$pre-color` variable to `$gray-100`, overriding the default of `$gray-900` for the dark theme.
+
+> No breaking changes expected. This version only change the code/pre color.
+> The major bump is to override the pre-release package that I deprecated recently during the no abandonned PR #63.
+> I was not able to delete the package on NPM, so this should fix the issue.
 
 ## 3.0.0
 

diff --git a/samples/html/css/bootstrap-dark-prefers-light.css b/samples/html/css/bootstrap-dark-prefers-light.css
@@ -549,7 +549,7 @@ kbd kbd {
 pre {
   display: block;
   font-size: 87.5%;
-  color: #212529;
+  color: #f8f9fa;
 }
 
 pre code {

diff --git a/samples/html/css/bootstrap-dark-prefers-light.min.css b/samples/html/css/bootstrap-dark-prefers-light.min.css
diff --git a/samples/html/css/bootstrap-dark.css b/samples/html/css/bootstrap-dark.css
diff --git a/samples/html/css/bootstrap-dark.min.css b/samples/html/css/bootstrap-dark.min.css
diff --git a/samples/html/css/bootstrap-light-prefers-dark.css b/samples/html/css/bootstrap-light-prefers-dark.css
@@ -11100,7 +11100,7 @@ a.text-themed:hover {
   }
 
   pre {
-    color: #212529;
+    color: #f8f9fa;
   }
 
   pre code {

diff --git a/samples/html/css/bootstrap-light-prefers-dark.min.css b/samples/html/css/bootstrap-light-prefers-dark.min.css
diff --git a/samples/html/css/bootstrap-prefers-dark-color-only.css b/samples/html/css/bootstrap-prefers-dark-color-only.css
@@ -58,7 +58,7 @@
     background-color: #212529
   }
   pre {
-    color: #212529
+    color: #f8f9fa
   }
   pre code {
     color: inherit

diff --git a/samples/html/css/bootstrap-prefers-dark.css b/samples/html/css/bootstrap-prefers-dark.css
diff --git a/samples/html/css/bootstrap-prefers-dark.min.css b/samples/html/css/bootstrap-prefers-dark.min.css
diff --git a/samples/html/css/toggle-bootstrap-dark.css b/samples/html/css/toggle-bootstrap-dark.css
diff --git a/samples/html/css/toggle-bootstrap-dark.min.css b/samples/html/css/toggle-bootstrap-dark.min.css
diff --git a/samples/razor-pages/Pages/Code.cshtml b/samples/razor-pages/Pages/Code.cshtml
@@ -0,0 +1,39 @@
+@page
+@{
+    ViewData["Title"] = "Code";
+}
+
+<div class="container-fluid mt-3 mb-3">
+<h2 class="mt-4">Pre</h2>
+
+<pre>Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+Fusce tempor lectus vitae ante pellentesque ultrices. Sed commodo nulla sit amet risus ullamcorper, at tincidunt quam consectetur. 
+
+Suspendisse sagittis, nunc a euismod commodo, elit arcu tempor ex, in pulvinar magna enim id libero. 
+Ut malesuada leo quis tellus hendrerit, sit amet eleifend erat sagittis. 
+Vivamus aliquet porta lorem, vel maximus elit laoreet eget. 
+
+Suspendisse sed dui dapibus, rutrum nunc vel, eleifend urna. 
+In hac habitasse platea dictumst. Nullam fermentum, metus quis vehicula dignissim, justo nisi sollicitudin velit, sit amet volutpat eros metus vel turpis. 
+Donec non mauris malesuada, faucibus dolor vel, vestibulum tellus. 
+Sed maximus tellus vel diam dapibus, quis malesuada odio cursus. 
+Phasellus viverra felis eu tortor sagittis, eget consectetur mauris auctor. 
+In a metus nulla. Sed imperdiet mauris et quam bibendum vestibulum. Sed consectetur enim eget nunc vestibulum, at tristique dolor suscipit. 
+
+Suspendisse potenti.</pre>
+
+<h2 class="mt-4">Pre &gt; Code</h2>
+<pre><code>#include &lt;stdio.h&gt;
+
+int main() {
+  int x = 5;
+  float y = 3.14;
+  char c = 'A';
+
+  printf("The value of x is %d\n", x);
+  printf("The value of y is %.2f\n", y);
+  printf("The value of c is %c\n", c);
+
+  return 0;
+}</code></pre>
+</div>
diff --git a/samples/razor-pages/Pages/_Layout.cshtml b/samples/razor-pages/Pages/_Layout.cshtml
@@ -107,6 +107,9 @@
                 <li class="nav-item">
                     <a class="nav-link" asp-page="toasts" asp-route-default-theme="@defaultTheme">Toasts</a>
                 </li>
+                <li class="nav-item">
+                    <a class="nav-link" asp-page="code" asp-route-default-theme="@defaultTheme">Code</a>
+                </li>
                 <li class="nav-item">
                     <a class="nav-link" asp-page="themed" asp-route-default-theme="@defaultTheme">Themed</a>
                 </li>

diff --git a/samples/razor-pages/wwwroot/css/bootstrap-dark-prefers-light.css b/samples/razor-pages/wwwroot/css/bootstrap-dark-prefers-light.css
@@ -549,7 +549,7 @@ kbd kbd {
 pre {
   display: block;
   font-size: 87.5%;
-  color: #212529;
+  color: #f8f9fa;
 }
 
 pre code {

diff --git a/samples/razor-pages/wwwroot/css/bootstrap-dark-prefers-light.min.css b/samples/razor-pages/wwwroot/css/bootstrap-dark-prefers-light.min.css
diff --git a/samples/razor-pages/wwwroot/css/bootstrap-dark.css b/samples/razor-pages/wwwroot/css/bootstrap-dark.css
diff --git a/samples/razor-pages/wwwroot/css/bootstrap-dark.min.css b/samples/razor-pages/wwwroot/css/bootstrap-dark.min.css
diff --git a/samples/razor-pages/wwwroot/css/bootstrap-light-prefers-dark.css b/samples/razor-pages/wwwroot/css/bootstrap-light-prefers-dark.css
@@ -11100,7 +11100,7 @@ a.text-themed:hover {
   }
 
   pre {
-    color: #212529;
+    color: #f8f9fa;
   }
 
   pre code {

diff --git a/samples/razor-pages/wwwroot/css/bootstrap-light-prefers-dark.min.css b/samples/razor-pages/wwwroot/css/bootstrap-light-prefers-dark.min.css
diff --git a/samples/razor-pages/wwwroot/css/bootstrap-prefers-dark-color-only.css b/samples/razor-pages/wwwroot/css/bootstrap-prefers-dark-color-only.css
@@ -58,7 +58,7 @@
     background-color: #212529
   }
   pre {
-    color: #212529
+    color: #f8f9fa
   }
   pre code {
     color: inherit

diff --git a/samples/razor-pages/wwwroot/css/bootstrap-prefers-dark.css b/samples/razor-pages/wwwroot/css/bootstrap-prefers-dark.css
diff --git a/samples/razor-pages/wwwroot/css/bootstrap-prefers-dark.min.css b/samples/razor-pages/wwwroot/css/bootstrap-prefers-dark.min.css
diff --git a/samples/razor-pages/wwwroot/css/toggle-bootstrap-dark.css b/samples/razor-pages/wwwroot/css/toggle-bootstrap-dark.css
diff --git a/samples/razor-pages/wwwroot/css/toggle-bootstrap-dark.min.css b/samples/razor-pages/wwwroot/css/toggle-bootstrap-dark.min.css
diff --git a/scss/_dark-variables.scss b/scss/_dark-variables.scss
@@ -236,3 +236,7 @@ $pagination-active-border-color:    $pagination-active-bg;
 $pagination-disabled-color:         $gray-400;
 $pagination-disabled-bg:            $black;
 $pagination-disabled-border-color:  $gray-700;
+
+// Code
+// $code-color:                        $pink;
+$pre-color:                         $gray-100;
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-    "version": "3.0.0",
+    "version": "4.0.0",
     "publicReleaseRefSpec": ["^refs/heads/(main|master)$"],
     "cloudBuild": {
         "buildNumber": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -11100,7 +11100,7 @@ a.text-themed:hover { @@
       }
       pre {
-        color: #212529;
+        color: #f8f9fa;
       }
       pre code {
@@ Expand Down @@