From df21f5b21378d7a0f00b93121dadc0878df7adda Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Mon, 27 Oct 2014 10:51:58 -0400
Subject: [PATCH] Bug 1077599 - Rounding corners of buttons. r=mikedeboer

---
 .../loop/content/shared/css/conversation.css       | 14 ++++++++++----
 browser/components/loop/content/shared/js/views.js |  4 +++-
 .../components/loop/content/shared/js/views.jsx    |  4 +++-
 .../loop/standalone/content/css/webapp.css         |  1 +
 browser/components/loop/test/shared/views_test.js  |  2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/browser/components/loop/content/shared/css/conversation.css b/browser/components/loop/content/shared/css/conversation.css
index 8d9dc6c5ec1f..6fc2be181dd3 100644
--- a/browser/components/loop/content/shared/css/conversation.css
+++ b/browser/components/loop/content/shared/css/conversation.css
@@ -434,21 +434,27 @@
   cursor: pointer;
 }
 
-.feedback label {
+.feedback-category-label {
   display: block;
   line-height: 1.5em;
 }
 
-.feedback form input[type="radio"] {
+.feedback-category-radio {
   margin-right: .5em;
 }
 
-.feedback form button[type="submit"],
-.feedback form input[type="text"] {
+.feedback > form > .btn-success,
+.feedback-description {
   width: 100%;
   margin-top: 14px;
 }
 
+.feedback > form > .btn-success {
+  padding-top: .5em;
+  padding-bottom: .5em;
+  border-radius: 2px;
+}
+
 .feedback .info {
   display: block;
   font-size: 10px;
diff --git a/browser/components/loop/content/shared/js/views.js b/browser/components/loop/content/shared/js/views.js
index 16d24444a596..289914c92354 100644
--- a/browser/components/loop/content/shared/js/views.js
+++ b/browser/components/loop/content/shared/js/views.js
@@ -397,8 +397,9 @@ loop.shared.views = (function(_, OT, l10n) {
       var categories = this._getCategories();
       return Object.keys(categories).map(function(category, key) {
         return (
-          React.DOM.label({key: key}, 
+          React.DOM.label({key: key, className: "feedback-category-label"}, 
             React.DOM.input({type: "radio", ref: "category", name: "category", 
+                   className: "feedback-category-radio", 
                    value: category, 
                    onChange: this.handleCategoryChange, 
                    checked: this.state.category === category}), 
@@ -466,6 +467,7 @@ loop.shared.views = (function(_, OT, l10n) {
             this._getCategoryFields(), 
             React.DOM.p(null, 
               React.DOM.input({type: "text", ref: "description", name: "description", 
+                className: "feedback-description", 
                 onChange: this.handleDescriptionFieldChange, 
                 onFocus: this.handleDescriptionFieldFocus, 
                 value: descriptionDisplayValue, 
diff --git a/browser/components/loop/content/shared/js/views.jsx b/browser/components/loop/content/shared/js/views.jsx
index 7c3f03d03727..48afa455d360 100644
--- a/browser/components/loop/content/shared/js/views.jsx
+++ b/browser/components/loop/content/shared/js/views.jsx
@@ -397,8 +397,9 @@ loop.shared.views = (function(_, OT, l10n) {
       var categories = this._getCategories();
       return Object.keys(categories).map(function(category, key) {
         return (
-          <label key={key}>
+          <label key={key} className="feedback-category-label">
             <input type="radio" ref="category" name="category"
+                   className="feedback-category-radio"
                    value={category}
                    onChange={this.handleCategoryChange}
                    checked={this.state.category === category} />
@@ -466,6 +467,7 @@ loop.shared.views = (function(_, OT, l10n) {
             {this._getCategoryFields()}
             <p>
               <input type="text" ref="description" name="description"
+                className="feedback-description"
                 onChange={this.handleDescriptionFieldChange}
                 onFocus={this.handleDescriptionFieldFocus}
                 value={descriptionDisplayValue}
diff --git a/browser/components/loop/standalone/content/css/webapp.css b/browser/components/loop/standalone/content/css/webapp.css
index 59d6e74063eb..b2698f0c4158 100644
--- a/browser/components/loop/standalone/content/css/webapp.css
+++ b/browser/components/loop/standalone/content/css/webapp.css
@@ -188,6 +188,7 @@ p.standalone-btn-label {
 
 .btn-pending-cancel-group > .btn-cancel {
   flex: 2 1 auto;
+  border-radius: 2px;
 }
 
 .btn-large {
diff --git a/browser/components/loop/test/shared/views_test.js b/browser/components/loop/test/shared/views_test.js
index de6ddbb7bd5c..6f5fd1bd9611 100644
--- a/browser/components/loop/test/shared/views_test.js
+++ b/browser/components/loop/test/shared/views_test.js
@@ -526,7 +526,7 @@ describe("loop.shared.views", function() {
           fillSadFeedbackForm(comp, "confusing");
 
           expect(comp.getDOMNode()
-                     .querySelector("form input[type='text']").value).eql("");
+                     .querySelector(".feedback-description").value).eql("");
         });
 
       it("should enable the form submit button once a predefined category is " +