Merge remote-tracking branch 'origin/16.0' into 16.0

This commit is contained in:
ivan deng
2023-05-26 16:48:23 +08:00

View File

@@ -19,10 +19,14 @@
} }
// navbar在下方的特殊处理 // navbar在下方的特殊处理
.o_web_client.navbar_pos_bottom { .o_web_client.navbar_pos_bottom {
--o-navbar-height: 60px;
.o_navbar { .o_navbar {
display: block; display: block;
.o_main_navbar { .o_main_navbar {
--o-navbar-height: 40px; --o-navbar-height: 60px;
button.o_mobile_menu_toggle, .o_menu_systray .o_debug_manager .dropdown-toggle {
font-size: 1.5em;
}
} }
} }
//message //message
@@ -44,14 +48,23 @@
.o_home_menu { .o_home_menu {
.container, .o_container_small, .container-fluid, .container-xxl, .container-xl, .container-lg, .container-md, .container-sm { .container, .o_container_small, .container-fluid, .container-xxl, .container-xl, .container-lg, .container-md, .container-sm {
position: absolute; position: absolute;
//bottom: var(--o-navbar-height); bottom: var(--o-navbar-height);
bottom: 40px; //bottom: 60px;
} }
} }
//userMenu //userMenu
.o_burger_menu { .o_burger_menu {
//height: 95%; width: 80%;
.o_burger_menu_topbar {
min-height: var(--o-navbar-height);
}
&.flex-column {
flex-direction: column-reverse!important;
}
.oi:before, .fa:before, .dropdown-toggle {
font-size: 1.5em;
}
} }
// toggle处理 // toggle处理