File: 009-code-styles-bs4.patch

package info (click to toggle)
r-cran-bslib 0.9.0%2Bdfsg-3
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid, trixie
  • size: 12,412 kB
  • sloc: javascript: 13,349; makefile: 33; sh: 23
file content (57 lines) | stat: -rw-r--r-- 2,243 bytes parent folder | download | duplicates (2)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
diff --git a/inst/lib/bs4/scss/_code.scss b/inst/lib/bs4/scss/_code.scss
index b2ff5d6..9df2288 100644
--- a/inst/lib/bs4/scss/_code.scss
+++ b/inst/lib/bs4/scss/_code.scss
@@ -2,6 +2,9 @@
 code {
   @include font-size($code-font-size);
   color: $code-color;
+  background-color: $code-bg;
+  @include border-radius($border-radius);
+  padding: $spacer/8 $spacer/4;
   word-wrap: break-word;
 
   // Streamline the style when inside anchors to avoid broken underline and more
@@ -32,9 +35,14 @@ pre {
   display: block;
   @include font-size($code-font-size);
   color: $pre-color;
+  background-color: $pre-bg;
+  padding: $spacer / 2;
+  border: $pre-border;
+  @include border-radius($border-radius);
 
   // Account for some code outputs that place code tags in pre tags
   code {
+    background-color: transparent;
     @include font-size(inherit);
     color: inherit;
     word-break: normal;
diff --git a/inst/lib/bs4/scss/_variables.scss b/inst/lib/bs4/scss/_variables.scss
index 1c22197..ea39303 100644
--- a/inst/lib/bs4/scss/_variables.scss
+++ b/inst/lib/bs4/scss/_variables.scss
@@ -1117,7 +1117,11 @@ $close-text-shadow:                 0 1px 0 $white !default;
 // Code
 
 $code-font-size:                    87.5% !default;
-$code-color:                        $pink !default;
+// Amount intentionally matches mixture amount of shiny::inputPanel()
+// https://github.com/rstudio/shiny/blob/4eeb4a1/inst/www/shared/shiny_scss/bootstrap.scss#L25
+$code-bg:                           mix($body-bg, $body-color, 96%) !default;
+$code-color:                        color-contrast($code-bg) !default;
+
 
 $kbd-padding-y:                     .2rem !default;
 $kbd-padding-x:                     .4rem !default;
@@ -1125,7 +1129,9 @@ $kbd-font-size:                     $code-font-size !default;
 $kbd-color:                         $white !default;
 $kbd-bg:                            $gray-900 !default;
 
-$pre-color:                         $gray-900 !default;
+$pre-bg:                            $code-bg !default;
+$pre-color:                         color-contrast($pre-bg) !default;
+$pre-border:                        $border-width solid $border-color !default;
 $pre-scrollable-max-height:         340px !default;