adjust wording and combine sections

Author: katie-perry

.github/ISSUE_TEMPLATE/bug-report.yaml

@@ -5,13 +5,15 @@ body:
   - type: textarea
     attributes:
       label: Describe the bug
-      description: Provide a clear and concise description of what the bug is.
+      description: Provide a clear and concise description of what the bug is. Include screenshots if applicable.
     validations:
       required: true
   - type: textarea
     attributes:
       label: Steps to reproduce
-      description: Provide detailed steps to replicate the bug. Make sure to describe the current behavior. If applicable, include full errors, stack traces, and/or relevant logs.
+      description: | 
+        Provide detailed steps to replicate the bug. Make sure to describe the current behavior. 
+        If applicable, include full errors, stack traces, and/or relevant logs. 
       placeholder: |
         1. In this environment...
         2. With this config...
@@ -41,16 +43,15 @@ body:
       required: false
   - type: textarea
     attributes:
-      label: Branch, commit, and/or version
-      description: Provide the branch, commit, and/or version you're using.
+      label: Environment & Version
+      description: |
+        Provide the branch, commit, and/or version you're using, along with environment details
+        (e.g., OS name and version, browser, runtime, deployment environment).
       placeholder: |
-        branch: issue-1
-        commit: abc123d
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Environment details
-      description: Provide environment details (OS name and version, etc).
-    validations:
-      required: true
+        branch:
+        commit:
+        version:
+        environment:
+      validations:
+        required: false
+

.github/ISSUE_TEMPLATE/feature-request.yaml

@@ -5,7 +5,9 @@ body:
   - type: textarea
     attributes:
       label: Feature description
-      description: Provide a clear and concise description of what you want to happen.
+      description: | 
+        Provide a clear and concise description of what you want to happen.
+        Include screenshots, wireframes, mockups, diagrams, or other supporting artifacts if available.
     validations:
       required: true
   - type: textarea
@@ -32,7 +34,7 @@ body:
   - type: textarea
     attributes:
       label: Proposed solution
-      description: Provide proposed solution and any technical details on how the feature might be implemented.
+      description: Describe a possible solution or any technical considerations, if known.
     validations:
       required: false
   - type: textarea