From 9b36142ada2e31b9232b006cbc067a08a7134b72 Mon Sep 17 00:00:00 2001 From: Dennis Sluijk Date: Thu, 19 Jul 2018 09:19:12 +0200 Subject: [PATCH 1/3] [FIX] Remove cloning navbar [FIX] Remove cloning navbar --- website_theme_flexible/__manifest__.py | 2 +- .../static/src/js/website_theme_flexible.frontend.js | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/website_theme_flexible/__manifest__.py b/website_theme_flexible/__manifest__.py index 68e19b7..3490bcf 100644 --- a/website_theme_flexible/__manifest__.py +++ b/website_theme_flexible/__manifest__.py @@ -5,7 +5,7 @@ 'name': 'Theme Flexible', 'summary': 'Theme Flexible is exceptionally configurable.', 'category': 'Theme', - 'version': '11.0.1.0.0', + 'version': '11.0.1.0.1', 'author': 'Onestein, Odoo Community Association (OCA)', 'license': 'AGPL-3', 'website': 'https://github.com/OCA/website', diff --git a/website_theme_flexible/static/src/js/website_theme_flexible.frontend.js b/website_theme_flexible/static/src/js/website_theme_flexible.frontend.js index 5e69f52..1038def 100644 --- a/website_theme_flexible/static/src/js/website_theme_flexible.frontend.js +++ b/website_theme_flexible/static/src/js/website_theme_flexible.frontend.js @@ -7,13 +7,11 @@ odoo.define('website_theme_flexible.frontend', function(require) { var base = require('web_editor.base'); base.ready().then(function () { - var header = $('header'); var navbar = $('header > .navbar'); if (navbar.attr('data-do-stick') === '1') { - var navbar_clone = navbar.clone(); - navbar_clone.addClass('navbar-fixed-top'); - header.append(navbar_clone); + //TODO: Add nice animation + navbar.addClass('navbar-fixed-top'); } }); }); From babd60b2e3c7ee3464cfe7892a8cc68a8470fe85 Mon Sep 17 00:00:00 2001 From: Dennis Sluijk Date: Fri, 20 Jul 2018 11:20:55 +0200 Subject: [PATCH 2/3] [FIX] Change python version (travis) --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3cf4f56..0f0911e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ cache: - $HOME/.cache/pip python: - - "2.7" + - "3.5" addons: apt: From 9b84b2eb6232a91d23113427c79a6fcbb32294fb Mon Sep 17 00:00:00 2001 From: Dennis Sluijk Date: Fri, 20 Jul 2018 12:06:38 +0200 Subject: [PATCH 3/3] [FIX] Travis --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0f0911e..99a5815 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,8 +31,6 @@ env: - TESTS="1" ODOO_REPO="odoo/odoo" - TESTS="1" ODOO_REPO="OCA/OCB" -virtualenv: - system_site_packages: true install: - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools