From 397eace02b7483a2c2a1df2df8a0b0725f08519c Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Wed, 23 Nov 2016 17:24:59 -0800
Subject: [PATCH] Fixed disabled styles

---
 app/models/request.js                              | 2 +-
 app/ui/components/RequestPane.js                   | 6 ++++++
 app/ui/components/editors/body/FormEditor.js       | 4 ----
 app/ui/components/editors/body/UrlEncodedEditor.js | 4 ----
 app/ui/css/components/forms.less                   | 2 +-
 app/ui/css/layout/base.less                        | 2 +-
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/models/request.js b/app/models/request.js
index bd8f9898fd..d76d5710ba 100644
--- a/app/models/request.js
+++ b/app/models/request.js
@@ -37,7 +37,7 @@ export function newBodyRaw (rawBody, contentType) {
 export function newBodyFormUrlEncoded (parameters) {
   // Remove any properties (eg. fileName) that might not fit
   parameters = (parameters || []).map(
-    p => ({name: p.name, value: p.value})
+    p => ({name: p.name, value: p.value, disabled: p.disabled})
   );
 
   return {
diff --git a/app/ui/components/RequestPane.js b/app/ui/components/RequestPane.js
index 3f8387c1a3..77bce9ba9c 100644
--- a/app/ui/components/RequestPane.js
+++ b/app/ui/components/RequestPane.js
@@ -90,6 +90,10 @@ class RequestPane extends Component {
       )
     }
 
+    let numBodyParams = 0;
+    if (request.body && request.body.params) {
+      numBodyParams = request.body.params.filter(p => !p.disabled).length;
+    }
     const numParameters = request.parameters.filter(p => !p.disabled).length;
     const numHeaders = request.headers.filter(h => !h.disabled).length;
     const hasAuth = !request.authentication.disabled && request.authentication.username;
@@ -111,6 +115,8 @@ class RequestPane extends Component {
             <Tab onClick={() => trackEvent('Request Pane', 'View', 'Body')}>
               <button>
                 {getContentTypeName(request.body.mimeType || '')}
+                {" "}
+                {numBodyParams ? <span className="txt-sm">({numBodyParams})</span> : null}
               </button>
               <ContentTypeDropdown updateRequestMimeType={updateRequestMimeType}/>
             </Tab>
diff --git a/app/ui/components/editors/body/FormEditor.js b/app/ui/components/editors/body/FormEditor.js
index 2a81cc2316..dca8c6d63c 100644
--- a/app/ui/components/editors/body/FormEditor.js
+++ b/app/ui/components/editors/body/FormEditor.js
@@ -1,7 +1,6 @@
 import React, {PropTypes, Component} from 'react';
 import KeyValueEditor from '../../base/KeyValueEditor';
 import {trackEvent} from '../../../../analytics/index';
-import {CONTENT_TYPE_FORM_DATA} from '../../../../common/constants';
 
 class FormEditor extends Component {
   render () {
@@ -22,9 +21,6 @@ class FormEditor extends Component {
             pairs={parameters}
             multipart={true}
           />
-          <div className="faded faint txt-sm italic pad no-pad-bottom">
-            Sends as <code>{CONTENT_TYPE_FORM_DATA}</code>
-          </div>
         </div>
       </div>
     )
diff --git a/app/ui/components/editors/body/UrlEncodedEditor.js b/app/ui/components/editors/body/UrlEncodedEditor.js
index 02d4a6c393..f441f03007 100644
--- a/app/ui/components/editors/body/UrlEncodedEditor.js
+++ b/app/ui/components/editors/body/UrlEncodedEditor.js
@@ -1,7 +1,6 @@
 import React, {PropTypes, Component} from 'react';
 import KeyValueEditor from '../../base/KeyValueEditor';
 import {trackEvent} from '../../../../analytics/index';
-import {CONTENT_TYPE_FORM_URLENCODED} from '../../../../common/constants';
 
 class UrlEncodedEditor extends Component {
   render () {
@@ -19,9 +18,6 @@ class UrlEncodedEditor extends Component {
             onDelete={() => trackEvent('Url Encoded Editor', 'Delete')}
             pairs={parameters}
           />
-          <div className="faded faint txt-sm italic pad no-pad-bottom">
-            Sends as <code>{CONTENT_TYPE_FORM_URLENCODED}</code>
-          </div>
         </div>
       </div>
     )
diff --git a/app/ui/css/components/forms.less b/app/ui/css/components/forms.less
index a2fd71d770..696e988090 100644
--- a/app/ui/css/components/forms.less
+++ b/app/ui/css/components/forms.less
@@ -87,7 +87,7 @@ label > .form-control,
   }
 }
 
-.btn:disabled {
+*:disabled {
   opacity: 0.4;
 }
 
diff --git a/app/ui/css/layout/base.less b/app/ui/css/layout/base.less
index 7bec7b3a88..0f863c007c 100644
--- a/app/ui/css/layout/base.less
+++ b/app/ui/css/layout/base.less
@@ -147,7 +147,7 @@ code, pre, .monospace {
 }
 
 .faded {
-  opacity: 0.5;
+  opacity: 0.6;
 }
 
 .outlined {