Merge pull request #2 from caseydwyer/enhancement-instruction-display…

…-and-markdown Enhancement: Instruction display and markdown
eminos · Oct 9, 2023 · 44b7739 · 44b7739
2 parents 7e55d2f + cd35586
commit 44b7739
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/dist/build/assets/statamic-group-29b7d030.css b/dist/build/assets/statamic-group-29b7d030.css
diff --git a/dist/build/assets/statamic-group-d752d391.js → dist/build/assets/statamic-group-7565f277.js b/dist/build/assets/statamic-group-d752d391.js → dist/build/assets/statamic-group-7565f277.js
diff --git a/dist/build/assets/statamic-group-89a25fd5.css b/dist/build/assets/statamic-group-89a25fd5.css
diff --git a/dist/build/manifest.json b/dist/build/manifest.json
@@ -1,11 +1,11 @@
 {
   "resources/css/statamic-group.css": {
-    "file": "assets/statamic-group-89a25fd5.css",
+    "file": "assets/statamic-group-29b7d030.css",
     "isEntry": true,
     "src": "resources/css/statamic-group.css"
   },
   "resources/js/statamic-group.js": {
-    "file": "assets/statamic-group-d752d391.js",
+    "file": "assets/statamic-group-7565f277.js",
     "isEntry": true,
     "src": "resources/js/statamic-group.js"
   }

diff --git a/resources/css/statamic-group.css b/resources/css/statamic-group.css
@@ -8,7 +8,8 @@
 }
 
 .group-fieldtype > .field-inner,
-.group-fieldtype > label {
+.group-fieldtype > label,
+.group-fieldtype > label:first-child + .help-block {
     display: none !important;
 }
 

diff --git a/resources/js/compontents/GroupFieldtype.vue b/resources/js/compontents/GroupFieldtype.vue
@@ -6,9 +6,7 @@
                     <label class="publish-field-label">
                         <span v-text="config.display" v-tooltip="{content: config.handle, delay: 300, autoHide: false}"></span>
                     </label>
-                    <div class="help-block -mt-2" v-if="config.instructions">
-                        <p v-text="config.instructions"></p>
-                    </div>
+                    <div class="help-block -mt-2" v-if="config.instructions" v-html="$options.filters.markdown(config.instructions)"></div>
                 </div>
                 <div class="toggle-fieldtype-wrapper grp-mt-2" v-if="config.show_toggle">
                     <toggle-input v-model="toggle"></toggle-input>