summaryrefslogtreecommitdiff
path: root/addons/project/static/src
diff options
context:
space:
mode:
authorqsm-odoo <qsm@odoo.com>2018-07-27 12:42:10 +0200
committerqsm-odoo <qsm@odoo.com>2018-07-27 12:42:10 +0200
commit2b3017974bc7cd4b3a74f83c956224cfe4e5a918 (patch)
treeff6aab8dc6bfa7afbe9ef714ca157ebc0185d2fd /addons/project/static/src
parent8ed8b46f6434a2a3adea69e0134317e30bf9b936 (diff)
parent519594e9cab9a6362ef7c3e911605e4507a0a008 (diff)
[MERGE] *: migrate Bootstrap 3.3.7 to 4.1.3
See sub-commits for details. task-49280 Closes https://github.com/odoo/odoo/pull/25045
Diffstat (limited to 'addons/project/static/src')
-rw-r--r--addons/project/static/src/css/project.css2
-rw-r--r--addons/project/static/src/js/project.js4
-rw-r--r--addons/project/static/src/js/tour.js2
-rw-r--r--addons/project/static/src/scss/project_dashboard.scss6
-rw-r--r--addons/project/static/src/xml/project.xml2
5 files changed, 8 insertions, 8 deletions
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css
index c6e6d31c5ec..9522588f358 100644
--- a/addons/project/static/src/css/project.css
+++ b/addons/project/static/src/css/project.css
@@ -28,7 +28,7 @@
.openerp .oe_margin_top_8 {
margin-top: 8px;
}
-.openerp .oe_kanban_project .oe_kanban_project_list .col-md-6 a{
+.openerp .oe_kanban_project .oe_kanban_project_list .col-lg-6 a{
margin-left: 5px;
}
diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js
index d372dff8486..c6c58e44531 100644
--- a/addons/project/static/src/js/project.js
+++ b/addons/project/static/src/js/project.js
@@ -62,7 +62,7 @@ KanbanRecord.include({
var $imgs = $content.find('.o_kanban_task_cover_image');
var dialog = new Dialog(self, {
title: _t("Set a Cover Image"),
- buttons: [{text: _t("Select"), classes: attachment_ids.length ? 'btn-primary' : 'hidden', close: true, disabled: !coverID, click: function () {
+ buttons: [{text: _t("Select"), classes: attachment_ids.length ? 'btn-primary' : 'd-none', close: true, disabled: !coverID, click: function () {
var $img = $imgs.filter('.o_selected').find('img');
var data = {
id: $img.data('id'),
@@ -71,7 +71,7 @@ KanbanRecord.include({
self._updateRecord({displayed_image_id: data});
}}, {text: _t('Upload and Set'), classes: attachment_ids.length ? '' : 'btn-primary', close: false, click: function () {
$content.find('input.o_input_file').click();
- }}, {text: _t("Remove Cover Image"), classes: coverID ? '' : 'hidden', close: true, click: function () {
+ }}, {text: _t("Remove Cover Image"), classes: coverID ? '' : 'd-none', close: true, click: function () {
self._updateRecord({displayed_image_id: false});
}}, {text: _t("Discard"), close: true}],
$content: $content,
diff --git a/addons/project/static/src/js/tour.js b/addons/project/static/src/js/tour.js
index 258c30e11b7..48d5a68cfe8 100644
--- a/addons/project/static/src/js/tour.js
+++ b/addons/project/static/src/js/tour.js
@@ -96,7 +96,7 @@ tour.register('project_tour', {
content: _t('<b>Click the save button</b> to apply your changes to the task.'),
position: "bottom"
}, {
- trigger: ".breadcrumb li:not(.active):last",
+ trigger: ".breadcrumb-item:not(.active):last",
extra_trigger: '.o_form_project_tasks.o_form_readonly',
content: _t("Use the breadcrumbs to <b>go back to your tasks pipeline</b>."),
position: "right"
diff --git a/addons/project/static/src/scss/project_dashboard.scss b/addons/project/static/src/scss/project_dashboard.scss
index 919da241023..edc1faca887 100644
--- a/addons/project/static/src/scss/project_dashboard.scss
+++ b/addons/project/static/src/scss/project_dashboard.scss
@@ -1,7 +1,7 @@
.o_kanban_view.o_kanban_dashboard.o_project_kanban {
.o_project_kanban_boxes {
- @include o-flex-display;
- @include o-flex-flow(row, nowrap);
+ display: flex;
+ flex-flow: row nowrap;
.o_project_kanban_box {
position: relative;
@@ -66,7 +66,7 @@
outline: 2px solid transparent;
box-shadow: 0px 0px 1px 1px #ccc;
&.o_selected {
- outline-color: $o-brand-optional;
+ outline-color: $o-brand-primary;
}
> img {
@include o-position-absolute($top: 0, $left: 0, $right: 0, $bottom: 0);
diff --git a/addons/project/static/src/xml/project.xml b/addons/project/static/src/xml/project.xml
index 99949bf1861..ea69825c5a7 100644
--- a/addons/project/static/src/xml/project.xml
+++ b/addons/project/static/src/xml/project.xml
@@ -9,7 +9,7 @@
</t>
</div>
<div t-if="attachment_ids.length == 0">There is no available image to be set as cover.</div>
- <span class="hide">
+ <span class="d-none">
<t t-call="HiddenInputFile">
<t t-set="fileupload_id" t-value="widget.imageUploadID" />
<t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t>