From d8ad9b558f08c9d204d260f07988a50fe2385d96 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 24 Jan 2021 11:05:40 +0530 Subject: [PATCH] refactor: Move default email.css to the root css folder --- frappe/email/email_body.py | 6 +- frappe/public/build.json | 2 +- frappe/public/css/email.css | 181 ------------------------------------ 3 files changed, 6 insertions(+), 183 deletions(-) delete mode 100644 frappe/public/css/email.css diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index d1dc6f31fa..e12b3d78d9 100755 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -292,7 +292,11 @@ def inline_style_in_html(html): apps = frappe.get_installed_apps() - css_files = [] + # add frappe email css file + css_files = ['assets/css/email.css'] + if 'frappe' in apps: + apps.remove('frappe') + for app in apps: path = 'assets/{0}/css/email.css'.format(app) if os.path.exists(os.path.abspath(path)): diff --git a/frappe/public/build.json b/frappe/public/build.json index 18b84e08ad..907e85db75 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -301,7 +301,7 @@ "public/less/controls.less", "node_modules/frappe-datatable/dist/frappe-datatable.css" ], - "frappe/css/email.css": "public/scss/email.scss", + "css/email.css": "public/scss/email.scss", "js/barcode_scanner.min.js": "public/js/frappe/barcode_scanner/quagga.js", "js/user_profile_controller.min.js": "desk/page/user_profile/user_profile_controller.js", "css/login.css": "public/scss/login.scss" diff --git a/frappe/public/css/email.css b/frappe/public/css/email.css deleted file mode 100644 index 62f0c6ebec..0000000000 --- a/frappe/public/css/email.css +++ /dev/null @@ -1,181 +0,0 @@ -/* csslint ignore:start */ -/* palette colors*/ -body { - line-height: 1.5; - color: #12283A; -} -p { - margin: 1em 0 !important; -} -.ql-editor { - white-space: normal; -} -.ql-editor p { - margin: 0 !important; -} -hr { - border-top: 1px solid #ECEEF0; -} -.body-table { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; -} -.body-table td { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; -} -.email-header, -.email-body, -.email-footer { - width: 100% !important; - min-width: 100% !important; -} -.email-body { - font-size: 14px; -} -.email-footer { - border-top: 1px solid #ECEEF0; - font-size: 12px; -} -.email-header { - border: 1px solid #ECEEF0; - border-radius: 4px 4px 0 0; -} -.email-header .brand-image { - width: 24px; - height: 24px; - display: block; -} -.email-header-title { - font-weight: bold; -} -.body-table.has-header .email-body { - border: 1px solid #ECEEF0; - border-radius: 0 0 4px 4px; - border-top: none; -} -.body-table.has-header .email-footer { - border-top: none; -} -.email-footer-container { - margin-top: 30px; -} -.email-footer-container > div:not(:last-child) { - margin-bottom: 5px; -} -.email-unsubscribe a { - color: #8d99a6; - text-decoration: underline; -} -.btn { - text-decoration: none; - padding: 7px 10px; - font-size: 12px; - border: 1px solid; - border-radius: 3px; -} -.btn.btn-default { - color: #fff; - background-color: #f0f4f7; - border-color: transparent; -} -.btn.btn-primary { - color: #fff; - background-color: #2996F1; - border-color: #444bff; -} -.table { - width: 100%; - border-collapse: collapse; -} -.table td, -.table th { - padding: 8px; - line-height: 1.42857143; - vertical-align: top; - border-top: 1px solid #ECEEF0; - text-align: left; -} -.table th { - font-weight: bold; -} -.table > thead > tr > th { - vertical-align: middle; - border-bottom: 2px solid #ECEEF0; -} -.table > thead:first-child > tr:first-child > th { - border-top: none; -} -.table.table-bordered { - border: 1px solid #ECEEF0; -} -.table.table-bordered td, -.table.table-bordered th { - border: 1px solid #ECEEF0; -} -.more-info { - font-size: 80% !important; - color: #8d99a6 !important; - border-top: 1px solid #ebeff2; - padding-top: 10px; -} -.text-right { - text-align: right !important; -} -.text-center { - text-align: center !important; -} -.text-muted { - color: #8d99a6 !important; -} -.text-extra-muted { - color: #ECEEF0 !important; -} -.text-regular { - font-size: 14px; -} -.text-medium { - font-size: 12px; -} -.text-small { - font-size: 10px; -} -.text-bold { - font-weight: bold; -} -.indicator { - width: 8px; - height: 8px; - border-radius: 8px; - background-color: #b8c2cc; - display: inline-block; - margin-right: 5px; -} -.indicator.indicator-blue { - background-color: #5e64ff; -} -.indicator.indicator-green { - background-color: #98d85b; -} -.indicator.indicator-orange { - background-color: #ffa00a; -} -.indicator.indicator-red { - background-color: #ff5858; -} -.indicator.indicator-yellow { - background-color: #feef72; -} -.screenshot { - box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.1); - border: 1px solid #ECEEF0; - margin: 8px 0; - max-width: 100%; -} -.list-unstyled { - list-style-type: none; - padding: 0; -} -/* auto email report */ -.report-title { - margin-bottom: 20px; -} -/* csslint ignore:end */