diff options
| author | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:42:10 +0200 |
|---|---|---|
| committer | qsm-odoo <qsm@odoo.com> | 2018-07-27 12:42:10 +0200 |
| commit | 2b3017974bc7cd4b3a74f83c956224cfe4e5a918 (patch) | |
| tree | ff6aab8dc6bfa7afbe9ef714ca157ebc0185d2fd /addons/note/static/src | |
| parent | 8ed8b46f6434a2a3adea69e0134317e30bf9b936 (diff) | |
| parent | 519594e9cab9a6362ef7c3e911605e4507a0a008 (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/note/static/src')
| -rw-r--r-- | addons/note/static/src/js/systray_activity_menu.js | 6 | ||||
| -rw-r--r-- | addons/note/static/src/scss/note.scss | 12 | ||||
| -rw-r--r-- | addons/note/static/src/xml/systray.xml | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/addons/note/static/src/js/systray_activity_menu.js b/addons/note/static/src/js/systray_activity_menu.js index 8194cc17e6a..f65dfce244f 100644 --- a/addons/note/static/src/js/systray_activity_menu.js +++ b/addons/note/static/src/js/systray_activity_menu.js @@ -48,8 +48,8 @@ ActivityMenu.include({ if (noteDateTime) { params = _.extend(params, {'date_deadline': noteDateTime}); } - this.$('.o_note_show').removeClass('hidden'); - this.$('.o_note').addClass('hidden'); + this.$('.o_note_show').removeClass('d-none'); + this.$('.o_note').addClass('d-none'); this._rpc({ route: '/note/new', params: params, @@ -91,7 +91,7 @@ ActivityMenu.include({ } this.noteDateTimeWidget.appendTo(this.$('.o_note_datetime')); this.noteDateTimeWidget.$input.attr('placeholder', _t("Today")); - this.$('.o_note_show, .o_note').toggleClass('hidden'); + this.$('.o_note_show, .o_note').toggleClass('d-none'); this.$('.o_note_input').val('').focus(); }, /** diff --git a/addons/note/static/src/scss/note.scss b/addons/note/static/src/scss/note.scss index f1e90d80d57..a1d4227e182 100644 --- a/addons/note/static/src/scss/note.scss +++ b/addons/note/static/src/scss/note.scss @@ -8,7 +8,7 @@ margin-bottom: 0; } .oe_form_field.oe_memo { - margin: 0 ($padding-large-horizontal * -1); + margin: 0 ($input-btn-padding-x-lg * -1); padding: 0; min-height: 200px; @@ -18,8 +18,8 @@ } &.o_form_readonly { .oe_memo { - padding: $padding-large-horizontal; - border-bottom: 1px solid $legend-border-color; + padding: $input-btn-padding-x-lg; + border-bottom: 1px solid gray('900'); } } } @@ -30,13 +30,13 @@ .o_preview_info { .o_preview_title { .o_preview_name { - @include o-flex(1, 1, 100%); + flex: 1 1 100%; } } .o_note_input_box { - @include o-flex-display; + display: flex; p { - @include o-flex(1, 1, auto); + flex: 1 1 auto; } } .o_note_save { diff --git a/addons/note/static/src/xml/systray.xml b/addons/note/static/src/xml/systray.xml index d1676c63761..56693a14544 100644 --- a/addons/note/static/src/xml/systray.xml +++ b/addons/note/static/src/xml/systray.xml @@ -5,7 +5,7 @@ <div class="o_note_show"> <a role="button" class="btn btn-block text-center">Add new note</a> </div> - <div class="o_note o_mail_preview hidden"> + <div class="o_note o_mail_preview d-none"> <div class="o_mail_preview_image o_mail_preview_app"> <img src="/note/static/description/icon.png" alt="Channel"/> </div> |