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/scss/note.scss | |
| 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/scss/note.scss')
| -rw-r--r-- | addons/note/static/src/scss/note.scss | 12 |
1 files changed, 6 insertions, 6 deletions
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 { |