From 4fc499b9e36018bc0b0e5647d33487f62e95cfee Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Fri, 5 Mar 2021 16:49:46 +0000
Subject: [PATCH] Fold UX template into main bug template

---
 .github/ISSUE_TEMPLATE.md                     |  2 +
 .github/ISSUE_TEMPLATE/bug_report.md          |  2 +
 .../user-interface-or-usability-bug-report.md | 58 -------------------
 3 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index b6b3a11b0c..c673a89cb8 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,5 @@
+<!-- A picture's worth a thousand words: PLEASE INCLUDE A SCREENSHOT :P -->
+
 <!-- Please report security issues by email to security@matrix.org -->
 
 <!-- This is a bug report template. By following the instructions below and
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index dd2c9597d5..7bd12f6ddf 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,6 +7,8 @@ assignees: ''
 
 ---
 
+<!-- A picture's worth a thousand words: PLEASE INCLUDE A SCREENSHOT :P -->
+
 <!-- Please report security issues by email to security@matrix.org -->
 
 <!-- This is a bug report template. By following the instructions below and
diff --git a/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md b/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md
deleted file mode 100644
index c8a8bc5727..0000000000
--- a/.github/ISSUE_TEMPLATE/user-interface-or-usability-bug-report.md
+++ /dev/null
@@ -1,58 +0,0 @@
----
-name: User Interface or Usability Bug report
-about: Please include screenshots in UI/UX bug reports
-title: ''
-labels: T-Defect
-assignees: ''
-
----
-
-<!-- A picture's worth a thousand words: PLEASE INCLUDE A SCREENSHOT :P -->
-
-<!-- Please report security issues by email to security@matrix.org -->
-
-<!-- This is a bug report template. By following the instructions below and
-filling out the sections with your information, you will help the us to get all
-the necessary data to fix your issue.
-
-You can also preview your report before submitting it. You may remove sections
-that aren't relevant to your particular case.
-
-Text between <!-- and --​> marks will be invisible in the report.
--->
-
-### Description
-
-Describe here the problem that you are experiencing, or the feature you are requesting.
-
-### Steps to reproduce
-
-- For bugs, list the steps
-- that reproduce the bug
-- using hyphens as bullet points
-
-Describe how what happens differs from what you expected.
-
-<!-- Please send us logs for your bug report. They're very important for bugs
-which are hard to reproduce. To do this, create this issue then go to your
-account settings and click 'Submit Debug Logs' from the Help & About tab -->
-Logs being sent: yes/no
-
-<!-- Include screenshots if possible: you can drag and drop images below. -->
-
-### Version information
-
-<!-- IMPORTANT: please answer the following questions, to help us narrow down the problem -->
-
-- **Platform**: web (in-browser) or desktop?
-
-For the web app:
-
-- **Browser**: Chrome, Firefox, Safari, Edge? which version?
-- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
-- **URL**: develop.element.io / app.element.io / somewhere else? If a private server, what version of Element Web?
-
-For the desktop app:
-
-- **OS**: Windows, macOS, Ubuntu, Arch Linux, etc?
-- **Version**: 1.x.y <!-- check the user settings panel if unsure -->