Merge pull request #513 from frappe/develop

frappe · Jan 3, 2025 · ddfbcd7 · ddfbcd7
2 parents 3a74f1c + 280af61
commit ddfbcd7
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/frappe-ui b/frappe-ui
diff --git a/frontend/package.json b/frontend/package.json
@@ -14,7 +14,7 @@
     "@vueuse/core": "^10.3.0",
     "@vueuse/integrations": "^10.3.0",
     "feather-icons": "^4.28.0",
-    "frappe-ui": "^0.1.94",
+    "frappe-ui": "^0.1.98",
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",

diff --git a/frontend/src/components/Activities/EmailContent.vue b/frontend/src/components/Activities/EmailContent.vue
@@ -111,6 +111,14 @@ const htmlContent = `
 <head>
   <style>
     ${css}
+    :root {
+      --bg-surface-gray-3: #ededed;
+      --bg-surface-gray-4: #e2e2e2;
+    }
+    [data-theme='dark'] {
+      --bg-surface-gray-3: #343434;
+      --bg-surface-gray-4: #424242;
+    }
 
     .replied-content .collapse {
       margin: 10px 0 10px 0;
@@ -121,14 +129,14 @@ const htmlContent = `
       font-weight: 700;
       height: 12px;
       line-height: 0.1;
-      background: #e8eaed;
+      background: var(--bg-surface-gray-3);
       width: 23px;
       justify-content: center;
       border-radius: 5px;
     }
 
     .replied-content .collapse:hover {
-      background: #dadce0;
+      background: var(--bg-surface-gray-4);
     }
 
     .replied-content .collapse + input {

diff --git a/yarn.lock b/yarn.lock
@@ -2388,10 +2388,10 @@ fraction.js@^4.3.7:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-frappe-ui@^0.1.94:
-  version "0.1.94"
-  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.94.tgz#574a193ce51b47cb2747a5d5f9e9fe91b164e3a6"
-  integrity sha512-WV7nApCrDBqtKPPiVVxqFgA0JdWQz9kATZylfmMJQrSWszHCx0k0eriTSvT9+0vmtT0T9UYqLfXnhNj0lnqYNA==
+frappe-ui@^0.1.98:
+  version "0.1.98"
+  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.98.tgz#57bac80f2172239a7e9fbeff1223184ca1b0b568"
+  integrity sha512-uMdzjyCFWLJltwbcubJpdjlGsnE1qRALe2AUMWf1DRCYqpoULBNJkpu6YXLwoEiLMxhAUFy7HmdgdgUc9Y89xg==
   dependencies:
     "@headlessui/vue" "^1.7.14"
     "@popperjs/core" "^2.11.2"
+25 −0		.github/workflows/vitest.yml
+0 −8		netlify.toml
+8 −7		package.json
+1 −1		src/components/Dropdown.vue
+1 −1		src/components/ListView/ListRow.vue
+149 −0		src/data-fetching/docStore.ts
+113 −0		src/data-fetching/idbStore.ts
+6 −0		src/data-fetching/index.ts
+22 −0		src/data-fetching/useCall/types.ts
+210 −0		src/data-fetching/useCall/useCall.test.ts
+213 −0		src/data-fetching/useCall/useCall.ts
+119 −0		src/data-fetching/useDoc/useDoc.test.ts
+128 −0		src/data-fetching/useDoc/useDoc.ts
+85 −0		src/data-fetching/useDoctype/useDoctype.test.ts
+135 −0		src/data-fetching/useDoctype/useDoctype.ts
+106 −0		src/data-fetching/useFrappeFetch.ts
+40 −0		src/data-fetching/useList/listStore.ts
+49 −0		src/data-fetching/useList/types.ts
+213 −0		src/data-fetching/useList/useList.test.ts
+239 −0		src/data-fetching/useList/useList.ts
+41 −0		src/data-fetching/useNewDoc/useNewDoc.ts
+73 −0		src/data-fetching/utils.ts
+6 −0		src/index.js
+128 −0		src/mocks/handlers.ts
+4 −0		src/mocks/node.ts
+26 −0		src/mocks/utils.ts
+5 −2		tsconfig.json
+6 −1		tsconfig.node.json
+9 −0		vitest.config.ts
+14 −0		vitest.setup.ts
+473 −192		yarn.lock