Merge lp:~ricgard/maas/mount-alignment into lp:~maas-committers/maas/trunk

Proposed by Richard McCartney
Status: Merged
Approved by: Richard McCartney
Approved revision: no longer in the source branch.
Merged at revision: 4489
Proposed branch: lp:~ricgard/maas/mount-alignment
Merge into: lp:~maas-committers/maas/trunk
Prerequisite: lp:~ricgard/maas/commissioning-dropdown-fix
Diff against target: 39 lines (+6/-2)
1 file modified
src/maasserver/static/partials/node-details.html (+6/-2)
To merge this branch: bzr merge lp:~ricgard/maas/mount-alignment
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+277225@code.launchpad.net

Commit message

Fixed alignment by added table__input classes to both form elements

Description of the change

Fixed alignment by added table__input classes to both form elements

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Thought it was simple. Now i know.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/static/partials/node-details.html'
2--- src/maasserver/static/partials/node-details.html 2015-11-11 10:43:08 +0000
3+++ src/maasserver/static/partials/node-details.html 2015-11-11 10:43:09 +0000
4@@ -1048,7 +1048,8 @@
5 Partition
6 </div>
7 <div class="table__data table__column--15">
8- <select name="filesys"
9+ <select class="table__input"
10+ name="filesys"
11 data-ng-model="item.$options.fstype"
12 data-ng-change="fstypeChanged(item.$options)"
13 data-ng-options="fs.key as fs.key for fs in node.supported_filesystems">
14@@ -1056,7 +1057,8 @@
15 </select>
16 </div>
17 <div class="table__data table__column--30">
18- <input type="text" id="mountpoint"
19+ <input class="table__input"
20+ type="text" id="mountpoint"
21 placeholder="Mount point"
22 data-ng-model="item.$options.mountPoint"
23 data-ng-disabled="item.$options.fstype === null"
24@@ -1110,6 +1112,7 @@
25 </div>
26 <div class="table__data table__column--15">
27 <select name="filesys"
28+ class="table__input"
29 data-ng-model="item.$options.fstype"
30 data-ng-change="fstypeChanged(item.$options)"
31 data-ng-options="fs.key as fs.key for fs in node.supported_filesystems">
32@@ -1118,6 +1121,7 @@
33 </div>
34 <div class="table__data table__column--30">
35 <input type="text" id="mountpoint"
36+ class="table__input"
37 placeholder="Mount point"
38 data-ng-model="item.$options.mountPoint"
39 data-ng-disabled="item.$options.fstype === null"