diff options
| author | Robot Odoo <xmo+roboto@odoo.com> | 2019-02-27 17:05:10 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 17:05:10 +0100 |
| commit | 754ec4450832dceef83c3a0abb79401f2e7ec05d (patch) | |
| tree | d22f8adf76efbf0ba5369365a88a8a37e5edd81d /addons/web/static/src | |
| parent | 1bd8c1e8462bf1871780f3fd127e2e345e154a2f (diff) | |
| parent | 36caf5fc16b5a95a0bf37f08f0caf974683b2df6 (diff) | |
[MERGE] web: update bootstrap from 4.2.1 to 4.3.1
See https://blog.getbootstrap.com/2019/02/11/bootstrap-4-3-0/
and https://blog.getbootstrap.com/2019/02/13/bootstrap-4-3-1-and-3-4-1/
Again, some fixes were added in this version and not in a 4.2.x version
so there is no clean way to backport them in 12.0 / saas-12.2.
If needed, the file bootstrap_review.scss is there for that.
Among the new features, two notable ones:
- The '.modal-dialog-scrollable' class which does what odoo already
implemented for all its modals. So we could remove our custom code in
a next update.
- Responsive font sizes ! Plan was to develop something similar for the
website, so this comes at the right time. The behavior is opt-in, we
will enable it in a next update.
task-1944790
closes odoo/odoo#31401
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/libs/bootstrap.js | 1 | ||||
| -rw-r--r-- | addons/web/static/src/scss/bs_mixins_overrides.scss | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/addons/web/static/src/js/libs/bootstrap.js b/addons/web/static/src/js/libs/bootstrap.js index 3dd2c7049e1..9db99815009 100644 --- a/addons/web/static/src/js/libs/bootstrap.js +++ b/addons/web/static/src/js/libs/bootstrap.js @@ -10,6 +10,7 @@ odoo.define('web.bootstrap.extensions', function () { $.fn.tooltip.Constructor.Default.placement = 'auto'; $.fn.tooltip.Constructor.Default.fallbackPlacement = ['bottom', 'right', 'left', 'top']; $.fn.tooltip.Constructor.Default.html = true; +$.fn.tooltip.Constructor.Default.sanitize = false; $.fn.tooltip.Constructor.Default.trigger = 'hover'; $.fn.tooltip.Constructor.Default.container = 'body'; $.fn.tooltip.Constructor.Default.boundary = 'window'; diff --git a/addons/web/static/src/scss/bs_mixins_overrides.scss b/addons/web/static/src/scss/bs_mixins_overrides.scss index 0a5aa962be7..f828ccded37 100644 --- a/addons/web/static/src/scss/bs_mixins_overrides.scss +++ b/addons/web/static/src/scss/bs_mixins_overrides.scss @@ -3,6 +3,10 @@ // Those will affect the way bootstrap is generated wherever bootstrap is used //------------------------------------------------------------------------------ +// This variable must be defined here instead of bootstrap overridden files +// otherwise we will have deprecation messages for assets_common generation +$enable-deprecation-messages: false !default; + // Override color-yiq function to handle the alpha component of colors and // automatic threshold @function color-yiq($color, $dark: $yiq-text-dark, $light: $yiq-text-light, $background: $body-bg, $cross-mix: true) { |