Merge lp://qastaging/~rbanffy/maas/bug-1454355-add-extra-nic-styling into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Ricardo Bánffy
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Mike Pontillo | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 3934 | ||||
Proposed branch: | lp://qastaging/~rbanffy/maas/bug-1454355-add-extra-nic-styling | ||||
Merge into: | lp://qastaging/~maas-committers/maas/trunk | ||||
Diff against target: |
198 lines (+106/-21) 6 files modified
src/maasserver/static/css/maas-styles.css (+1/-1) src/maasserver/static/js/angular/controllers/node_details.js (+10/-0) src/maasserver/static/js/angular/controllers/tests/test_node_details.js (+44/-0) src/maasserver/static/partials/node-details.html (+21/-19) src/maasserver/static/scss/maas/components/_forms.scss (+29/-0) src/maasserver/static/scss/maas/components/_placeholders.scss (+1/-1) |
||||
To merge this branch: | bzr merge lp://qastaging/~rbanffy/maas/bug-1454355-add-extra-nic-styling | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+259811@code.qastaging.launchpad.net |
Commit message
Apply style changes to Add MAC field and associated error message, change interface logic to reset form styles when addition is canceled with an active error.
To post a comment you must log in.
Your commit message for this branch is very fage. You need to explain what was done and why.
I have some issues with this branch and need to be fixed, see inline comments. You also have a conflict that you need to resolve.