diff --git a/backend_theme_infinito/__manifest__.py b/backend_theme_infinito/__manifest__.py index 162342dc9..fe437ded7 100644 --- a/backend_theme_infinito/__manifest__.py +++ b/backend_theme_infinito/__manifest__.py @@ -52,7 +52,6 @@ '/backend_theme_infinito/static/src/xml/style_add.xml', '/backend_theme_infinito/static/src/xml/sidebar.xml', '/backend_theme_infinito/static/src/xml/MenuBookmark.xml', - 'https://fonts.googleapis.com/css2?family=Poppins:wght@100;200;300;400;500;600;700;800;900&display=swap', '/backend_theme_infinito/static/src/css/style.css', '/backend_theme_infinito/static/src/css/loaders.css', diff --git a/backend_theme_infinito/static/src/css/style.css b/backend_theme_infinito/static/src/css/style.css index 55f88033e..2482266b8 100644 --- a/backend_theme_infinito/static/src/css/style.css +++ b/backend_theme_infinito/static/src/css/style.css @@ -49,7 +49,10 @@ outline: none; box-shadow: none; } - +.collapse:not(.show) { + display: flex !important; + flex-wrap:wrap !important; +} .theme_editor * { list-style-type: none; font-family: "Poppins", sans-serif; diff --git a/backend_theme_infinito/static/src/js/navbar.js b/backend_theme_infinito/static/src/js/navbar.js index c8bde5341..14202de93 100644 --- a/backend_theme_infinito/static/src/js/navbar.js +++ b/backend_theme_infinito/static/src/js/navbar.js @@ -345,6 +345,10 @@ patch(ControlPanel.prototype, 'backend_theme_infinito/static/src/js/navbar.Contr get bookmarkOn() { return session.infinitoBookmark; + }, + set bookmarkOn(value) { + session.bookmarkOn=value; + console.log("setting bookmark",value); } }); diff --git a/backend_theme_infinito/static/src/js/recentApps.js b/backend_theme_infinito/static/src/js/recentApps.js index edd9ad67e..c1ab0c606 100644 --- a/backend_theme_infinito/static/src/js/recentApps.js +++ b/backend_theme_infinito/static/src/js/recentApps.js @@ -2,6 +2,7 @@ import ajax from 'web.ajax'; const { useRef, onWillStart, xml ,onMounted} = owl; import session from 'web.session'; + export default class InfinitoRecentApps extends owl.Component { setup(){ super.setup(); @@ -20,6 +21,7 @@ export default class InfinitoRecentApps extends owl.Component { this.dragElement(this.__owl__.refs.recentApps, 'x'); } } + InfinitoRecentApps.template = xml`
diff --git a/backend_theme_infinito/static/src/scss/sidebar.scss b/backend_theme_infinito/static/src/scss/sidebar.scss index 5731ed23f..3e81bf511 100644 --- a/backend_theme_infinito/static/src/scss/sidebar.scss +++ b/backend_theme_infinito/static/src/scss/sidebar.scss @@ -260,6 +260,8 @@ nav.o_main_navbar.small_nav { } .o_main_navbar .o_menu_systray{ margin-right: 20px !important; + display: flex !important; + flex-wrap: wrap; } .o_main_navbar .o_MessagingMenu, .o_main_navbar .o_mail_systray_item{ diff --git a/backend_theme_infinito/static/src/scss/views.scss b/backend_theme_infinito/static/src/scss/views.scss index c7fd8a6ac..c1d8e77a3 100644 --- a/backend_theme_infinito/static/src/scss/views.scss +++ b/backend_theme_infinito/static/src/scss/views.scss @@ -13,7 +13,17 @@ } } } - +.o_enable_searchview.btn.btn-link.oi.oi-search{ + color: #6c757d !important; + display: flex !important; + flex-wrap: wrap !important; + margin-left: 100px !important; + margin-top: -30.4px !important; +} +.oi.oi-panel-right{ + height: 15px; + color: var(--button-bg) !important; +} .o_kanban_view { .oe_kanban_card, .o_kanban_record { @for $tr from 1 through 80 { diff --git a/backend_theme_infinito/static/src/xml/sidebar.xml b/backend_theme_infinito/static/src/xml/sidebar.xml index f1fe2e16f..fb1688580 100644 --- a/backend_theme_infinito/static/src/xml/sidebar.xml +++ b/backend_theme_infinito/static/src/xml/sidebar.xml @@ -82,7 +82,7 @@ class="nav-link"> - @@ -160,6 +160,7 @@ t-att-data-menu-xmlid="app.xmlID" t-att-data-action-id="app.actionID">
+