test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #513 from frappe/develop

Browse Source
This commit is contained in:
Shariq Ansari 2025-01-03 20:54:50 +05:30 committed by GitHub
commit ddfbcd7587
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frappe-ui

@ -1 +1 @@
Subproject commit 46086c524bc218d989c68ca54cd13a37e693fab9
Subproject commit 6b2cdc8b6ea1f31ff9a0202433bb5d7c4df946b0

2
frontend/package.json
View File

@ -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",

12
frontend/src/components/Activities/EmailContent.vue
View File

@ -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 {

8
yarn.lock
View File

@ -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"