Skip to content

[11.0][FIX] Remove cloning navbar #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedrobaeza merged 3 commits into from
Jul 20, 2018
Merged

[11.0][FIX] Remove cloning navbar #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b36142
[FIX] Remove cloning navbar
tarteo Jul 19, 2018
babd60b
[FIX] Change python version (travis)
tarteo Jul 20, 2018
9b84b2e
[FIX] Travis
tarteo Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cache:
- $HOME/.cache/pip

python:
- "2.7"
- "3.5"

addons:
apt:
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion website_theme_flexible/__manifest__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
6 changes: 2 additions & 4 deletions website_theme_flexible/static/src/js/website_theme_flexible.frontend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
});
});