summaryrefslogtreecommitdiff
path: root/addons/web/static/src/scss
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2019-09-17 17:49:09 +0200
committerChristophe Simonis <chs@odoo.com>2019-09-17 17:49:09 +0200
commit080f8b1f96dec30fd9568a81342b5d20cc9d521a (patch)
tree14cecabb2c6502e73d93178bd322722e2e62f07d /addons/web/static/src/scss
parentc12bd7125a1c64339e02ae0563f667b8de931b3b (diff)
parentd8ce75466e4a6728cccfc7696a65a399e9cf23f1 (diff)
[MERGE] forward port branch saas-12.3 up to d8ce75466e4
Diffstat (limited to 'addons/web/static/src/scss')
-rw-r--r--addons/web/static/src/scss/banner.scss3
-rw-r--r--addons/web/static/src/scss/modal.scss5
2 files changed, 7 insertions, 1 deletions
diff --git a/addons/web/static/src/scss/banner.scss b/addons/web/static/src/scss/banner.scss
index d7237203897..be011d70698 100644
--- a/addons/web/static/src/scss/banner.scss
+++ b/addons/web/static/src/scss/banner.scss
@@ -1,8 +1,9 @@
.o_has_banner {
.o_view_nocontent {
top: 30%;
- @media screen and (max-height: map-get($grid-breakpoints, 'md')) {
+ @include media-breakpoint-down(sm) {
position: relative;
+ margin: auto;
}
}
}
diff --git a/addons/web/static/src/scss/modal.scss b/addons/web/static/src/scss/modal.scss
index 52c3100df31..5b190240235 100644
--- a/addons/web/static/src/scss/modal.scss
+++ b/addons/web/static/src/scss/modal.scss
@@ -92,6 +92,11 @@
}
}
+body.modal-open {
+ // Allow vertical scrolling in modals on iOS
+ -webkit-overflow-scrolling: touch;
+}
+
// Temporary fix for modals which are not instantiated thanks to the Dialog
// JS classes (deprecated case) (see bootstrap_overridden.scss) + Frontend.
//