Merge branch 'master' into solid-resource
This commit is contained in:
commit
a0cf815a4d
@ -37,7 +37,7 @@ if componentSet.has("events") || componentSet.has("polls") || componentSet.has("
|
|||||||
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.10" defer)
|
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-conversation@0.10" defer)
|
||||||
|
|
||||||
if componentSet.has("invoices")
|
if componentSet.has("invoices")
|
||||||
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-invoicing@1.2" defer)
|
script(type="module" src="https://cdn.skypack.dev/@startinblox/component-invoicing@1.3" defer)
|
||||||
//- script(type="module" src="/lib/solid-invoicing/solid-invoicing.js" defer)
|
//- script(type="module" src="/lib/solid-invoicing/solid-invoicing.js" defer)
|
||||||
|
|
||||||
if componentSet.has("jobBoard")
|
if componentSet.has("jobBoard")
|
||||||
|
@ -15,5 +15,6 @@ div.segment.full.padding-large.sm-padding-top-small.sm-padding-right-xsmall.sm-p
|
|||||||
solid-invoicing(
|
solid-invoicing(
|
||||||
bind-resources
|
bind-resources
|
||||||
upload-dir=`${extension.endpoints.uploads}`
|
upload-dir=`${extension.endpoints.uploads}`
|
||||||
|
logo-dir=`${client.logo}`
|
||||||
uniq=extension.uniq
|
uniq=extension.uniq
|
||||||
)
|
)
|
@ -1,4 +1,4 @@
|
|||||||
if componentSet.has('invoice') && componentSet.has('projects')
|
if componentSet.has('invoices') && componentSet.has('projects')
|
||||||
solid-widget(name="hubl-project-businessprovider")
|
solid-widget(name="hubl-project-businessprovider")
|
||||||
template
|
template
|
||||||
solid-form.segment.three-quarter.sm-full.margin-right-medium.margin-bottom-small(
|
solid-form.segment.three-quarter.sm-full.margin-right-medium.margin-bottom-small(
|
||||||
|
Loading…
Reference in New Issue
Block a user