From 54d9897048ba7504f9a4c014a6fead02e0a67c5b Mon Sep 17 00:00:00 2001
From: Liyas Thomas <liyascthomas@gmail.com>
Date: Thu, 12 Sep 2019 11:19:16 +0530
Subject: [PATCH] :sparkles: Added close button on modal

---
 assets/css/styles.scss |  3 +--
 pages/index.vue        | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/assets/css/styles.scss b/assets/css/styles.scss
index 9e0fb9d39..c19559ded 100644
--- a/assets/css/styles.scss
+++ b/assets/css/styles.scss
@@ -42,7 +42,6 @@ body {
   line-height: 1.5;
   -webkit-tap-highlight-color: transparent;
   -webkit-touch-callout: none;
-  -webkit-user-select: none;
   user-select: none;
 }
 
@@ -226,6 +225,7 @@ pre {
   font-size: 18px;
   font-family: monospace;
   transition: all 0.2s ease-in-out;
+  user-select: all;
 
   &:not([readonly]):hover,
   &:not([readonly]):focus {
@@ -418,7 +418,6 @@ fieldset#history {
   position: relative;
   overflow: hidden;
   border-radius: 4px;
-  margin: 4px;
 
   textarea {
     margin: 0;
diff --git a/pages/index.vue b/pages/index.vue
index acfa56ac5..e48a989ca 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -10,7 +10,14 @@
         <div slot="header">
           <ul>
             <li>
-              <h3 class="title">Import cURL</h3>
+              <div class="flex-wrap">
+                <h3 class="title">Import cURL</h3>
+                <div>
+                 <button class="icon" @click="toggleModal">
+                   Close
+                 </button>
+                </div>
+              </div>
             </li>
           </ul>
         </div>
@@ -24,7 +31,7 @@
         <div slot="footer">
           <ul>
             <li>
-              <button class="modal-default-button" @click="handleImport">Import</button>
+              <button @click="handleImport">Import</button>
             </li>
           </ul>
         </div>
@@ -180,7 +187,7 @@
             </div>
           </div>
           <div id="response-details-wrapper">
-            <pre><code v-model="response.body" ref="responseBody" name="body" readonly rows="16" placeholder="(waiting to send request)">{{response.body}}</code></pre>
+            <pre><code ref="responseBody" name="body" rows="16" placeholder="(waiting to send request)">{{response.body}}</code></pre>
             <iframe :class="{hidden: !previewEnabled}" class="covers-response" ref="previewFrame" src="about:blank"></iframe>
           </div>
           <div class="align-right" v-if="response.body && responseType === 'text/html'">
@@ -228,7 +235,7 @@
     <pw-section class="orange" collapsed label="Headers">
       <ol v-for="(header, index) in headers" :key="index">
         <li>
-          <label :for="'header'+index">Key {{index + 1}}</label>
+          <label :for="'header'+index">Header {{index + 1}}</label>
           <input :name="'header'+index" v-model="header.key" @keyup.prevent="setRouteQueryState">
         </li>
         <li>
@@ -255,7 +262,7 @@
     <pw-section class="pink" collapsed label="Parameters">
       <ol v-for="(param, index) in params" :key="index">
         <li>
-          <label :for="'param'+index">Key {{index + 1}}</label>
+          <label :for="'param'+index">Parameter {{index + 1}}</label>
           <input :name="'param'+index" v-model="param.key">
         </li>
         <li>
@@ -291,7 +298,7 @@
   import import_modal from "../components/modal";
   import parseCurlCommand from '../assets/js/curlparser.js';
   import hljs from 'highlight.js';
-  import 'highlight.js/styles/github.css';
+  import 'highlight.js/styles/dracula.css';
 
   const statusCategories = [{
       name: 'informational',
@@ -863,6 +870,9 @@
         } catch (error) {
           this.showModal = false;
         }
+      },
+      toggleModal() {
+        this.showModal = !this.showModal;
       }
     },
     mounted() {