diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-04-17 19:47:37 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-04-17 19:47:37 +0200 |
| commit | 15b8d353c7bcee7279a06a1dc4d03e8c259cc2f2 (patch) | |
| tree | b8018bfee69bd053674451f6eb0cfedaf0021e88 /addons/website/static/src | |
| parent | 2b63b7e8edfd052682bb01be7a2b4f66c1f6e8fb (diff) | |
| parent | 2830b93a3a7ca575bd6a29c34c50c902bb5c8913 (diff) | |
[MERGE] forward port branch 12.0 up to 2830b93a3a7
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/content/website_root.js | 4 | ||||
| -rw-r--r-- | addons/website/static/src/scss/primary_variables.scss | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/website/static/src/js/content/website_root.js b/addons/website/static/src/js/content/website_root.js index cf4812b28b9..ee94f0e8a82 100644 --- a/addons/website/static/src/js/content/website_root.js +++ b/addons/website/static/src/js/content/website_root.js @@ -282,8 +282,8 @@ var WebsiteRoot = BodyManager.extend({ var $buttons = $(ev.currentTarget).find('button[type="submit"], a.a-submit'); _.each($buttons, function (btn) { var $btn = $(btn); - $btn.attr('data-loading-text', '<i class="fa fa-spinner fa-spin"></i> ' + $(btn).text()); - $btn.button('loading'); + $btn.html('<i class="fa fa-spinner fa-spin"></i> ' + $btn.text()); + $btn.prop('disabled', true); }); }, /** diff --git a/addons/website/static/src/scss/primary_variables.scss b/addons/website/static/src/scss/primary_variables.scss index 1cd2341ae59..5f2a85d74f4 100644 --- a/addons/website/static/src/scss/primary_variables.scss +++ b/addons/website/static/src/scss/primary_variables.scss @@ -43,7 +43,7 @@ $o-social-colors: ( //------------------------------------------------------------------------------ $o-theme-fonts: ( - (-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"), // This is BS default + (-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Noto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"), // This is BS default ('Open Sans', sans-serif), ('Source Sans Pro', sans-serif), ('Raleway', sans-serif), |