Merge ~deadlight/maas:deploy-spacing into maas:master

Proposed by Karl Williams
Status: Merged
Approved by: Karl Williams
Approved revision: d0e3ecaf2cebf1f4dae06835097ea800ea675e65
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~deadlight/maas:deploy-spacing
Merge into: maas:master
Diff against target: 27 lines (+3/-2)
2 files modified
src/maasserver/static/js/angular/directives/os_select.js (+2/-1)
src/maasserver/static/partials/nodes-list.html (+1/-1)
Reviewer Review Type Date Requested Status
MAAS Lander Needs Fixing
Alberto Donato (community) Approve
Review via email: mp+343633@code.launchpad.net

Commit message

LP: #1761767 - Remove additional padding and margin from deploy actions

Description of the change

LP: #1761767 - Remove additional padding and margin from deploy actions

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b deploy-spacing lp:~deadlight/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2526/console
COMMIT: b2529ae72f688c2300e15eb455b9424b01b85242

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b deploy-spacing lp:~deadlight/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2539/console
COMMIT: b9936a018ad37cc0908467fc48a19dbf398abe23

review: Needs Fixing
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Revision history for this message
MAAS Lander (maas-lander) wrote :
Revision history for this message
MAAS Lander (maas-lander) wrote :
Revision history for this message
MAAS Lander (maas-lander) wrote :
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b deploy-spacing lp:~deadlight/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/2561/console
COMMIT: 2c827436063b3d65cb2d6b675a2034cd93a0599d

review: Needs Fixing
Revision history for this message
MAAS Lander (maas-lander) wrote :
Revision history for this message
MAAS Lander (maas-lander) wrote :
~deadlight/maas:deploy-spacing updated
d0e3eca... by Karl Williams

Fix line-length lint issue

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/js/angular/directives/os_select.js b/src/maasserver/static/js/angular/directives/os_select.js
2index c22f2a1..c671527 100644
3--- a/src/maasserver/static/js/angular/directives/os_select.js
4+++ b/src/maasserver/static/js/angular/directives/os_select.js
5@@ -7,7 +7,8 @@
6 angular.module('MAAS').run(['$templateCache', function ($templateCache) {
7 // Inject the os-select.html into the template cache.
8 $templateCache.put('directive/templates/os-select.html', [
9- '<ul class="p-inline-list--settings u-no-margin--top">',
10+ '<ul class="p-inline-list--settings u-no-margin--top u-no-margin--left',
11+ ' u-no-padding--left">',
12 '<li class="p-inline-list__item"> ',
13 '<label class="p-form__label">Choose your image</label>',
14 '</li>',
15diff --git a/src/maasserver/static/partials/nodes-list.html b/src/maasserver/static/partials/nodes-list.html
16index d1b1723..76a1368 100644
17--- a/src/maasserver/static/partials/nodes-list.html
18+++ b/src/maasserver/static/partials/nodes-list.html
19@@ -131,7 +131,7 @@
20 </div>
21 <label class="p-form__label" for="{$ tab $}-enableSSH">Allow SSH access and prevent machine powering off</label>
22 </div>
23- <div class="p-form__group ng-hide" data-ng-show="tabs[tab].actionOption.name === 'deploy'">
24+ <div class="p-form__group u-no-margin--left ng-hide" data-ng-show="tabs[tab].actionOption.name === 'deploy'">
25 <div class="p-form__control u-clearfix">
26 <div data-maas-os-select="osinfo" data-ng-model="tabs[tab].osSelection"></div>
27 </div>

Subscribers

People subscribed via source and target branches