From 5c2f53be9b1bd5f2a967635d6845e316fef25e1e Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 3 Mar 2020 19:55:26 +0100 Subject: [PATCH] wip #3448 @0.5 --- src/public/bunchmultiple/bunchmultiple.css | 6 ++++++ src/public/bunchmultiple/bunchmultiple.css.map | 2 +- src/public/bunchmultiple/bunchmultiple.js | 4 ++++ src/public/bunchmultiple/bunchmultiple.less | 11 ++++++++++- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/public/bunchmultiple/bunchmultiple.css b/src/public/bunchmultiple/bunchmultiple.css index 098e5d2..6cc26c8 100644 --- a/src/public/bunchmultiple/bunchmultiple.css +++ b/src/public/bunchmultiple/bunchmultiple.css @@ -8,6 +8,12 @@ background: #fafafa; margin-bottom: 15px; } +.bunchmultiple .bunchmultiple__wrapper.noborder { + padding: 0; + border: 0; + background: none; + margin-bottom: 0; +} .bunchmultiple .bunchmultiple__wrapper > .form-group { padding: 0; } diff --git a/src/public/bunchmultiple/bunchmultiple.css.map b/src/public/bunchmultiple/bunchmultiple.css.map index 8d72713..2bba899 100644 --- a/src/public/bunchmultiple/bunchmultiple.css.map +++ b/src/public/bunchmultiple/bunchmultiple.css.map @@ -1 +1 @@ -{"version":3,"sources":["bunchmultiple.less"],"names":[],"mappings":"AAAA;EACI,WAAA;EACA,cAAA;;AAFJ,cAGI;EACI,aAAA;EACA,sBAAA;EACA,mBAAA;EACA,mBAAA;;AAPR,cAGI,wBAMI;EACI,UAAA;;AAVZ,cAGI,wBAMI,cAGI;EACI,gBAAA;EACA,mBAAA;;AAdhB,cAGI,wBAeI;EACI,mBAAA;;AAEA,cAlBR,wBAeI,MAGK;EACG,uBAAA;EACA,sBAAA;;AAFJ,cAlBR,wBAeI,MAGK,MAIG;EACI,UAAA;;AALR,cAlBR,wBAeI,MAGK,MAQG;EACI,UAAA;;AA9BpB,cAGI,wBAeI,MAgBI;EACI,yBAAA;EACA,iBAAA;EACA,gBAAA;EACA,kBAAA;;AAtChB,cAGI,wBAeI,MAgBI,QAMI,EAAC;EACG,WAAA;EACA,gBAAA;;AAEA,cAzChB,wBAeI,MAgBI,QAMI,EAAC,OAII;EACG,mBAAA;;AAGJ,cA7ChB,wBAeI,MAgBI,QAMI,EAAC,OAQI;EACG,kBAAA;EACA,WAAA;;AAlDxB,cAGI,wBAeI,MAqCI;EACI,gBAAA;EACA,iEAAA;EACA,yBAAA;EACA,eAAA;;AAGJ,cA3DR,wBAeI,MA4CK;EACG,aAAA;;AAGJ,cA/DR,wBAeI,MAgDK,UACG;EACI,oBAAA;EACA,UAAA","file":"bunchmultiple.css"} \ No newline at end of file +{"version":3,"sources":["bunchmultiple.less"],"names":[],"mappings":"AAAA;EACI,WAAA;EACA,cAAA;;AAFJ,cAII;EACI,aAAA;EACA,sBAAA;EACA,mBAAA;EACA,mBAAA;;AAEA,cANJ,wBAMK;EACG,UAAA;EACA,SAAA;EACA,gBAAA;EACA,gBAAA;;AAdZ,cAII,wBAcI;EACI,UAAA;;AAnBZ,cAII,wBAcI,cAGI;EACI,gBAAA;EACA,mBAAA;;AAvBhB,cAII,wBAuBI;EACI,mBAAA;;AAEA,cA1BR,wBAuBI,MAGK;EACG,uBAAA;EACA,sBAAA;;AAFJ,cA1BR,wBAuBI,MAGK,MAIG;EACI,UAAA;;AALR,cA1BR,wBAuBI,MAGK,MAQG;EACI,UAAA;;AAvCpB,cAII,wBAuBI,MAgBI;EACI,yBAAA;EACA,iBAAA;EACA,gBAAA;EACA,kBAAA;;AA/ChB,cAII,wBAuBI,MAgBI,QAMI,EAAC;EACG,WAAA;EACA,gBAAA;;AAEA,cAjDhB,wBAuBI,MAgBI,QAMI,EAAC,OAII;EACG,mBAAA;;AAGJ,cArDhB,wBAuBI,MAgBI,QAMI,EAAC,OAQI;EACG,kBAAA;EACA,WAAA;;AA3DxB,cAII,wBAuBI,MAqCI;EACI,gBAAA;EACA,iEAAA;EACA,yBAAA;EACA,eAAA;;AAGJ,cAnER,wBAuBI,MA4CK;EACG,aAAA;;AAGJ,cAvER,wBAuBI,MAgDK,UACG;EACI,oBAAA;EACA,UAAA","file":"bunchmultiple.css"} \ No newline at end of file diff --git a/src/public/bunchmultiple/bunchmultiple.js b/src/public/bunchmultiple/bunchmultiple.js index 20f69df..1d7554b 100644 --- a/src/public/bunchmultiple/bunchmultiple.js +++ b/src/public/bunchmultiple/bunchmultiple.js @@ -62,6 +62,10 @@ $this.updateLegends(); return true; }); + + if ($(this.element).parent().closest('.bunchmultiple').length === 0) { + $(this.element).find('.bunchmultiple__wrapper').addClass('noborder'); + } }, update: function () { diff --git a/src/public/bunchmultiple/bunchmultiple.less b/src/public/bunchmultiple/bunchmultiple.less index 1184098..4fb4a24 100644 --- a/src/public/bunchmultiple/bunchmultiple.less +++ b/src/public/bunchmultiple/bunchmultiple.less @@ -1,12 +1,21 @@ .bunchmultiple { width: 100%; margin: 0 15px; + .bunchmultiple__wrapper { padding: 15px; border: 1px solid #eee; background: #fafafa; margin-bottom: 15px; + &.noborder { + padding: 0; + border: 0; + background: none; + margin-bottom: 0; + } + + > .form-group { padding: 0; @@ -21,7 +30,7 @@ &.ghost { border: 1px dashed #ccc; - background-color:#fff; + background-color: #fff; .legend { opacity: 0; -- 2.39.5