[MERGE] forward port branch 10.0 up to fb77309

This commit is contained in:
Christophe Simonis
2016-11-17 18:13:45 +01:00
2 changed files with 0 additions and 20 deletions
-5
View File
@@ -61,11 +61,6 @@ tour.register('project_tour', {
run: function (actions) {
actions.auto(".o_kanban_record .oe_kanban_action[data-type=edit]");
},
}, {
trigger: ".o_form_button_edit",
extra_trigger: '.o_form_project_tasks',
content: _t('Click on this button to modify the task.'),
position: "bottom"
}, {
trigger: ".o_form_field.o_task_user_field",
extra_trigger: '.o_form_project_tasks.o_form_editable',
@@ -406,21 +406,6 @@ div.carousel {
.s_parallax {
min-height: 200px;
> .oe_structure {
display: inline-block;
width: 100%;
vertical-align: middle;
}
&::before {
content: "";
display: inline-block;
width: 0;
min-height: inherit;
height: 100%;
vertical-align: middle;
}
}
.s_big_message { // TO REMOVE IN MASTER > 10.0