diff options
| author | qsm-odoo <qsm@odoo.com> | 2016-09-05 13:33:17 +0100 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2016-09-05 17:07:31 +0100 |
| commit | 61e48b09fb8d9896ecea230f0d1b7de1d47cae67 (patch) | |
| tree | 3a2a992e563a37e73d02bae73e21cb240a0f2d3b /addons/mass_mailing/static/src/css | |
| parent | 71b8bc7570d1e9d691334f245d216c48f4348c64 (diff) | |
[REF] mass_mailing: convert templates to themes and clean code
* Remove mass mailing template switching system (lemon, airmail, ...)
and replace it with a theme selector which only toggle a different
class on the body.
* Lint JS files.
* Change the way the editor is overridden by mass_mailing in a more
odoo way (put the JS in assets and check on runtime if it must be
applied.
+ fix editor style
+ remove useless code
+ remove odoo template
Diffstat (limited to 'addons/mass_mailing/static/src/css')
8 files changed, 227 insertions, 285 deletions
diff --git a/addons/mass_mailing/static/src/css/airmail_template.css b/addons/mass_mailing/static/src/css/airmail_template.css deleted file mode 100644 index 00c32beeace..00000000000 --- a/addons/mass_mailing/static/src/css/airmail_template.css +++ /dev/null @@ -1,77 +0,0 @@ -/*Airmail Template*/ - -.airmail_template_header, .airmail_template_footer { - background-color: #d05d68; -} -.airmail_template { - background-color: #ededed; -} -.airmail_template_container { - background-color: white; - box-shadow: none; -} - -/*Colors*/ - -.airmail_template .bg-alpha { - background-color: #fff; -} -.airmail_template .bg-alpha p, .airmail_template .bg-alpha .display-1, .airmail_template .bg-alpha .display-2, .airmail_template .bg-alpha .display-3 { - color: #000; -} -.airmail_template .bg-beta { - background-color: #6077a8; -} -.airmail_template .bg-beta p, .airmail_template .bg-beta .display-1, .airmail_template .bg-beta .display-2, .airmail_template .bg-beta .display-3 { - color: #fff; -} -.airmail_template .bg-beta .link-color { - color: #dab4a8; -} -.airmail_template .bg-gamma { - background-color: #a17e92; -} -.airmail_template .bg-gamma .link-color { - color: #dab4a8; -} -.airmail_template .bg-gamma p, .airmail_template .bg-gamma .display-1, .airmail_template .bg-gamma .display-2, .airmail_template .bg-gamma .display-3 { - color: #fff; -} -.airmail_template .bg-delta { - background-color: #dab4a8; -} -.airmail_template .bg-delta p, .airmail_template .bg-delta .display-1, .airmail_template .bg-delta .display-2, .airmail_template .bg-delta .display-3 { - color: #000; -} -.airmail_template .bg-epsilon { - background-color: #d05d68; -} -.airmail_template .bg-epsilon p, .airmail_template .bg-epsilon .display-1, .airmail_template .bg-epsilon .display-2, .airmail_template .bg-epsilon .display-3 { - color: #fff; -} -.airmail_template .bg-epsilon .link-color { - color: #fff; -} - -/*Link color*/ - -.airmail_template .link-color { - color: #d05d68; -} - -/*BTN styles*/ - -.airmail_template .newsletter-btn { - color: #d05d68; - border: 1px solid #d05d68; - border-radius: 4px; - background-color: transparent; -} -.airmail_template .bg-gamma .newsletter-btn { - color: #fff; - border: 1px solid #fff; -} -.airmail_template .bg-epsilon .newsletter-btn { - color: #fff; - border: 1px solid #fff; -}
\ No newline at end of file diff --git a/addons/mass_mailing/static/src/css/lemon_template.css b/addons/mass_mailing/static/src/css/lemon_template.css deleted file mode 100644 index 21b97f34fad..00000000000 --- a/addons/mass_mailing/static/src/css/lemon_template.css +++ /dev/null @@ -1,75 +0,0 @@ -/* ======================== COLORS ====================== */ - -.lemon_template { - background-color: #fff; -} -.lemon_template_header { - background-color: #fe4e1e; -} -.lemon_template_container { - background-color: #f4ea00; -} - -.lemon_template p { - color: #000; -} -.lemon_template .bg-alpha { - background-color: #fff; -} -.lemon_template .bg-alpha .display-1, .lemon_template .bg-alpha p, .lemon_template .bg-alpha .display-2, .lemon_template .bg-alpha .display-3{ - color: #000; -} -.lemon_template .bg-beta { - background-color: #f4ea00; -} -.lemon_template .bg-beta p, .lemon_template .bg-beta .display-1, .lemon_template .bg-beta .display-2, .lemon_template .bg-beta .display-3 { - color: #000; -} -.lemon_template .bg-gamma { - background-color: #d6d5b6; -} -.lemon_template .bg-gamma p, .lemon_template .bg-gamma .display-1, .lemon_template .bg-gamma .display-2, .lemon_template .bg-gamma .display-3 { - color: #000; -} -.lemon_template .bg-gamma .link-color { - color: #fe4e1e; -} -.lemon_template .bg-delta { - background-color: #000; -} -.lemon_template .bg-delta p, .lemon_template .bg-delta .display-1, .lemon_template .bg-delta .display-2, .lemon_template .bg-delta .display-3 { - color: #fff; -} -.lemon_template .bg-delta .link-color { - color: #fe4e1e; -} -.lemon_template .bg-epsilon { - background-color: #fe4e1e; -} -.lemon_template .bg-epsilon p, .lemon_template .bg-epsilon .display-1, .lemon_template .bg-epsilon .display-2, .lemon_template .bg-epsilon .display-3 { - color: #fff; -} -.lemon_template .bg-epsilon .link-color { - color: #f4ea00; -} - -.lemon_template .link-color { - color: #fe4e1e; -} - -/*BTN styles*/ - -.lemon_template .newsletter-btn { - color: #fff; - background-color: #fe4e1e; - font-size: 12px; -} - -/*Snippet styles*/ - -.lemon_template .separator { - background-color: #fff; -} -.lemon_template .snippet-general { - margin:0 auto; -}
\ No newline at end of file diff --git a/addons/mass_mailing/static/src/css/odoo_template.css b/addons/mass_mailing/static/src/css/odoo_template.css deleted file mode 100644 index 43d6486ac7a..00000000000 --- a/addons/mass_mailing/static/src/css/odoo_template.css +++ /dev/null @@ -1,52 +0,0 @@ -/* ======================== COLORS ====================== */ - -.odoo_template { - background-color: #ededed; -} -.odoo_template_container { - background-color: #fff; - -webkit-box-shadow: 0px 0px 12px 1px rgba(0,0,0,0.3); - -moz-box-shadow: 0px 0px 12px 1px rgba(0,0,0,0.3); - box-shadow: 0px 0px 12px 1px rgba(0,0,0,0.3); -} -.odoo_template .bg-alpha { - background-color: #fff; -} -.odoo_template .bg-alpha .display-1, .odoo_template .bg-alpha p, .odoo_template .bg-alpha .display-2, .odoo_template .bg-alpha .display-3{ - color: #000; -} -.odoo_template .bg-beta { - background-color: #875a7b; -} -.odoo_template .bg-beta p, .odoo_template .bg-beta .display-1, .odoo_template .bg-beta .display-2, .odoo_template .bg-beta .display-3 { - color: #fff; -} -.odoo_template .bg-gamma { - background-color: #e46f78; -} -.odoo_template .bg-gamma p, .odoo_template .bg-gamma .display-1, .odoo_template .bg-gamma .display-2, .odoo_template .bg-gamma .display-3 { - color: #fff; -} -.odoo_template .bg-gamma .link-color { - color: #3d5d6b; -} -.odoo_template .bg-delta { - background-color: #34c9a4; -} -.odoo_template .bg-delta p, .odoo_template .bg-delta .display-1, .odoo_template .bg-delta .display-2, .odoo_template .bg-delta .display-3 { - color: #fff; -} -.odoo_template .bg-delta .link-color { - color: #3d5d6b; -} -.odoo_template .bg-epsilon { - background-color: #3d5d6b; -} -.odoo_template .bg-epsilon p, .odoo_template .bg-epsilon .display-1, .odoo_template .bg-epsilon .display-2, .odoo_template .bg-epsilon .display-3 { - color: #fff; -} - -.odoo_template .link-color { - color: #34c9a4; -} - diff --git a/addons/mass_mailing/static/src/css/snippet_styles.css b/addons/mass_mailing/static/src/css/snippet_styles.css index fc7d7d15ab9..2035ea37ea1 100644 --- a/addons/mass_mailing/static/src/css/snippet_styles.css +++ b/addons/mass_mailing/static/src/css/snippet_styles.css @@ -3,12 +3,6 @@ width: 600px; } } -#oe_snippets #snippets_menu li { - width: 20%; -} -#email_designer_layout .o_panel_body .oe_snippet_thumbnail_img { - cursor: crosshair; -} /* ======================== TYPO ====================== */ diff --git a/addons/mass_mailing/static/src/css/tech_template.css b/addons/mass_mailing/static/src/css/tech_template.css deleted file mode 100644 index 3d63a88ad94..00000000000 --- a/addons/mass_mailing/static/src/css/tech_template.css +++ /dev/null @@ -1,75 +0,0 @@ -/* ======================== COLORS ====================== */ - -.tech_template { - background-color: #fff; -} -.tech_template_header { - background-color: #e3e3e3; -} - -.tech_template p { - color: #494949; -} -.tech_template .bg-alpha { - background-color: #fff; -} -.tech_template .bg-alpha .display-1, .tech_template .bg-alpha p, .tech_template .bg-alpha .display-2, .tech_template .bg-alpha .display-3{ - color: #000; -} -.tech_template .bg-beta { - background-color: #dadada; -} -.tech_template .bg-beta p, .tech_template .bg-beta .display-1, .tech_template .bg-beta .display-2, .tech_template .bg-beta .display-3 { - color: #000; -} -.tech_template .bg-beta .link-color { - color: #de5745; -} -.tech_template .bg-gamma { - background-color: #de5745; -} -.tech_template .bg-gamma p, .tech_template .bg-gamma .display-1, .tech_template .bg-gamma .display-2, .tech_template .bg-gamma .display-3 { - color: #fff; -} -.tech_template .bg-gamma .link-color { - color: #ccda3f; -} -.tech_template .bg-delta { - background-color: #4a9fba; -} -.tech_template .bg-delta p, .tech_template .bg-delta .display-1, .tech_template .bg-delta .display-2, .tech_template .bg-delta .display-3 { - color: #fff; -} -.tech_template .bg-delta .link-color { - color: #ccda3f; -} -.tech_template .bg-epsilon { - background-color: #ccda3f; -} -.tech_template .bg-epsilon p, .tech_template .bg-epsilon .display-1, .tech_template .bg-epsilon .display-2, .tech_template .bg-epsilon .display-3 { - color: #000; -} -.tech_template .bg-epsilon .link-color { - color: #de5745; -} - -.tech_template .link-color { - color: #ccda3f; -} - -/*BTN styles*/ - -.tech_template .newsletter-btn { - color: #fff; - background-color: #ccda3f; - font-size: 12px; -} -.tech_template .bg-epsilon .newsletter-btn { - background-color: #de5745; -} - -/*Snippet styles*/ - -.tech_template .snippet-general { - margin:0 auto; -}
\ No newline at end of file diff --git a/addons/mass_mailing/static/src/css/themes/airmail.css b/addons/mass_mailing/static/src/css/themes/airmail.css new file mode 100644 index 00000000000..655d4bd19ee --- /dev/null +++ b/addons/mass_mailing/static/src/css/themes/airmail.css @@ -0,0 +1,77 @@ +/*Airmail Template*/ + +.o_airmail_theme_header, .o_airmail_theme_footer { + background-color: #d05d68; +} +.o_airmail_theme { + background-color: #ededed; +} +.o_airmail_theme_container { + background-color: white; + box-shadow: none; +} + +/*Colors*/ + +.o_airmail_theme .bg-alpha { + background-color: #fff; +} +.o_airmail_theme .bg-alpha p, .o_airmail_theme .bg-alpha .display-1, .o_airmail_theme .bg-alpha .display-2, .o_airmail_theme .bg-alpha .display-3 { + color: #000; +} +.o_airmail_theme .bg-beta { + background-color: #6077a8; +} +.o_airmail_theme .bg-beta p, .o_airmail_theme .bg-beta .display-1, .o_airmail_theme .bg-beta .display-2, .o_airmail_theme .bg-beta .display-3 { + color: #fff; +} +.o_airmail_theme .bg-beta .link-color { + color: #dab4a8; +} +.o_airmail_theme .bg-gamma { + background-color: #a17e92; +} +.o_airmail_theme .bg-gamma .link-color { + color: #dab4a8; +} +.o_airmail_theme .bg-gamma p, .o_airmail_theme .bg-gamma .display-1, .o_airmail_theme .bg-gamma .display-2, .o_airmail_theme .bg-gamma .display-3 { + color: #fff; +} +.o_airmail_theme .bg-delta { + background-color: #dab4a8; +} +.o_airmail_theme .bg-delta p, .o_airmail_theme .bg-delta .display-1, .o_airmail_theme .bg-delta .display-2, .o_airmail_theme .bg-delta .display-3 { + color: #000; +} +.o_airmail_theme .bg-epsilon { + background-color: #d05d68; +} +.o_airmail_theme .bg-epsilon p, .o_airmail_theme .bg-epsilon .display-1, .o_airmail_theme .bg-epsilon .display-2, .o_airmail_theme .bg-epsilon .display-3 { + color: #fff; +} +.o_airmail_theme .bg-epsilon .link-color { + color: #fff; +} + +/*Link color*/ + +.o_airmail_theme .link-color { + color: #d05d68; +} + +/*BTN styles*/ + +.o_airmail_theme .newsletter-btn { + color: #d05d68; + border: 1px solid #d05d68; + border-radius: 4px; + background-color: transparent; +} +.o_airmail_theme .bg-gamma .newsletter-btn { + color: #fff; + border: 1px solid #fff; +} +.o_airmail_theme .bg-epsilon .newsletter-btn { + color: #fff; + border: 1px solid #fff; +} diff --git a/addons/mass_mailing/static/src/css/themes/lemon.css b/addons/mass_mailing/static/src/css/themes/lemon.css new file mode 100644 index 00000000000..df6a83f9e17 --- /dev/null +++ b/addons/mass_mailing/static/src/css/themes/lemon.css @@ -0,0 +1,75 @@ +/* ======================== COLORS ====================== */ + +.o_lemon_theme { + background-color: #fff; +} +.o_lemon_theme_header { + background-color: #fe4e1e; +} +.o_lemon_theme_container { + background-color: #f4ea00; +} + +.o_lemon_theme p { + color: #000; +} +.o_lemon_theme .bg-alpha { + background-color: #fff; +} +.o_lemon_theme .bg-alpha .display-1, .o_lemon_theme .bg-alpha p, .o_lemon_theme .bg-alpha .display-2, .o_lemon_theme .bg-alpha .display-3{ + color: #000; +} +.o_lemon_theme .bg-beta { + background-color: #f4ea00; +} +.o_lemon_theme .bg-beta p, .o_lemon_theme .bg-beta .display-1, .o_lemon_theme .bg-beta .display-2, .o_lemon_theme .bg-beta .display-3 { + color: #000; +} +.o_lemon_theme .bg-gamma { + background-color: #d6d5b6; +} +.o_lemon_theme .bg-gamma p, .o_lemon_theme .bg-gamma .display-1, .o_lemon_theme .bg-gamma .display-2, .o_lemon_theme .bg-gamma .display-3 { + color: #000; +} +.o_lemon_theme .bg-gamma .link-color { + color: #fe4e1e; +} +.o_lemon_theme .bg-delta { + background-color: #000; +} +.o_lemon_theme .bg-delta p, .o_lemon_theme .bg-delta .display-1, .o_lemon_theme .bg-delta .display-2, .o_lemon_theme .bg-delta .display-3 { + color: #fff; +} +.o_lemon_theme .bg-delta .link-color { + color: #fe4e1e; +} +.o_lemon_theme .bg-epsilon { + background-color: #fe4e1e; +} +.o_lemon_theme .bg-epsilon p, .o_lemon_theme .bg-epsilon .display-1, .o_lemon_theme .bg-epsilon .display-2, .o_lemon_theme .bg-epsilon .display-3 { + color: #fff; +} +.o_lemon_theme .bg-epsilon .link-color { + color: #f4ea00; +} + +.o_lemon_theme .link-color { + color: #fe4e1e; +} + +/*BTN styles*/ + +.o_lemon_theme .newsletter-btn { + color: #fff; + background-color: #fe4e1e; + font-size: 12px; +} + +/*Snippet styles*/ + +.o_lemon_theme .separator { + background-color: #fff; +} +.o_lemon_theme .snippet-general { + margin:0 auto; +} diff --git a/addons/mass_mailing/static/src/css/themes/tech.css b/addons/mass_mailing/static/src/css/themes/tech.css new file mode 100644 index 00000000000..00ea206cd48 --- /dev/null +++ b/addons/mass_mailing/static/src/css/themes/tech.css @@ -0,0 +1,75 @@ +/* ======================== COLORS ====================== */ + +.o_tech_theme { + background-color: #fff; +} +.o_tech_theme_header { + background-color: #e3e3e3; +} + +.o_tech_theme p { + color: #494949; +} +.o_tech_theme .bg-alpha { + background-color: #fff; +} +.o_tech_theme .bg-alpha .display-1, .o_tech_theme .bg-alpha p, .o_tech_theme .bg-alpha .display-2, .o_tech_theme .bg-alpha .display-3{ + color: #000; +} +.o_tech_theme .bg-beta { + background-color: #dadada; +} +.o_tech_theme .bg-beta p, .o_tech_theme .bg-beta .display-1, .o_tech_theme .bg-beta .display-2, .o_tech_theme .bg-beta .display-3 { + color: #000; +} +.o_tech_theme .bg-beta .link-color { + color: #de5745; +} +.o_tech_theme .bg-gamma { + background-color: #de5745; +} +.o_tech_theme .bg-gamma p, .o_tech_theme .bg-gamma .display-1, .o_tech_theme .bg-gamma .display-2, .o_tech_theme .bg-gamma .display-3 { + color: #fff; +} +.o_tech_theme .bg-gamma .link-color { + color: #ccda3f; +} +.o_tech_theme .bg-delta { + background-color: #4a9fba; +} +.o_tech_theme .bg-delta p, .o_tech_theme .bg-delta .display-1, .o_tech_theme .bg-delta .display-2, .o_tech_theme .bg-delta .display-3 { + color: #fff; +} +.o_tech_theme .bg-delta .link-color { + color: #ccda3f; +} +.o_tech_theme .bg-epsilon { + background-color: #ccda3f; +} +.o_tech_theme .bg-epsilon p, .o_tech_theme .bg-epsilon .display-1, .o_tech_theme .bg-epsilon .display-2, .o_tech_theme .bg-epsilon .display-3 { + color: #000; +} +.o_tech_theme .bg-epsilon .link-color { + color: #de5745; +} + +.o_tech_theme .link-color { + color: #ccda3f; +} + +/*BTN styles*/ + +.o_tech_theme .newsletter-btn { + color: #fff; + background-color: #ccda3f; + font-size: 12px; +} +.o_tech_theme .bg-epsilon .newsletter-btn { + background-color: #de5745; +} + +/*Snippet styles*/ + +.o_tech_theme .snippet-general { + margin:0 auto; +} |
