diff options
| author | Robot Odoo <xmo+roboto@odoo.com> | 2019-01-10 13:58:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 13:58:21 +0100 |
| commit | a57503bfd0de622aec314aa52e60224900bd600e (patch) | |
| tree | ddc150f14b4cb85e9d82685118bcb79ce746e157 /addons/web/static/src | |
| parent | 303220f21421534ae49422aade94c385f785acff (diff) | |
| parent | f87e56c571438d8fa3e2a54939ab6b68937bf46a (diff) | |
[MERGE] web: update bootstrap from 4.1.3 to 4.2.1
Bootstrap just released a brand new version with new components and new possibilities, which are great to integrate in master.
Note: Unfortunately, this also comes with some bug fixes they did not add in a 4.1.4 version, so there is no clean way to backport them in Odoo 12.0 (so if any is required at some point, we will have to use bootstrap_review.scss or anything else to bug fix).
closes odoo/odoo#29949
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/scss/bootstrap_review.scss | 9 | ||||
| -rw-r--r-- | addons/web/static/src/scss/bs_mixins_overrides.scss | 4 | ||||
| -rw-r--r-- | addons/web/static/src/scss/import_bootstrap.scss | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/addons/web/static/src/scss/bootstrap_review.scss b/addons/web/static/src/scss/bootstrap_review.scss index a310bb5ebd8..b55e454d723 100644 --- a/addons/web/static/src/scss/bootstrap_review.scss +++ b/addons/web/static/src/scss/bootstrap_review.scss @@ -31,6 +31,15 @@ @include border-bottom-radius($card-inner-border-radius); } } +.accordion { + .collapsing, .collapse.show { + > .card-body:first-child { + // Above background color would overflow on the card-header border + // without this + margin-top: $card-border-width; + } + } +} // Modify modals so that their scrollable element is the modal-body (except in // mobile). diff --git a/addons/web/static/src/scss/bs_mixins_overrides.scss b/addons/web/static/src/scss/bs_mixins_overrides.scss index fdaa3cd5ec3..0a5aa962be7 100644 --- a/addons/web/static/src/scss/bs_mixins_overrides.scss +++ b/addons/web/static/src/scss/bs_mixins_overrides.scss @@ -5,9 +5,9 @@ // Override color-yiq function to handle the alpha component of colors and // automatic threshold -@function color-yiq($color, $background: $body-bg, $cross-mix: true) { +@function color-yiq($color, $dark: $yiq-text-dark, $light: $yiq-text-light, $background: $body-bg, $cross-mix: true) { $threshold: if($yiq-contrasted-threshold != false, $yiq-contrasted-threshold / 255 * 100%, false); - @return o-get-most-contrast($color, $yiq-text-light, $yiq-text-dark, $background, $threshold, $cross-mix); + @return o-get-most-contrast($color, $light, $dark, $background, $threshold, $cross-mix); } @mixin o-bg-color($color, $text-color: null, $with-muted: true) { diff --git a/addons/web/static/src/scss/import_bootstrap.scss b/addons/web/static/src/scss/import_bootstrap.scss index d3d033a3575..36b83fa567f 100644 --- a/addons/web/static/src/scss/import_bootstrap.scss +++ b/addons/web/static/src/scss/import_bootstrap.scss @@ -35,9 +35,11 @@ @import "media"; @import "list-group"; @import "close"; +@import "toasts"; @import "modal"; @import "tooltip"; @import "popover"; @import "carousel"; +@import "spinners"; @import "utilities"; @import "print"; |