Bug 1077599 - Rounding corners of buttons. r=mikedeboer

This commit is contained in:
Jared Wein 2014-10-27 10:51:58 -04:00
parent af06668851
commit df21f5b213
5 changed files with 18 additions and 7 deletions

View File

@ -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;

View File

@ -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,

View File

@ -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}

View File

@ -188,6 +188,7 @@ p.standalone-btn-label {
.btn-pending-cancel-group > .btn-cancel {
flex: 2 1 auto;
border-radius: 2px;
}
.btn-large {

View File

@ -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 " +