diff options
| author | Aaron Bohy <aab@odoo.com> | 2016-04-21 13:58:22 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2016-04-21 15:21:42 +0200 |
| commit | 6768bbfcc02e0f498110cda2ba9adbc2fd23d24c (patch) | |
| tree | 7dccb1019434582874b285276189b1b3dcbb96a9 /addons/web_planner/static/src/less/web_planner_common.less | |
| parent | e1bfd3fbda97ac7a64a585b07be161d5be606cf9 (diff) | |
| parent | 8e440b173e3b273b3aac541f2ec12527f67dfa60 (diff) | |
[MERGE] *: stop duplicating web
Avoid duplicating web addon in enterprise by extracting a common basis.
Enterprise features stay in enterprise, but use that common basis.
In web, mainly:
- JS refactoring and linting
- Conversion of .sass into .less split into multiple files
- Templates cleaning and DOM simplification
- Re-generation of web.pot, and update of .po files
Minor tweaks in some other addons to make them work with this new structure.
Diffstat (limited to 'addons/web_planner/static/src/less/web_planner_common.less')
| -rw-r--r-- | addons/web_planner/static/src/less/web_planner_common.less | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/addons/web_planner/static/src/less/web_planner_common.less b/addons/web_planner/static/src/less/web_planner_common.less index abc3d3122f3..99f6cc9a70e 100644 --- a/addons/web_planner/static/src/less/web_planner_common.less +++ b/addons/web_planner/static/src/less/web_planner_common.less @@ -28,16 +28,17 @@ } /**************** MENU PROGRESS BAR ****************/ +@planner-height: 13px; +@planner-margin: floor((@odoo-navbar-height - 2 - @planner-height)/2); .o_planner_systray { > .progress { display: none; width: 70px; - height: 13px; + height: @planner-height; cursor: pointer; - // enterprise - margin-top: 16px; - margin-bottom: -16px; + margin-top: @planner-margin; + margin-bottom: -@planner-margin; margin-right: 10px; margin-left: 10px; @@ -47,16 +48,6 @@ } } -// community -#oe_main_menu_navbar:not(.o_main_navbar) { - .o_planner_systray { - > .progress { - margin-top: 10px; - margin-bottom: -10px; - } - } -} - #PlannerDialog { font-family: "Lato", serif; z-index: 1051; |