Merge ~steverydz/maas:cpu-storage-memory-box-spacing into maas:master

Proposed by Steve Rydz
Status: Merged
Approved by: Steve Rydz
Approved revision: 4da1ee0f50b0f7c15388e53651fca5bd29c67c2b
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~steverydz/maas:cpu-storage-memory-box-spacing
Merge into: maas:master
Diff against target: 51 lines (+9/-9)
3 files modified
src/maasserver/static/partials/cards/cpu.html (+5/-5)
src/maasserver/static/partials/cards/memory.html (+3/-3)
src/maasserver/static/partials/cards/storage.html (+1/-1)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
Anthony Dillon Approve
MAAS Lander Approve
Review via email: mp+361123@code.launchpad.net

Commit message

LP: #1807740 - Fix line spacing in results

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

UNIT TESTS
-b cpu-storage-memory-box-spacing lp:~steverydz/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 4da1ee0f50b0f7c15388e53651fca5bd29c67c2b

review: Approve
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

LGTM +1

review: Approve
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 :

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/partials/cards/cpu.html b/src/maasserver/static/partials/cards/cpu.html
2index 12aa84c..cc2798e 100644
3--- a/src/maasserver/static/partials/cards/cpu.html
4+++ b/src/maasserver/static/partials/cards/cpu.html
5@@ -7,11 +7,11 @@
6 <div data-ng-repeat="test_result in testing_results">
7 <div data-ng-if="test_result.hardware_type === 1">
8 <div data-ng-repeat="result in test_result.results['null']">
9- <div data-ng-if="(result.results | json) != '{}'">
10- <div data-ng-repeat="final_result in result.results" data-ng-if="final_result.surfaced">
11- <p>{$ final_result.title $}: {$ final_result.value $}</p>
12- </div>
13- </div>
14+ <ul class="p-list" data-ng-if="(result.results | json) != '{}'">
15+ <li class="p-list__item u-no-margin--top" data-ng-repeat="final_result in result.results" data-ng-if="final_result.surfaced">
16+ {$ final_result.title $}: {$ final_result.value $}
17+ </li>
18+ </ul>
19 </div>
20 </div>
21 </div>
22diff --git a/src/maasserver/static/partials/cards/memory.html b/src/maasserver/static/partials/cards/memory.html
23index 151a3e2..9755fb5 100644
24--- a/src/maasserver/static/partials/cards/memory.html
25+++ b/src/maasserver/static/partials/cards/memory.html
26@@ -8,9 +8,9 @@
27 <div data-ng-if="test_result.hardware_type === 2">
28 <div data-ng-repeat="result in test_result.results['null']">
29 <div data-ng-if="(result.results | json) != '{}'">
30- <div data-ng-repeat="final_result in result.results" data-ng-if="final_result.surfaced">
31- <p>{$ final_result.title $}: {$ final_result.value $}</p>
32- </div>
33+ <ul class="p-list" data-ng-repeat="final_result in result.results" data-ng-if="final_result.surfaced">
34+ <li class="p-list__item u-no-margin--top">{$ final_result.title $}: {$ final_result.value $}</li>
35+ </ul>
36 </div>
37 </div>
38 </div>
39diff --git a/src/maasserver/static/partials/cards/storage.html b/src/maasserver/static/partials/cards/storage.html
40index e5c3327..08219fe 100644
41--- a/src/maasserver/static/partials/cards/storage.html
42+++ b/src/maasserver/static/partials/cards/storage.html
43@@ -5,7 +5,7 @@
44 </header>
45 <div>
46 <ul class="p-list">
47- <li class="p-list__item" data-ng-repeat="gs in node.grouped_storages">
48+ <li class="p-list__item u-no-margin--top" data-ng-repeat="gs in node.grouped_storages">
49 <span data-ng-if="gs.count > 0">{$ gs.count $}x{$ (gs.size / 1000 / 1000 / 1000).toFixed(0) $}GB ({$ gs.disk_type $})</span>
50 </li>
51 </ul>

Subscribers

People subscribed via source and target branches