diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1ccd7e7..604de93 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,7 +28,7 @@ export default { dark: { recessed: "#21222c", // below the background: code-tab header base: "#282a36", // the background itself - surface: "#44475a", // raised: inline code, table rows, spoilers + surface: "#44475a", // raised: code, table rows, spoilers overlay: "#6272a4", // borders and rules text: "#f8f8f2", bright: "#ffffff", // headings, strong diff --git a/packages/jaamd/src/styles/markdown.css b/packages/jaamd/src/styles/markdown.css index b7c7225..90daa8c 100644 --- a/packages/jaamd/src/styles/markdown.css +++ b/packages/jaamd/src/styles/markdown.css @@ -128,6 +128,7 @@ padding-top: 0.25rem; padding-bottom: 0.25rem; border-width: 1px; + border-style: solid; border-color: var(--jaamd-code-border); border-radius: 0.25rem; color: var(--jaamd-code-fg); @@ -139,6 +140,7 @@ .jaamd-content pre { background-color: var(--jaamd-pre-bg) !important; border-width: 1px; + border-style: solid; border-color: var(--jaamd-pre-border); border-radius: 0.5rem; padding: 1rem; diff --git a/packages/jaamd/src/themes/catppuccin/index.css b/packages/jaamd/src/themes/catppuccin/index.css index fcfd33a..d0c89b0 100644 --- a/packages/jaamd/src/themes/catppuccin/index.css +++ b/packages/jaamd/src/themes/catppuccin/index.css @@ -14,11 +14,11 @@ --jaamd-code-border: #9ca0b0; --jaamd-code-fg: #4c4f69; - --jaamd-pre-bg: #eff1f5; - --jaamd-pre-border: #ccd0da; + --jaamd-pre-bg: #ccd0da; + --jaamd-pre-border: #9ca0b0; --jaamd-pre-fg: #4c4f69; - --jaamd-copy-btn-bg: #ccd0da; + --jaamd-copy-btn-bg: #eff1f5; --jaamd-copy-btn-border: #9ca0b0; --jaamd-copy-btn-fg: #4c4f69; --jaamd-copy-btn-hover-bg: #9ca0b0; @@ -38,8 +38,8 @@ --jaamd-tabs-border: #ccd0da; --jaamd-tabs-header-bg: #e6e9ef; - --jaamd-tabs-btn-hover-bg: #ccd0da; - --jaamd-tabs-btn-active-bg: #eff1f5; + --jaamd-tabs-btn-hover-bg: #eff1f5; + --jaamd-tabs-btn-active-bg: #ccd0da; --jaamd-details-bg: #eff1f5; --jaamd-details-border: #ccd0da; @@ -74,11 +74,11 @@ html.dark { --jaamd-code-border: #6c7086; --jaamd-code-fg: #cdd6f4; - --jaamd-pre-bg: #1e1e2e; - --jaamd-pre-border: #313244; + --jaamd-pre-bg: #313244; + --jaamd-pre-border: #6c7086; --jaamd-pre-fg: #cdd6f4; - --jaamd-copy-btn-bg: #313244; + --jaamd-copy-btn-bg: #1e1e2e; --jaamd-copy-btn-border: #6c7086; --jaamd-copy-btn-fg: #cdd6f4; --jaamd-copy-btn-hover-bg: #6c7086; @@ -98,8 +98,8 @@ html.dark { --jaamd-tabs-border: #313244; --jaamd-tabs-header-bg: #181825; - --jaamd-tabs-btn-hover-bg: #313244; - --jaamd-tabs-btn-active-bg: #1e1e2e; + --jaamd-tabs-btn-hover-bg: #1e1e2e; + --jaamd-tabs-btn-active-bg: #313244; --jaamd-details-bg: #1e1e2e; --jaamd-details-border: #313244; diff --git a/packages/jaamd/src/themes/dracula/dark.css b/packages/jaamd/src/themes/dracula/dark.css index bb004f6..d359a5b 100644 --- a/packages/jaamd/src/themes/dracula/dark.css +++ b/packages/jaamd/src/themes/dracula/dark.css @@ -14,11 +14,11 @@ html.dark { --jaamd-code-border: #6272a4; --jaamd-code-fg: #f8f8f2; - --jaamd-pre-bg: #282a36; - --jaamd-pre-border: #44475a; + --jaamd-pre-bg: #44475a; + --jaamd-pre-border: #6272a4; --jaamd-pre-fg: #f8f8f2; - --jaamd-copy-btn-bg: #44475a; + --jaamd-copy-btn-bg: #282a36; --jaamd-copy-btn-border: #6272a4; --jaamd-copy-btn-fg: #f8f8f2; --jaamd-copy-btn-hover-bg: #6272a4; @@ -38,8 +38,8 @@ html.dark { --jaamd-tabs-border: #44475a; --jaamd-tabs-header-bg: #21222c; - --jaamd-tabs-btn-hover-bg: #44475a; - --jaamd-tabs-btn-active-bg: #282a36; + --jaamd-tabs-btn-hover-bg: #282a36; + --jaamd-tabs-btn-active-bg: #44475a; --jaamd-details-bg: #282a36; --jaamd-details-border: #44475a; diff --git a/packages/jaamd/src/themes/dracula/index.css b/packages/jaamd/src/themes/dracula/index.css index 294d0d0..5520d3c 100644 --- a/packages/jaamd/src/themes/dracula/index.css +++ b/packages/jaamd/src/themes/dracula/index.css @@ -14,11 +14,11 @@ --jaamd-code-border: #6272a4; --jaamd-code-fg: #f8f8f2; - --jaamd-pre-bg: #282a36; - --jaamd-pre-border: #44475a; + --jaamd-pre-bg: #44475a; + --jaamd-pre-border: #6272a4; --jaamd-pre-fg: #f8f8f2; - --jaamd-copy-btn-bg: #44475a; + --jaamd-copy-btn-bg: #282a36; --jaamd-copy-btn-border: #6272a4; --jaamd-copy-btn-fg: #f8f8f2; --jaamd-copy-btn-hover-bg: #6272a4; @@ -38,8 +38,8 @@ --jaamd-tabs-border: #44475a; --jaamd-tabs-header-bg: #21222c; - --jaamd-tabs-btn-hover-bg: #44475a; - --jaamd-tabs-btn-active-bg: #282a36; + --jaamd-tabs-btn-hover-bg: #282a36; + --jaamd-tabs-btn-active-bg: #44475a; --jaamd-details-bg: #282a36; --jaamd-details-border: #44475a; diff --git a/packages/jaamd/src/themes/gruvbox/index.css b/packages/jaamd/src/themes/gruvbox/index.css index 2b19245..ba922e2 100644 --- a/packages/jaamd/src/themes/gruvbox/index.css +++ b/packages/jaamd/src/themes/gruvbox/index.css @@ -14,11 +14,11 @@ --jaamd-code-border: #d5c4a1; --jaamd-code-fg: #282828; - --jaamd-pre-bg: #fbf1c7; - --jaamd-pre-border: #ebdbb2; + --jaamd-pre-bg: #ebdbb2; + --jaamd-pre-border: #d5c4a1; --jaamd-pre-fg: #3c3836; - --jaamd-copy-btn-bg: #ebdbb2; + --jaamd-copy-btn-bg: #fbf1c7; --jaamd-copy-btn-border: #d5c4a1; --jaamd-copy-btn-fg: #3c3836; --jaamd-copy-btn-hover-bg: #d5c4a1; @@ -38,8 +38,8 @@ --jaamd-tabs-border: #ebdbb2; --jaamd-tabs-header-bg: #f9f5d7; - --jaamd-tabs-btn-hover-bg: #ebdbb2; - --jaamd-tabs-btn-active-bg: #fbf1c7; + --jaamd-tabs-btn-hover-bg: #fbf1c7; + --jaamd-tabs-btn-active-bg: #ebdbb2; --jaamd-details-bg: #fbf1c7; --jaamd-details-border: #ebdbb2; @@ -74,11 +74,11 @@ html.dark { --jaamd-code-border: #504945; --jaamd-code-fg: #fbf1c7; - --jaamd-pre-bg: #282828; - --jaamd-pre-border: #3c3836; + --jaamd-pre-bg: #3c3836; + --jaamd-pre-border: #504945; --jaamd-pre-fg: #ebdbb2; - --jaamd-copy-btn-bg: #3c3836; + --jaamd-copy-btn-bg: #282828; --jaamd-copy-btn-border: #504945; --jaamd-copy-btn-fg: #ebdbb2; --jaamd-copy-btn-hover-bg: #504945; @@ -98,8 +98,8 @@ html.dark { --jaamd-tabs-border: #3c3836; --jaamd-tabs-header-bg: #1d2021; - --jaamd-tabs-btn-hover-bg: #3c3836; - --jaamd-tabs-btn-active-bg: #282828; + --jaamd-tabs-btn-hover-bg: #282828; + --jaamd-tabs-btn-active-bg: #3c3836; --jaamd-details-bg: #282828; --jaamd-details-border: #3c3836; diff --git a/packages/jaamd/src/themes/nord/dark.css b/packages/jaamd/src/themes/nord/dark.css index cc71f84..c3a94f0 100644 --- a/packages/jaamd/src/themes/nord/dark.css +++ b/packages/jaamd/src/themes/nord/dark.css @@ -14,11 +14,11 @@ html.dark { --jaamd-code-border: #4c566a; --jaamd-code-fg: #eceff4; - --jaamd-pre-bg: #2e3440; - --jaamd-pre-border: #3b4252; + --jaamd-pre-bg: #3b4252; + --jaamd-pre-border: #4c566a; --jaamd-pre-fg: #d8dee9; - --jaamd-copy-btn-bg: #3b4252; + --jaamd-copy-btn-bg: #2e3440; --jaamd-copy-btn-border: #4c566a; --jaamd-copy-btn-fg: #d8dee9; --jaamd-copy-btn-hover-bg: #4c566a; @@ -38,8 +38,8 @@ html.dark { --jaamd-tabs-border: #3b4252; --jaamd-tabs-header-bg: #2e3440; - --jaamd-tabs-btn-hover-bg: #3b4252; - --jaamd-tabs-btn-active-bg: #2e3440; + --jaamd-tabs-btn-hover-bg: #2e3440; + --jaamd-tabs-btn-active-bg: #3b4252; --jaamd-details-bg: #2e3440; --jaamd-details-border: #3b4252; diff --git a/packages/jaamd/src/themes/nord/index.css b/packages/jaamd/src/themes/nord/index.css index 4b476e5..7f6ee08 100644 --- a/packages/jaamd/src/themes/nord/index.css +++ b/packages/jaamd/src/themes/nord/index.css @@ -14,11 +14,11 @@ --jaamd-code-border: #4c566a; --jaamd-code-fg: #eceff4; - --jaamd-pre-bg: #2e3440; - --jaamd-pre-border: #3b4252; + --jaamd-pre-bg: #3b4252; + --jaamd-pre-border: #4c566a; --jaamd-pre-fg: #d8dee9; - --jaamd-copy-btn-bg: #3b4252; + --jaamd-copy-btn-bg: #2e3440; --jaamd-copy-btn-border: #4c566a; --jaamd-copy-btn-fg: #d8dee9; --jaamd-copy-btn-hover-bg: #4c566a; @@ -38,8 +38,8 @@ --jaamd-tabs-border: #3b4252; --jaamd-tabs-header-bg: #2e3440; - --jaamd-tabs-btn-hover-bg: #3b4252; - --jaamd-tabs-btn-active-bg: #2e3440; + --jaamd-tabs-btn-hover-bg: #2e3440; + --jaamd-tabs-btn-active-bg: #3b4252; --jaamd-details-bg: #2e3440; --jaamd-details-border: #3b4252; diff --git a/packages/jaamd/src/themes/one-dark/dark.css b/packages/jaamd/src/themes/one-dark/dark.css index 7d736f9..3ab91af 100644 --- a/packages/jaamd/src/themes/one-dark/dark.css +++ b/packages/jaamd/src/themes/one-dark/dark.css @@ -14,11 +14,11 @@ html.dark { --jaamd-code-border: #3e4451; --jaamd-code-fg: #e6e6e6; - --jaamd-pre-bg: #282c34; - --jaamd-pre-border: #2c313c; + --jaamd-pre-bg: #2c313c; + --jaamd-pre-border: #3e4451; --jaamd-pre-fg: #abb2bf; - --jaamd-copy-btn-bg: #2c313c; + --jaamd-copy-btn-bg: #282c34; --jaamd-copy-btn-border: #3e4451; --jaamd-copy-btn-fg: #abb2bf; --jaamd-copy-btn-hover-bg: #3e4451; @@ -38,8 +38,8 @@ html.dark { --jaamd-tabs-border: #2c313c; --jaamd-tabs-header-bg: #21252b; - --jaamd-tabs-btn-hover-bg: #2c313c; - --jaamd-tabs-btn-active-bg: #282c34; + --jaamd-tabs-btn-hover-bg: #282c34; + --jaamd-tabs-btn-active-bg: #2c313c; --jaamd-details-bg: #2c313c; --jaamd-details-border: #3e4451; diff --git a/packages/jaamd/src/themes/one-dark/index.css b/packages/jaamd/src/themes/one-dark/index.css index 605664c..9952b23 100644 --- a/packages/jaamd/src/themes/one-dark/index.css +++ b/packages/jaamd/src/themes/one-dark/index.css @@ -14,11 +14,11 @@ --jaamd-code-border: #3e4451; --jaamd-code-fg: #e6e6e6; - --jaamd-pre-bg: #282c34; - --jaamd-pre-border: #2c313c; + --jaamd-pre-bg: #2c313c; + --jaamd-pre-border: #3e4451; --jaamd-pre-fg: #abb2bf; - --jaamd-copy-btn-bg: #2c313c; + --jaamd-copy-btn-bg: #282c34; --jaamd-copy-btn-border: #3e4451; --jaamd-copy-btn-fg: #abb2bf; --jaamd-copy-btn-hover-bg: #3e4451; @@ -38,8 +38,8 @@ --jaamd-tabs-border: #2c313c; --jaamd-tabs-header-bg: #21252b; - --jaamd-tabs-btn-hover-bg: #2c313c; - --jaamd-tabs-btn-active-bg: #282c34; + --jaamd-tabs-btn-hover-bg: #282c34; + --jaamd-tabs-btn-active-bg: #2c313c; --jaamd-details-bg: #2c313c; --jaamd-details-border: #3e4451; diff --git a/packages/jaamd/src/themes/rose-pine-moon/index.css b/packages/jaamd/src/themes/rose-pine-moon/index.css index daf99cb..4a15ac8 100644 --- a/packages/jaamd/src/themes/rose-pine-moon/index.css +++ b/packages/jaamd/src/themes/rose-pine-moon/index.css @@ -14,11 +14,11 @@ --jaamd-code-border: #9893a5; --jaamd-code-fg: #575279; - --jaamd-pre-bg: #faf4ed; - --jaamd-pre-border: #fffaf3; + --jaamd-pre-bg: #fffaf3; + --jaamd-pre-border: #9893a5; --jaamd-pre-fg: #575279; - --jaamd-copy-btn-bg: #fffaf3; + --jaamd-copy-btn-bg: #faf4ed; --jaamd-copy-btn-border: #9893a5; --jaamd-copy-btn-fg: #575279; --jaamd-copy-btn-hover-bg: #9893a5; @@ -38,8 +38,8 @@ --jaamd-tabs-border: #fffaf3; --jaamd-tabs-header-bg: #f2e9e1; - --jaamd-tabs-btn-hover-bg: #fffaf3; - --jaamd-tabs-btn-active-bg: #faf4ed; + --jaamd-tabs-btn-hover-bg: #faf4ed; + --jaamd-tabs-btn-active-bg: #fffaf3; --jaamd-details-bg: #faf4ed; --jaamd-details-border: #fffaf3; @@ -74,11 +74,11 @@ html.dark { --jaamd-code-border: #6e6a86; --jaamd-code-fg: #e0def4; - --jaamd-pre-bg: #232136; - --jaamd-pre-border: #2a273f; + --jaamd-pre-bg: #2a273f; + --jaamd-pre-border: #6e6a86; --jaamd-pre-fg: #e0def4; - --jaamd-copy-btn-bg: #2a273f; + --jaamd-copy-btn-bg: #232136; --jaamd-copy-btn-border: #6e6a86; --jaamd-copy-btn-fg: #e0def4; --jaamd-copy-btn-hover-bg: #6e6a86; @@ -98,8 +98,8 @@ html.dark { --jaamd-tabs-border: #2a273f; --jaamd-tabs-header-bg: #232136; - --jaamd-tabs-btn-hover-bg: #2a273f; - --jaamd-tabs-btn-active-bg: #232136; + --jaamd-tabs-btn-hover-bg: #232136; + --jaamd-tabs-btn-active-bg: #2a273f; --jaamd-details-bg: #232136; --jaamd-details-border: #2a273f; diff --git a/packages/jaamd/src/themes/rose-pine/index.css b/packages/jaamd/src/themes/rose-pine/index.css index a21793a..9b20785 100644 --- a/packages/jaamd/src/themes/rose-pine/index.css +++ b/packages/jaamd/src/themes/rose-pine/index.css @@ -14,11 +14,11 @@ --jaamd-code-border: #9893a5; --jaamd-code-fg: #575279; - --jaamd-pre-bg: #faf4ed; - --jaamd-pre-border: #fffaf3; + --jaamd-pre-bg: #fffaf3; + --jaamd-pre-border: #9893a5; --jaamd-pre-fg: #575279; - --jaamd-copy-btn-bg: #fffaf3; + --jaamd-copy-btn-bg: #faf4ed; --jaamd-copy-btn-border: #9893a5; --jaamd-copy-btn-fg: #575279; --jaamd-copy-btn-hover-bg: #9893a5; @@ -38,8 +38,8 @@ --jaamd-tabs-border: #fffaf3; --jaamd-tabs-header-bg: #f2e9e1; - --jaamd-tabs-btn-hover-bg: #fffaf3; - --jaamd-tabs-btn-active-bg: #faf4ed; + --jaamd-tabs-btn-hover-bg: #faf4ed; + --jaamd-tabs-btn-active-bg: #fffaf3; --jaamd-details-bg: #faf4ed; --jaamd-details-border: #fffaf3; @@ -74,11 +74,11 @@ html.dark { --jaamd-code-border: #6e6a86; --jaamd-code-fg: #e0def4; - --jaamd-pre-bg: #191724; - --jaamd-pre-border: #1f1d2e; + --jaamd-pre-bg: #1f1d2e; + --jaamd-pre-border: #6e6a86; --jaamd-pre-fg: #e0def4; - --jaamd-copy-btn-bg: #1f1d2e; + --jaamd-copy-btn-bg: #191724; --jaamd-copy-btn-border: #6e6a86; --jaamd-copy-btn-fg: #e0def4; --jaamd-copy-btn-hover-bg: #6e6a86; @@ -98,8 +98,8 @@ html.dark { --jaamd-tabs-border: #1f1d2e; --jaamd-tabs-header-bg: #191724; - --jaamd-tabs-btn-hover-bg: #1f1d2e; - --jaamd-tabs-btn-active-bg: #191724; + --jaamd-tabs-btn-hover-bg: #191724; + --jaamd-tabs-btn-active-bg: #1f1d2e; --jaamd-details-bg: #191724; --jaamd-details-border: #1f1d2e; diff --git a/packages/jaamd/src/themes/tokyo-night/dark.css b/packages/jaamd/src/themes/tokyo-night/dark.css index ebba0ea..ddd1427 100644 --- a/packages/jaamd/src/themes/tokyo-night/dark.css +++ b/packages/jaamd/src/themes/tokyo-night/dark.css @@ -14,11 +14,11 @@ html.dark { --jaamd-code-border: #565f89; --jaamd-code-fg: #c0caf5; - --jaamd-pre-bg: #1a1b26; - --jaamd-pre-border: #292e42; + --jaamd-pre-bg: #292e42; + --jaamd-pre-border: #565f89; --jaamd-pre-fg: #a9b1d6; - --jaamd-copy-btn-bg: #292e42; + --jaamd-copy-btn-bg: #1a1b26; --jaamd-copy-btn-border: #565f89; --jaamd-copy-btn-fg: #a9b1d6; --jaamd-copy-btn-hover-bg: #565f89; @@ -38,8 +38,8 @@ html.dark { --jaamd-tabs-border: #292e42; --jaamd-tabs-header-bg: #16161e; - --jaamd-tabs-btn-hover-bg: #292e42; - --jaamd-tabs-btn-active-bg: #1a1b26; + --jaamd-tabs-btn-hover-bg: #1a1b26; + --jaamd-tabs-btn-active-bg: #292e42; --jaamd-details-bg: #1a1b26; --jaamd-details-border: #292e42; diff --git a/packages/jaamd/src/themes/tokyo-night/index.css b/packages/jaamd/src/themes/tokyo-night/index.css index 6dcce4b..69d62bf 100644 --- a/packages/jaamd/src/themes/tokyo-night/index.css +++ b/packages/jaamd/src/themes/tokyo-night/index.css @@ -14,11 +14,11 @@ --jaamd-code-border: #565f89; --jaamd-code-fg: #c0caf5; - --jaamd-pre-bg: #1a1b26; - --jaamd-pre-border: #292e42; + --jaamd-pre-bg: #292e42; + --jaamd-pre-border: #565f89; --jaamd-pre-fg: #a9b1d6; - --jaamd-copy-btn-bg: #292e42; + --jaamd-copy-btn-bg: #1a1b26; --jaamd-copy-btn-border: #565f89; --jaamd-copy-btn-fg: #a9b1d6; --jaamd-copy-btn-hover-bg: #565f89; @@ -38,8 +38,8 @@ --jaamd-tabs-border: #292e42; --jaamd-tabs-header-bg: #16161e; - --jaamd-tabs-btn-hover-bg: #292e42; - --jaamd-tabs-btn-active-bg: #1a1b26; + --jaamd-tabs-btn-hover-bg: #1a1b26; + --jaamd-tabs-btn-active-bg: #292e42; --jaamd-details-bg: #1a1b26; --jaamd-details-border: #292e42; diff --git a/scripts/build-themes.mjs b/scripts/build-themes.mjs index 5d15eb4..6704481 100644 --- a/scripts/build-themes.mjs +++ b/scripts/build-themes.mjs @@ -34,12 +34,12 @@ const GROUPS = [ ["code-fg", "bright"], ], [ - ["pre-bg", "base"], - ["pre-border", "surface"], + ["pre-bg", "surface"], + ["pre-border", "overlay"], ["pre-fg", "text"], ], [ - ["copy-btn-bg", "surface"], + ["copy-btn-bg", "base"], ["copy-btn-border", "overlay"], ["copy-btn-fg", "text"], ["copy-btn-hover-bg", "overlay"], @@ -63,8 +63,8 @@ const GROUPS = [ [ ["tabs-border", "surface"], ["tabs-header-bg", "recessed"], - ["tabs-btn-hover-bg", "surface"], - ["tabs-btn-active-bg", "base"], + ["tabs-btn-hover-bg", "base"], + ["tabs-btn-active-bg", "surface"], ], [ ["details-bg", "base"],