Skip to content

Commit

Permalink
Issue #2296 - send patch for lost commits
Browse files Browse the repository at this point in the history
  • Loading branch information
zoepage authored and miketaylr committed Mar 27, 2018
1 parent a912c71 commit 6ace3b5
Show file tree
Hide file tree
Showing 27 changed files with 41 additions and 446 deletions.
5 changes: 0 additions & 5 deletions tests/unit/test_urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@ def test_contact(self):
rv = self.app.get('/contact')
self.assertEqual(rv.status_code, 200)

def test_contact(self):
'''Test that /contact exists.'''
rv = self.app.get('/contact')
self.assertEqual(rv.status_code, 200)

def test_activity_page_401_if_not_logged_in(self):
"""Test that asks user to log in before displaying activity."""
rv = self.app.get('/me')
Expand Down
2 changes: 1 addition & 1 deletion webcompat/static/css/src/form.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
----------------
* DEPENDENCIES:
----------------
* colors.css
* variable.css
*/

.form {
Expand Down
11 changes: 1 addition & 10 deletions webcompat/static/css/src/grid.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@
margin: 0 calc(-1 / 2 * var(--unit-space)) var(--grid-outermargin-s);
}

.grid-row > .grid-row {
margin-left: 0;
margin-right: 0;
}

.grid-row > .grid-row,
.grid-show-gap {
margin-left: 0;
margin-right: 0;
Expand Down Expand Up @@ -73,11 +69,6 @@
margin-bottom: var(--grid-outermargin-m);
}

/* .grid-nested {
display: flex;
flex-wrap: wrap;
} */

.x1-fix {
max-width: var(--unit-modul-s);
}
Expand Down
4 changes: 0 additions & 4 deletions webcompat/static/css/src/icons.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

.icon {
width: 16px;
height: 16px;
Expand All @@ -17,6 +16,3 @@
.illustration {
max-width: 6em;
}

/* icons */

4 changes: 2 additions & 2 deletions webcompat/static/css/src/issue.css
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
}

.issue-comment .comment-header {
padding: var(--unit-space) var(--unit-space);
padding: var(--unit-space);
background-color: var(--color-bg-comment-header);
display: flex;
justify-content: space-between;
Expand Down Expand Up @@ -91,7 +91,7 @@
overflow: auto;
}

/* As we can not add a class to the img right now (markup parsers are complicated), we need to use the element */
/* As we can not add a class to the img in the comment right now (markup parsers are complicated), we need to use the img element */
.comment-body img,
.js-Issue-markdown img {
max-width: calc(var(--unit-modul-m) - (var(--unit-space) * 4));
Expand Down
20 changes: 4 additions & 16 deletions webcompat/static/css/src/issues-list.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,17 @@
text-decoration: underline;
}

/* .issue-description .issue-type {
} */

.issue-description .issue-date-open {
color: var(--color-default);
line-height: 1em;
font-size: .8em;
display: inline;
}

.issue-description .issue-date-closed {
.issue-description .issue-date-open,
.issue-description .issue-date-closed,
.issue-description .issue-comments {
color: var(--color-default);
line-height: 1em;
font-size: .8em;
display: inline;
margin-left: calc(var(--unit-gap) / 3);
}

.issue-description .issue-date-closed,
.issue-description .issue-comments {
color: var(--color-default);
line-height: 1em;
font-size: .8em;
display: inline;
margin-left: calc(var(--unit-gap) / 3);
}

Expand Down
5 changes: 1 addition & 4 deletions webcompat/static/css/src/nav.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,7 @@
margin: 0 4px;
}

.nav-item:first-child {
margin: 0;
}

.nav-item:first-child,
.nav-item:last-child {
margin: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion webcompat/static/css/src/tiles.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
----------------
* DEPENDENCIES:
----------------
* colors.css
* variables.css
*/

.hero-tile {
Expand Down
Binary file modified webcompat/static/favicon/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion webcompat/static/favicon/safari-pinned-tab.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 8 additions & 6 deletions webcompat/static/js/lib/issues.js
Original file line number Diff line number Diff line change
Expand Up @@ -253,19 +253,20 @@ issues.ImageUploadView = Backbone.View.extend({
return;
}

var inlineHelp = $("<span></span>", {
// what is wc-Form-helpInline???
var inlineHelp = $("<small></small>", {
class: "wc-Form-helpInline",
text: this.inputMap[id].helpText
});

this.inputMap[id].valid = false;
$(this.inputMap[id].elm)
.parents(".js-Form-group")
.removeClass("wc-Form-noError js-no-error")
.addClass("wc-Form-error js-form-error");
.removeClass("js-no-error")
.addClass("js-form-error");

if (id === "image") {
inlineHelp.insertAfter(".wc-Form-label--upload");
inlineHelp.insertAfter(".js-label-upload");
}

this.disableSubmits();
Expand All @@ -274,9 +275,10 @@ issues.ImageUploadView = Backbone.View.extend({
this.inputMap[id].valid = true;
$(this.inputMap[id].elm)
.parents(".js-Form-group")
.removeClass("wc-Form-error js-form-error")
.addClass("wc-Form-noError js-no-error");
.removeClass("js-form-error")
.addClass("js-no-error");

// this can probably go as we do not have wc- styles anymore?
$(this.inputMap[id].elm)
.parents(".js-Form-group")
.find(".wc-Form-helpInline")
Expand Down
Loading

0 comments on commit 6ace3b5

Please sign in to comment.