diff options
| author | Adrien Dieudonne <adr@odoo.com> | 2018-07-31 08:48:33 +0200 |
|---|---|---|
| committer | Adrien Dieudonne <adr@odoo.com> | 2018-08-02 08:14:10 +0200 |
| commit | d91ec258e6a31153beb9eb16cfe8f916546b7688 (patch) | |
| tree | 89ad9be4abd6b4c3327ee0ca505a557eec8b88be /addons/web/static/src | |
| parent | 8d9366197e174d33fdf6962364a24ea40a1131b1 (diff) | |
Revert "[IMP] web: use burger menu for tablet in vertical mode"
This reverts commit 4e5f826ce53b9e4cb73eea77935ea82e81ac66b9
for two reasons:
1) A lot of people are working with splitted desktop screen and
will see the view switcher/search as on mobile: it's not efficient.
Only the burger menu should have been visible for the tablets,
not the other mobile features.
2) When you switch between vertical mode and H mode, we don't want
to change the mobile mode because widgets aren't reinstantiated and
some features don't work.
For example, the burger menu is broken if you switch from H mode to
V mode.
Task-1869468
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/services/config.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/scss/dropdown.scss | 2 | ||||
| -rw-r--r-- | addons/web/static/src/scss/navbar.scss | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/addons/web/static/src/js/services/config.js b/addons/web/static/src/js/services/config.js index d05a263ef4e..0ca1c912b27 100644 --- a/addons/web/static/src/js/services/config.js +++ b/addons/web/static/src/js/services/config.js @@ -83,7 +83,7 @@ function _updateSizeProps() { var sc = _getSizeClass(); if (sc !== config.device.size_class) { config.device.size_class = sc; - config.device.isMobile = config.device.size_class <= config.device.SIZES.SM; + config.device.isMobile = config.device.size_class <= config.device.SIZES.XS; } } diff --git a/addons/web/static/src/scss/dropdown.scss b/addons/web/static/src/scss/dropdown.scss index 7db8b2fcb3c..fbd3a98e4b5 100644 --- a/addons/web/static/src/scss/dropdown.scss +++ b/addons/web/static/src/scss/dropdown.scss @@ -66,7 +66,7 @@ @extend %dropdown-li-a-padding; color: $o-main-text-color; - @media (max-width: $screen-sm-max) { + @media (max-width: $screen-xs-max) { color: white; text-decoration: underline; } diff --git a/addons/web/static/src/scss/navbar.scss b/addons/web/static/src/scss/navbar.scss index 79b89c7ba2d..0c3d46945c9 100644 --- a/addons/web/static/src/scss/navbar.scss +++ b/addons/web/static/src/scss/navbar.scss @@ -38,7 +38,7 @@ font-weight: 500; line-height: $o-navbar-height; - @media (max-width: $screen-sm-max) { + @media (max-width: $screen-xs-max) { float: none; margin: 0; border-bottom: 1px solid $o-navbar-inverse-link-hover-bg; @@ -148,7 +148,7 @@ } } - @media (max-width: $screen-sm-max) { + @media (max-width: $screen-xs-max) { @include o-transition(height, 200ms, linear); position: relative; @@ -208,7 +208,7 @@ } } -@media (max-width: $screen-sm-max) { +@media (max-width: $screen-xs-max) { body.o_mobile_menu_opened { overflow: hidden; height: 100%; @@ -221,7 +221,7 @@ } } -@media (max-width: $screen-sm-max) { +@media (max-width: $screen-xs-max) { .o_switch_company_menu > .dropdown-menu { padding-top: 0px; li.bg-info { |