diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css deleted file mode 100644 index 9ceec3be3b1..00000000000 --- a/addons/note/static/src/css/note.css +++ /dev/null @@ -1,12 +0,0 @@ -.o_kanban_group .note_text_line_through { - text-decoration: line-through; -} - -.openerp .oe_form .oe_pad.oe_memo { - width: auto; -} -.openerp .oe_form .oe_form_field.oe_memo { - margin: 0; - padding: 0px; - width: 100%; - min-height: 200px; } diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass deleted file mode 100644 index afc0d3c1467..00000000000 --- a/addons/note/static/src/css/note.sass +++ /dev/null @@ -1,26 +0,0 @@ -@charset "utf-8" - -@mixin rotate($a) - -webkit-transform: rotate($a) - -o-transform: rotate($a) - -moz-transform: rotate($a) - -@mixin transition($what:all,$duration:100ms) - -webkit-transition: $what $duration cubic-bezier(0.5,0,0.5,1) - -moz-transition: $what $duration cubic-bezier(0.5,0,0.5,1) - -ms-transition: $what $duration cubic-bezier(0.5,0,0.5,1) - transition: $what $duration cubic-bezier(0.5,0,0.5,1) - -.o_kanban_group - .note_text_line_through - text-decoration: line-through - -.openerp - .oe_form - .oe_pad.oe_memo - width: auto - .oe_form_field.oe_memo - margin: 0 - padding: 0px - width: 100% - min-height: 200px diff --git a/addons/note/static/src/less/note.less b/addons/note/static/src/less/note.less new file mode 100644 index 00000000000..99038b491c2 --- /dev/null +++ b/addons/note/static/src/less/note.less @@ -0,0 +1,16 @@ + +.o_kanban_group .note_text_line_through { + text-decoration: line-through; +} + +.openerp .oe_form { + .oe_pad.oe_memo { + width: auto; + } + .oe_form_field.oe_memo { + margin: 0; + padding: 0; + width: 100%; + min-height: 200px; + } +} diff --git a/addons/note/views/note_templates.xml b/addons/note/views/note_templates.xml index dcdc6e5cd95..3b6c3e1acc4 100644 --- a/addons/note/views/note_templates.xml +++ b/addons/note/views/note_templates.xml @@ -1,8 +1,8 @@ - + diff --git a/addons/payment/static/src/css/portal_payment.css b/addons/payment/static/src/css/portal_payment.css deleted file mode 100644 index eeb40dbd3a3..00000000000 --- a/addons/payment/static/src/css/portal_payment.css +++ /dev/null @@ -1,55 +0,0 @@ -input#cc_number { - background-repeat: no-repeat; - background-position: 14px 14px; } - -div.card_placeholder { - background-image: url("/website_payment/static/src/img/placeholder.png"); - background-repeat: no-repeat; - width: 32px; - height: 20px; - position: absolute; - top: 8px; - right: 20px; - -webkit-transition: 0.4s cubic-bezier(0.455, 0.03, 0.515, 0.955); - transition: 0.4s cubic-bezier(0.455, 0.03, 0.515, 0.955); - pointer-events: none; } - -/* if s2s form not in bootstrap_formatting */ -div.o_card_brand_detail { - position: relative; -} - -div.o_card_brand_detail div.card_placeholder { - right: 5px; -} - -div.amex { - background-image: url("/website_payment/static/src/img/amex.png"); - background-repeat: no-repeat; } - -div.diners { - background-image: url("/website_payment/static/src/img/diners.png"); - background-repeat: no-repeat; } - -div.discover { - background-image: url("/website_payment/static/src/img/discover.png"); - background-repeat: no-repeat; } - -div.jcb { - background-image: url("/website_payment/static/src/img/jcb.png"); - background-repeat: no-repeat; } - -div.mastercard { - background-image: url("/website_payment/static/src/img/mastercard.png"); - background-repeat: no-repeat; } - -div.visa { - background-image: url("/website_payment/static/src/img/visa.png"); - background-repeat: no-repeat; } - -/*# sourceMappingURL=website_payment.css.map */ - -ul.payment_method_list img.img-rounded { - max-width: 100px; - max-height: 40px; -} diff --git a/addons/payment/static/src/css/portal_payment.sass b/addons/payment/static/src/css/portal_payment.sass deleted file mode 100644 index e7de8c55cd5..00000000000 --- a/addons/payment/static/src/css/portal_payment.sass +++ /dev/null @@ -1,41 +0,0 @@ -@charset "utf-8" - -input#cc_number - background-repeat: no-repeat - background-position: 14px 14px - -div.card_placeholder - background-image: url('/website_payment/static/src/img/placeholder.png') - background-repeat: no-repeat - width: 32px - height: 20px - position: absolute - top: 8px - right: 20px - -webkit-transition: .4s cubic-bezier(0.455,0.03,0.515,0.955) - transition: .4s cubic-bezier(0.455,0.03,0.515,0.955) - pointer-events: none - -div.amex - background-image: url('/website_payment/static/src/img/amex.png') - background-repeat: no-repeat - -div.diners - background-image: url('/website_payment/static/src/img/diners.png') - background-repeat: no-repeat - -div.discover - background-image: url('/website_payment/static/src/img/discover.png') - background-repeat: no-repeat - -div.jcb - background-image: url('/website_payment/static/src/img/jcb.png') - background-repeat: no-repeat - -div.mastercard - background-image: url('/website_payment/static/src/img/mastercard.png') - background-repeat: no-repeat - -div.visa - background-image: url('/website_payment/static/src/img/visa.png') - background-repeat: no-repeat diff --git a/addons/payment/static/src/less/portal_payment.less b/addons/payment/static/src/less/portal_payment.less new file mode 100644 index 00000000000..07cdf859c3a --- /dev/null +++ b/addons/payment/static/src/less/portal_payment.less @@ -0,0 +1,61 @@ +input#cc_number { + background-repeat: no-repeat; + background-position: 14px 14px; +} + +div.card_placeholder { + background-image: url("/website_payment/static/src/img/placeholder.png"); + background-repeat: no-repeat; + width: 32px; + height: 20px; + position: absolute; + top: 8px; + right: 20px; + -webkit-transition: 0.4s cubic-bezier(0.455,0.03,0.515,0.955); + transition: 0.4s cubic-bezier(0.455,0.03,0.515,0.955); + pointer-events: none; +} + +/* if s2s form not in bootstrap_formatting */ +div.o_card_brand_detail { + position: relative; + + div.card_placeholder { + right: 5px; + } +} + +div.amex { + background-image: url("/website_payment/static/src/img/amex.png"); + background-repeat: no-repeat; +} + +div.diners { + background-image: url("/website_payment/static/src/img/diners.png"); + background-repeat: no-repeat; +} + +div.discover { + background-image: url("/website_payment/static/src/img/discover.png"); + background-repeat: no-repeat; +} + +div.jcb { + background-image: url("/website_payment/static/src/img/jcb.png"); + background-repeat: no-repeat; +} + +div.mastercard { + background-image: url("/website_payment/static/src/img/mastercard.png"); + background-repeat: no-repeat; +} + +div.visa { + background-image: url("/website_payment/static/src/img/visa.png"); + background-repeat: no-repeat; +} + +ul.payment_method_list img.img-rounded { + max-width: 100px; + max-height: 40px; +} diff --git a/addons/payment/views/assets.xml b/addons/payment/views/assets.xml index c5639ba06d2..42e965196f2 100644 --- a/addons/payment/views/assets.xml +++ b/addons/payment/views/assets.xml @@ -1,13 +1,15 @@ - -