From 7f30de06c283e5277e297efb645681b2a21eab58 Mon Sep 17 00:00:00 2001
From: daretobedifferent18 <daretobedifferent10920@gmail.com>
Date: Mon, 16 Nov 2020 02:34:55 +0530
Subject: [PATCH 1/4] Moved Event Types up

---
 .../forms/wizard/basic-details-step.hbs       | 70 +++++++++----------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/app/templates/components/forms/wizard/basic-details-step.hbs b/app/templates/components/forms/wizard/basic-details-step.hbs
index a113fbc873a..98be9356c66 100644
--- a/app/templates/components/forms/wizard/basic-details-step.hbs
+++ b/app/templates/components/forms/wizard/basic-details-step.hbs
@@ -6,6 +6,40 @@
       @id="name"
       @value={{this.data.event.name}} />
   </div>
+  <div class="three fields">
+    <div class="field">
+      <PowerSelect
+        @selected={{this.data.event.type}}
+        @allowClear={{true}}
+        @options={{this.data.types}}
+        @placeholder={{t 'Select Event Type'}}
+        @onChange={{action (mut this.data.event.type)}} as |type|>
+          {{type.name}}
+      </PowerSelect>
+    </div>
+    <br/>
+    <div class="field">
+      <PowerSelect
+        @selected={{this.data.event.topic}}
+        @allowClear={{true}}
+        @options={{this.data.topics}}
+        @placeholder={{t 'Select Event Topic'}}
+        @onChange={{action (mut this.data.event.topic)}} as |topic|>
+          {{topic.name}}
+      </PowerSelect>
+    </div>
+    <div class="field">
+      <PowerSelect
+        @selected={{this.data.event.subTopic}}
+        @allowClear={{true}}
+        @options={{this.subTopics}}
+        @placeholder={{t 'Select Event Sub-Topic'}}
+        @onChange={{action (mut this.data.event.subTopic)}} as |subTopic|>
+          {{subTopic.name}}
+      </PowerSelect>
+    </div>
+  </div>
+  <br>
   <div class="ui secondary pointing menu">
     {{#each this.locationMenuItems as |item|}}
       <a role="button" href="#" class="{{if (eq item this.selectedLocationType) 'active'}} item" onclick={{action (mut this.selectedLocationType) item}}>
@@ -586,42 +620,6 @@
       </div>
     </div>
   {{/if}}
-  <div class="ui section divider"></div>
-  <div class="field">
-    <label>{{t 'Event Type'}}</label>
-    <PowerSelect
-      @selected={{this.data.event.type}}
-      @allowClear={{true}}
-      @options={{this.data.types}}
-      @placeholder={{t 'Select Event Type'}}
-      @onChange={{action (mut this.data.event.type)}} as |type|>
-        {{type.name}}
-    </PowerSelect>
-  </div>
-  <div class="field">
-    <label>{{t 'Event Topic'}}</label>
-    <PowerSelect
-      @selected={{this.data.event.topic}}
-      @allowClear={{true}}
-      @options={{this.data.topics}}
-      @placeholder={{t 'Select Event Topic'}}
-      @onChange={{action (mut this.data.event.topic)}} as |topic|>
-        {{topic.name}}
-    </PowerSelect>
-  </div>
-  <div class="field">
-    <label>{{t 'Event Sub-topic'}}</label>
-    <PowerSelect
-      @selected={{this.data.event.subTopic}}
-      @allowClear={{true}}
-      @options={{this.subTopics}}
-      @placeholder={{t 'Select Event Sub-Topic'}}
-      @onChange={{action (mut this.data.event.subTopic)}} as |subTopic|>
-        {{subTopic.name}}
-    </PowerSelect>
-  </div>
-  <br>
-  
 </form>
 
 <Modals::TaxInfoModal

From 75f6d78be4c7d5439b6c2de3776cfcf0c506762f Mon Sep 17 00:00:00 2001
From: daretobedifferent18 <daretobedifferent10920@gmail.com>
Date: Tue, 17 Nov 2020 13:35:44 +0530
Subject: [PATCH 2/4] Styled Power Select

---
 app/styles/vars.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/styles/vars.scss b/app/styles/vars.scss
index a007177b551..e53f400b8a4 100644
--- a/app/styles/vars.scss
+++ b/app/styles/vars.scss
@@ -1,3 +1,6 @@
 $page-top-margin: 14px;
 $event-lead-image-height: 500px;
 $event-lead-image-height-minimum: 300px;
+$ember-power-select-trigger-ltr-padding: .67857143em 2.1em .67857143em 1em !default;
+$ember-power-select-border-color: rgba(34, 36, 38, .15) !default;
+$ember-power-select-line-height: 1.21428571em !default;

From 97431a393976427670c017a5deed41d461425194 Mon Sep 17 00:00:00 2001
From: daretobedifferent18 <daretobedifferent10920@gmail.com>
Date: Tue, 17 Nov 2020 14:34:27 +0530
Subject: [PATCH 3/4] Styled Power Select-1

---
 app/styles/vars.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/styles/vars.scss b/app/styles/vars.scss
index e53f400b8a4..924ebbbdf53 100644
--- a/app/styles/vars.scss
+++ b/app/styles/vars.scss
@@ -1,6 +1,5 @@
 $page-top-margin: 14px;
 $event-lead-image-height: 500px;
 $event-lead-image-height-minimum: 300px;
-$ember-power-select-trigger-ltr-padding: .67857143em 2.1em .67857143em 1em !default;
+$ember-power-select-trigger-ltr-padding: .410714287em 2.1em .410714287em .57142857143em !default;
 $ember-power-select-border-color: rgba(34, 36, 38, .15) !default;
-$ember-power-select-line-height: 1.21428571em !default;

From c202f47ca68f7b058cbf80a68564b5b857c4d17f Mon Sep 17 00:00:00 2001
From: daretobedifferent18 <daretobedifferent10920@gmail.com>
Date: Tue, 17 Nov 2020 15:12:48 +0530
Subject: [PATCH 4/4] Styled Power Select-2

---
 app/styles/vars.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/styles/vars.scss b/app/styles/vars.scss
index 924ebbbdf53..bf7995f2f4e 100644
--- a/app/styles/vars.scss
+++ b/app/styles/vars.scss
@@ -1,5 +1,8 @@
 $page-top-margin: 14px;
 $event-lead-image-height: 500px;
 $event-lead-image-height-minimum: 300px;
-$ember-power-select-trigger-ltr-padding: .410714287em 2.1em .410714287em .57142857143em !default;
+
 $ember-power-select-border-color: rgba(34, 36, 38, .15) !default;
+$ember-power-select-line-height: 2.642857143em !default;
+$ember-power-select-highlighted-background: rgba(0, 0, 0, .05) !default;
+$ember-power-select-highlighted-color: rgba(0, 0, 0, .95) !default;