mdpopup background fix

dempfi · Sep 25, 2021 · d7beef2 · d7beef2
1 parent 8466c72
commit d7beef2
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 8 deletions.
diff --git a/ayu-dark.sublime-color-scheme b/ayu-dark.sublime-color-scheme
@@ -8,7 +8,7 @@
 		"block_caret": "#e6b4504d",
 		"line_highlight": "#161a24",
 		"accent": "#e6b450",
-		"popup_css": "\n      html, body {\n        background-color: transparent;\n        color: #bfbdb6;\n      }\n      body {\n        padding: 1px 3px;\n      }\n      a {\n        color: rgba(57,186,230, .7);\n      }\n    ",
+		"popup_css": "\n      html, body {\n        background-color: #141821;\n        color: #bfbdb6;\n        --mdpopups-font-mono: \"PragmataPro Mono Liga\", \"sf mono\", Consolas, \"Liberation Mono\", Menlo, Courier, monospace;\n        --mdpopups-bg: #141821;\n        --mdpopups-link: #59c2ff;\n      }\n      body {\n        padding: 1px 3px;\n      }\n      a {\n        color: rgba(89,194,255, .7);\n      }\n    ",
 		"gutter": "#10141c",
 		"gutter_foreground": "#6c738099",
 		"line_diff_width": "2",

diff --git a/ayu-light.sublime-color-scheme b/ayu-light.sublime-color-scheme
@@ -8,7 +8,7 @@
 		"block_caret": "#ffaa334d",
 		"line_highlight": "#8a91991a",
 		"accent": "#ffaa33",
-		"popup_css": "\n      html, body {\n        background-color: transparent;\n        color: #5c6166;\n      }\n      body {\n        padding: 1px 3px;\n      }\n      a {\n        color: rgba(85,180,212, .7);\n      }\n    ",
+		"popup_css": "\n      html, body {\n        background-color: #ffffff;\n        color: #5c6166;\n        --mdpopups-font-mono: \"PragmataPro Mono Liga\", \"sf mono\", Consolas, \"Liberation Mono\", Menlo, Courier, monospace;\n        --mdpopups-bg: #ffffff;\n        --mdpopups-link: #22a4e6;\n      }\n      body {\n        padding: 1px 3px;\n      }\n      a {\n        color: rgba(34,164,230, .7);\n      }\n    ",
 		"gutter": "#fcfcfc",
 		"gutter_foreground": "#8a919966",
 		"line_diff_width": "2",

diff --git a/ayu-mirage.sublime-color-scheme b/ayu-mirage.sublime-color-scheme
@@ -8,7 +8,7 @@
 		"block_caret": "#ffcc664d",
 		"line_highlight": "#1a1f29",
 		"accent": "#ffcc66",
-		"popup_css": "\n      html, body {\n        background-color: transparent;\n        color: #cccac2;\n      }\n      body {\n        padding: 1px 3px;\n      }\n      a {\n        color: rgba(92,207,230, .7);\n      }\n    ",
+		"popup_css": "\n      html, body {\n        background-color: #282e3b;\n        color: #cccac2;\n        --mdpopups-font-mono: \"PragmataPro Mono Liga\", \"sf mono\", Consolas, \"Liberation Mono\", Menlo, Courier, monospace;\n        --mdpopups-bg: #282e3b;\n        --mdpopups-link: #73d0ff;\n      }\n      body {\n        padding: 1px 3px;\n      }\n      a {\n        color: rgba(115,208,255, .7);\n      }\n    ",
 		"gutter": "#242936",
 		"gutter_foreground": "#8a919980",
 		"line_diff_width": "2",

diff --git a/messages.json b/messages.json
@@ -35,5 +35,6 @@
   "6.0.1": "messages/6.0.1.md",
   "6.0.2": "messages/6.0.2.md",
   "6.0.3": "messages/6.0.3.md",
-  "6.1.0": "messages/6.1.0.md"
+  "6.1.0": "messages/6.1.0.md",
+  "6.1.1": "messages/6.1.1.md"
 }
diff --git a/messages/6.1.1.md b/messages/6.1.1.md
@@ -0,0 +1,11 @@
+**ayu theme for Sublime Text 4**
+https://github.com/dempfi/ayu/releases
+
+# Version 6.1.1
+- mdpopups have proper background matching ayu popups
+
+# Version 6.1.0
+- More prominent autocomplete selection and kind badges
+- Add distinctive type icons to the command palette and go to windows
+- Raise the contrast of the dark theme
+- All editor popups match the overall theme aesthetic
diff --git a/src/build.ts b/src/build.ts
@@ -21,9 +21,9 @@ const syntax = (kind: SchemeName) => fs.writeFileSync(
 const widget = (kind: SchemeName) => fs.writeFileSync(
   path.join(process.cwd(), `/widgets/Widget - ayu-${kind}.stTheme`),
   templates.widget(ayu[kind], kind)
-)
+);
 
-;['light', 'dark', 'mirage'].map((kind: SchemeName) => {
+['light', 'dark', 'mirage'].map((kind: SchemeName) => {
   widget(kind)
   syntax(kind)
   ui(kind)

diff --git a/src/templates/syntax.ts b/src/templates/syntax.ts
@@ -18,14 +18,17 @@ export default (scheme: Scheme) => ({
 
     popup_css: `
       html, body {
-        background-color: transparent;
+        background-color: ${scheme.ui.popup.bg.hex()};
         color: ${scheme.editor.fg.hex()};
+        --mdpopups-font-mono: "PragmataPro Mono Liga", "sf mono", Consolas, "Liberation Mono", Menlo, Courier, monospace;
+        --mdpopups-bg: ${scheme.ui.popup.bg.hex()};
+        --mdpopups-link: ${scheme.syntax.entity.hex()};
       }
       body {
         padding: 1px 3px;
       }
       a {
-        color: rgba(${scheme.syntax.tag.rgb()}, .7);
+        color: rgba(${scheme.syntax.entity.rgb()}, .7);
       }
     `,