diff options
| author | Paramjit Singh Sahota <psa@openerp.com> | 2015-05-19 17:09:12 +0200 |
|---|---|---|
| committer | Jérome Maes <jem@openerp.com> | 2015-05-20 17:56:37 +0200 |
| commit | 68dbacac1eec7b8196ffc108f533667c31b08cbb (patch) | |
| tree | 019b8d033322483b0c87b8b492c33f4abf4ccc69 /addons/website/static/src | |
| parent | 3daebb6ccaecf3ad2cac306b6ef05843dbbf99e7 (diff) | |
[IMP] event, event_sale, website_event, website_event_sale : clear registration badge handeling
Now,
- event contains the HTML badge fields and the report (and report templates) to print badges
- event_sale add the ticket type on badges
- website_event allow the edition of badge throught website editor.
When the editor will be available in backend, event will be allow to edit badge report, so the action should be moved from website_Event to event module.
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/css/website.css | 3 | ||||
| -rw-r--r-- | addons/website/static/src/css/website.sass | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index 3c892b60562..a7d05da9eed 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -994,5 +994,8 @@ div.carousel .item.text_only .container > .carousel-image { #oe_main_menu_navbar .navbar-nav.navbar-right:last-child { margin-right: 0 !important; } +.container nav#oe_main_menu_navbar { + position: inherit; +} /*# sourceMappingURL=website.css.map */ diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index cf52f51fd9d..022b07066ad 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -791,3 +791,7 @@ div.carousel font-size: 13px .navbar-nav.navbar-right:last-child margin-right: 0 !important + +.container + nav#oe_main_menu_navbar + position: inherit |