diff options
4 files changed, 16 insertions, 4 deletions
diff --git a/addons/web/static/lib/jSignature/jSignatureCustom.js b/addons/web/static/lib/jSignature/jSignatureCustom.js index 6ccd2af79a3..eb053a7bcfc 100644 --- a/addons/web/static/lib/jSignature/jSignatureCustom.js +++ b/addons/web/static/lib/jSignature/jSignatureCustom.js @@ -736,6 +736,7 @@ function jSignatureClass(parent, options, instanceExtensions) { ,'color' : '#000' ,'background-color': '#fff' ,'decor-color': '#eee' + ,'show-stroke': true ,'lineWidth' : 0 ,'minFatFingerCompensation' : -10 ,'showUndoButton': false @@ -977,7 +978,7 @@ jSignatureClass.prototype.resetCanvas = function(data, dontClear){ ctx.lineCap = ctx.lineJoin = "round"; // signature line - if (null != settings['decor-color']) { + if (null != settings['decor-color'] && settings['show-stroke']) { ctx.strokeStyle = settings['decor-color']; ctx.shadowOffsetX = 0; ctx.shadowOffsetY = 0; diff --git a/addons/web/static/src/js/widgets/name_and_signature.js b/addons/web/static/src/js/widgets/name_and_signature.js index 5a20ea4fa22..9d2ae3bff8c 100644 --- a/addons/web/static/src/js/widgets/name_and_signature.js +++ b/addons/web/static/src/js/widgets/name_and_signature.js @@ -250,7 +250,8 @@ var NameAndSignature = Widget.extend({ .empty() .jSignature({ 'decor-color': '#D1D0CE', - 'background-color': '#FFF', + 'background-color': 'rgba(255,255,255,0)', + 'show-stroke': false, 'color': this.fontColor, 'lineWidth': 2, 'width': width, diff --git a/addons/web/static/src/scss/name_and_signature.scss b/addons/web/static/src/scss/name_and_signature.scss index 439e9e0bcb1..63296bf0855 100644 --- a/addons/web/static/src/scss/name_and_signature.scss +++ b/addons/web/static/src/scss/name_and_signature.scss @@ -47,3 +47,11 @@ cursor: pointer; } } + +.o_signature_stroke { + position: absolute; + border-top: #D1D0CE solid 2px; + bottom: 16%; + width: 72%; + left: 14%; +} diff --git a/addons/web/static/src/xml/name_and_signature.xml b/addons/web/static/src/xml/name_and_signature.xml index ff891e04a39..aecffdfa295 100644 --- a/addons/web/static/src/xml/name_and_signature.xml +++ b/addons/web/static/src/xml/name_and_signature.xml @@ -49,7 +49,7 @@ border, but we remove the padding from the body, so the canvas will overflow on the corners without this rule. --> - <div class="o_web_sign_signature_group card mt-3" style="overflow: hidden;"> + <div class="o_web_sign_signature_group bg-white card mt-3" style="overflow: hidden;"> <div class="card-header"> <div class="row no-gutters"> <div class="col-auto"> @@ -83,7 +83,9 @@ </div> </div> - <div class="o_web_sign_signature card-body p-0"/> + <div class="o_signature_stroke position-absolute"/> + + <div class="o_web_sign_signature p-0 bg-transparent position-relative"/> <div t-attf-class="o_web_sign_load_invalid card-footer d-none"> <div class="alert alert-danger mb-0" role="alert"> |