From 3862af172b610fa2cb9308ce77e8e95c5a9e4495 Mon Sep 17 00:00:00 2001 From: smcgrath0 Date: Tue, 25 Aug 2020 08:57:34 -0700 Subject: [PATCH] #136 fixed class string/fixed font on textarea/select --- fragments/form/hatch.js | 2 +- fragments/form/template.vue | 2 +- .../jcr_root/apps/themecleanflex/components/form/template.vue | 2 +- .../content/jcr_root/etc/felibs/themecleanflex/css/build.css | 4 +++- .../content/jcr_root/etc/felibs/themecleanflex/styles.css | 4 +++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fragments/form/hatch.js b/fragments/form/hatch.js index 398b07c6b..ff7edd717 100644 --- a/fragments/form/hatch.js +++ b/fragments/form/hatch.js @@ -35,7 +35,7 @@ module.exports = { f.bindEvent(formEl,'submit.prevent.stop','onSubmit') const form = $.find('vue-form-generator').first() - f.bindAttribute(form,'class','w-full', false) + f.bindAttribute(form,'class','`w-full`', false) f.bindAttribute(form,'model','formModel') f.bindAttribute(form,'schema','schema') f.bindAttribute(form,'options','formOptions') diff --git a/fragments/form/template.vue b/fragments/form/template.vue index fe65be1e1..c0dc52434 100644 --- a/fragments/form/template.vue +++ b/fragments/form/template.vue @@ -17,7 +17,7 @@ 'lg-button': model.submitsize === 'lg', 'full-button': model.submitsize === 'full', }" v-on:submit.prevent.stop="onSubmit"> - diff --git a/ui.apps/src/main/content/jcr_root/apps/themecleanflex/components/form/template.vue b/ui.apps/src/main/content/jcr_root/apps/themecleanflex/components/form/template.vue index fe65be1e1..c0dc52434 100644 --- a/ui.apps/src/main/content/jcr_root/apps/themecleanflex/components/form/template.vue +++ b/ui.apps/src/main/content/jcr_root/apps/themecleanflex/components/form/template.vue @@ -17,7 +17,7 @@ 'lg-button': model.submitsize === 'lg', 'full-button': model.submitsize === 'full', }" v-on:submit.prevent.stop="onSubmit"> - diff --git a/ui.apps/src/main/content/jcr_root/etc/felibs/themecleanflex/css/build.css b/ui.apps/src/main/content/jcr_root/etc/felibs/themecleanflex/css/build.css index 57319557d..d672878bd 100644 --- a/ui.apps/src/main/content/jcr_root/etc/felibs/themecleanflex/css/build.css +++ b/ui.apps/src/main/content/jcr_root/etc/felibs/themecleanflex/css/build.css @@ -1341,7 +1341,9 @@ video { /* Base Overrides */ -html { +html, +textarea, +select { font-family: var(--font-sans); font-size: var(--font-size-base); } diff --git a/ui.apps/src/main/content/jcr_root/etc/felibs/themecleanflex/styles.css b/ui.apps/src/main/content/jcr_root/etc/felibs/themecleanflex/styles.css index 2f4f1d26d..679a74207 100644 --- a/ui.apps/src/main/content/jcr_root/etc/felibs/themecleanflex/styles.css +++ b/ui.apps/src/main/content/jcr_root/etc/felibs/themecleanflex/styles.css @@ -8,7 +8,9 @@ /* Base Overrides */ -html { +html, +textarea, +select { @apply font-sans text-base; }